Fix empty resolution result on too many redirects

Fixes #87.
amphp · Jul 8, 2019 · 2e7921a · 2e7921a
1 parent 0f59e8a
commit 2e7921a
Showing 1 changed file with 24 additions and 26 deletions.
diff --git a/lib/Rfc1035StubResolver.php b/lib/Rfc1035StubResolver.php
@@ -153,34 +153,32 @@ public function resolve(string $name, int $typeRestriction = null): Promise
  for ($redirects = 0; $redirects < 5; $redirects++) {
  try {
  if ($typeRestriction) {
- $records = yield $this->query($name, $typeRestriction);
- } else {
- try {
- list(, $records) = yield Promise\some([
- $this->query($name, Record::A),
- $this->query($name, Record::AAAA),
- ]);
-
- $records = \array_merge(...$records);
-
- break; // Break redirect loop, otherwise we query the same records 5 times
- } catch (MultiReasonException $e) {
- $errors = [];
-
- foreach ($e->getReasons() as $reason) {
- if ($reason instanceof NoRecordException) {
- throw $reason;
- }
-
- $errors[] = $reason->getMessage();
+ return yield $this->query($name, $typeRestriction);
+ }
+
+ try {
+ list(, $records) = yield Promise\some([
+ $this->query($name, Record::A),
+ $this->query($name, Record::AAAA),
+ ]);
+
+ return \array_merge(...$records);
+ } catch (MultiReasonException $e) {
+ $errors = [];
+
+ foreach ($e->getReasons() as $reason) {
+ if ($reason instanceof NoRecordException) {
+ throw $reason;
  }
 
- throw new DnsException(
- "All query attempts failed for {$name}: " . \implode(", ", $errors),
- 0,
- $e
- );
+ $errors[] = $reason->getMessage();
  }
+
+ throw new DnsException(
+ "All query attempts failed for {$name}: " . \implode(", ", $errors),
+ 0,
+ $e
+ );
  }
  } catch (NoRecordException $e) {
  try {
@@ -197,7 +195,7 @@ public function resolve(string $name, int $typeRestriction = null): Promise
  }
  }
 
- return $records;
+ throw new DnsException("Giving up resolution of '{$name}', too many redirects");
  });
  }