diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-07-16 22:48:58 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-07-16 22:48:58 -0400 |
| commit | afa377d028d98302110bc6ad0a062a4a7a255658 (patch) | |
| tree | ea8bf9f96477a50ad49569935ae42677d096e5ad /phpBB | |
| parent | 7c84cb5f5f80217ef6ff0ed6e9adbbf7c409e4a3 (diff) | |
| parent | 271c277ecc570de1ed0f5e38347eb00d987fbbd1 (diff) | |
| download | forums-afa377d028d98302110bc6ad0a062a4a7a255658.tar forums-afa377d028d98302110bc6ad0a062a4a7a255658.tar.gz forums-afa377d028d98302110bc6ad0a062a4a7a255658.tar.bz2 forums-afa377d028d98302110bc6ad0a062a4a7a255658.tar.xz forums-afa377d028d98302110bc6ad0a062a4a7a255658.zip | |
Merge remote-tracking branch 'github-bantu/ticket/10257' into develop-olympus
* github-bantu/ticket/10257:
[ticket/10257] Slightly adjust comments about AAAA records on Windows XP/2003.
[ticket/10257] Fix AAAA record parsing for old versions of Windows
[ticket/10257] Add missing break statement after CNAME block.
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions.php | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 83e56caedc..1a5be3091c 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3735,10 +3735,19 @@ function phpbb_checkdnsrr($host, $type = 'MX') { return true; } + break; default: - case 'A': case 'AAAA': + // AAAA records returned by nslookup on Windows XP/2003 have this format. + // Later Windows versions use the A record format below for AAAA records. + if (stripos($line, "$host AAAA IPv6 address") === 0) + { + return true; + } + // No break + + case 'A': if (!empty($host_matches)) { // Second line |