danog/dns-over-https
1
0
Fork 0
mirror of https://github.com/danog/dns-over-https.git synced 2024-11-26 11:54:44 +01:00
Code Issues Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Daniil Gentili 2019-12-22 19:09:12 +01:00
commit aa40bb7ddd
Signed by: danog
GPG Key ID: 8C1BE3B34B230CA7
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@ -3,10 +3,9 @@ sudo: false
language: php
php:
- 7.0
- 7.1
- 7.2
- 7.3
# - 7.2
# - 7.3
- 7.4
- nightly
matrix:

2
lib/Internal/HttpsSocket.php
View File

@ -70,7 +70,7 @@ final class HttpsSocket extends Socket
$request->setBody($data);
$request->setHeader('content-type', 'application/dns-message');
$request->setHeader('accept', 'application/dns-message');
$request->setHeader('content-length', strlen($data));
$request->setHeader('content-length', \strlen($data));
$request->setHeaders($this->nameserver->getHeaders());
break;
case Nameserver::GOOGLE_JSON:

2
lib/Internal/Socket.php
View File

@ -146,7 +146,7 @@ abstract class Socket
$message = "Unexpected error during resolution: ".$exception->getMessage();
$exception = new DnsException($message, 0, $exception);
}
$pending = $this->pending;
$this->pending = [];

4
lib/Rfc8484StubResolver.php
View File

@ -153,7 +153,7 @@ final class Rfc8484StubResolver implements Resolver
foreach ($reason->getReasons() as $reason) {
$reasons []= $reason->getMessage();
}
$error .= " (".implode(", ", $reasons).")";
$error .= " (".\implode(", ", $reasons).")";
}
$errors[] = $error;
}
@ -263,7 +263,7 @@ final class Rfc8484StubResolver implements Resolver
$attemptDescription = [];
$exceptions = [];
while ($attempt < $attempts) {
try {
$attemptDescription[] = $nameserver;