diff options
| author | Côme Chilliet <91878298+come-nc@users.noreply.github.com> | 2024-11-14 11:43:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-14 11:43:32 +0100 |
| commit | 0718984bdfbbada00caa0e799671016f8c52115e (patch) | |
| tree | 97b2cd13fcfffc8149ca74be49e883e04020971e /lib | |
| parent | 95766246ea2e8d6965a2dd60dc6dd05055065eae (diff) | |
| parent | 4d517a33ba6498039f6500175a99583e0bf26f61 (diff) | |
| download | nextcloud-server-0718984bdfbbada00caa0e799671016f8c52115e.tar.gz nextcloud-server-0718984bdfbbada00caa0e799671016f8c52115e.zip | |
Merge pull request #48675 from georglauterbach/master
DNS: do not query CNAME if A succeeded already
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Http/Client/DnsPinMiddleware.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/private/Http/Client/DnsPinMiddleware.php b/lib/private/Http/Client/DnsPinMiddleware.php index 6618f22d825..630d2c8e9f1 100644 --- a/lib/private/Http/Client/DnsPinMiddleware.php +++ b/lib/private/Http/Client/DnsPinMiddleware.php @@ -57,17 +57,21 @@ class DnsPinMiddleware { $soaDnsEntry = $this->soaRecord($target); $dnsNegativeTtl = $soaDnsEntry['minimum-ttl'] ?? null; + $canHaveCnameRecord = true; $dnsTypes = \defined('AF_INET6') || @inet_pton('::1') ? [DNS_A, DNS_AAAA, DNS_CNAME] : [DNS_A, DNS_CNAME]; foreach ($dnsTypes as $dnsType) { + if ($canHaveCnameRecord === false && $dnsType === DNS_CNAME) { + continue; + } + if ($this->negativeDnsCache->isNegativeCached($target, $dnsType)) { continue; } $dnsResponses = $this->dnsGetRecord($target, $dnsType); - $canHaveCnameRecord = true; if ($dnsResponses !== false && count($dnsResponses) > 0) { foreach ($dnsResponses as $dnsResponse) { if (isset($dnsResponse['ip'])) { @@ -78,7 +82,6 @@ class DnsPinMiddleware { $canHaveCnameRecord = false; } elseif (isset($dnsResponse['target']) && $canHaveCnameRecord) { $targetIps = array_merge($targetIps, $this->dnsResolve($dnsResponse['target'], $recursionCount)); - $canHaveCnameRecord = true; } } } elseif ($dnsNegativeTtl !== null) { |