mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 22:40:39 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* 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.
This commit is contained in:
Nils Adermann
2011-07-16 22:52:36 -04:00
parent 66a1ea52c4 afa377d028
commit 8da1d5e187
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
phpBB/includes/functions.php
View File

@@ -3673,10 +3673,19 @@ function phpbb_checkdnsrr($host, $type = 'MX')
{ {
return true; return true;
} }
break;
default: default:
case 'A':
case 'AAAA': 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)) if (!empty($host_matches))
{ {
// Second line // Second line