diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-07-16 22:52:36 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-07-16 22:52:36 -0400 |
| commit | 8da1d5e1875564c393afab9767af78b1f59951ce (patch) | |
| tree | 44b3184e9b2491e1e71f571783889934d36f9355 /phpBB/includes/functions.php | |
| parent | 66a1ea52c4e3ed035cec7002006ae074965381e3 (diff) | |
| parent | afa377d028d98302110bc6ad0a062a4a7a255658 (diff) | |
| download | forums-8da1d5e1875564c393afab9767af78b1f59951ce.tar forums-8da1d5e1875564c393afab9767af78b1f59951ce.tar.gz forums-8da1d5e1875564c393afab9767af78b1f59951ce.tar.bz2 forums-8da1d5e1875564c393afab9767af78b1f59951ce.tar.xz forums-8da1d5e1875564c393afab9767af78b1f59951ce.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[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/includes/functions.php')
| -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 aa07ca269e..f5b087e304 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3673,10 +3673,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 |