mirror of
https://github.com/danog/dns-over-https.git
synced 2024-11-30 04:19:11 +01:00
merge
This commit is contained in:
commit
aa40bb7ddd
@ -3,10 +3,9 @@ sudo: false
|
|||||||
language: php
|
language: php
|
||||||
|
|
||||||
php:
|
php:
|
||||||
- 7.0
|
# - 7.2
|
||||||
- 7.1
|
# - 7.3
|
||||||
- 7.2
|
- 7.4
|
||||||
- 7.3
|
|
||||||
- nightly
|
- nightly
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
|
@ -70,7 +70,7 @@ final class HttpsSocket extends Socket
|
|||||||
$request->setBody($data);
|
$request->setBody($data);
|
||||||
$request->setHeader('content-type', 'application/dns-message');
|
$request->setHeader('content-type', 'application/dns-message');
|
||||||
$request->setHeader('accept', '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());
|
$request->setHeaders($this->nameserver->getHeaders());
|
||||||
break;
|
break;
|
||||||
case Nameserver::GOOGLE_JSON:
|
case Nameserver::GOOGLE_JSON:
|
||||||
|
@ -146,7 +146,7 @@ abstract class Socket
|
|||||||
$message = "Unexpected error during resolution: ".$exception->getMessage();
|
$message = "Unexpected error during resolution: ".$exception->getMessage();
|
||||||
$exception = new DnsException($message, 0, $exception);
|
$exception = new DnsException($message, 0, $exception);
|
||||||
}
|
}
|
||||||
|
|
||||||
$pending = $this->pending;
|
$pending = $this->pending;
|
||||||
$this->pending = [];
|
$this->pending = [];
|
||||||
|
|
||||||
|
@ -153,7 +153,7 @@ final class Rfc8484StubResolver implements Resolver
|
|||||||
foreach ($reason->getReasons() as $reason) {
|
foreach ($reason->getReasons() as $reason) {
|
||||||
$reasons []= $reason->getMessage();
|
$reasons []= $reason->getMessage();
|
||||||
}
|
}
|
||||||
$error .= " (".implode(", ", $reasons).")";
|
$error .= " (".\implode(", ", $reasons).")";
|
||||||
}
|
}
|
||||||
$errors[] = $error;
|
$errors[] = $error;
|
||||||
}
|
}
|
||||||
@ -263,7 +263,7 @@ final class Rfc8484StubResolver implements Resolver
|
|||||||
$attemptDescription = [];
|
$attemptDescription = [];
|
||||||
|
|
||||||
$exceptions = [];
|
$exceptions = [];
|
||||||
|
|
||||||
while ($attempt < $attempts) {
|
while ($attempt < $attempts) {
|
||||||
try {
|
try {
|
||||||
$attemptDescription[] = $nameserver;
|
$attemptDescription[] = $nameserver;
|
||||||
|
Loading…
Reference in New Issue
Block a user