pajoye                                   Fri, 07 Aug 2009 13:31:09 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=286907

Log:
- Fixed #49183, dns_get_record does not return NAPTR records

Bug: http://bugs.php.net/49183 (Assigned) dns_get_record does not return NAPTR 
records when you query dot tel domains!
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/NEWS
    U   php/php-src/branches/PHP_5_3/ext/standard/dns_win32.c
    U   php/php-src/trunk/ext/standard/dns_win32.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS   2009-08-07 09:48:57 UTC (rev 286906)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-08-07 13:31:09 UTC (rev 286907)
@@ -8,6 +8,7 @@
 - Fixed signature generation/validation for zip archives in ext/phar. (Greg)
 - Fixed memory leak in stream_is_local(). (Felipe, Tony)

+- Fixed bug #49183 (dns_get_record does not return NAPTR records). (Pierre)
 - Fixed bug #49132 (posix_times returns false without error).
   (phpbugs at gunnu dot us)
 - Fixed bug #49125 (Error in dba_exists C code). (jdornan at stanford dot edu)

Modified: php/php-src/branches/PHP_5_3/ext/standard/dns_win32.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/dns_win32.c       2009-08-07 
09:48:57 UTC (rev 286906)
+++ php/php-src/branches/PHP_5_3/ext/standard/dns_win32.c       2009-08-07 
13:31:09 UTC (rev 286907)
@@ -269,7 +269,6 @@

                case DNS_TYPE_NAPTR:
                        {
-#ifdef DNS_NAPTR_DATA
                                DNS_NAPTR_DATA * data_naptr = &pRec->Data.Naptr;

                                add_assoc_string(*subarray, "type", "NAPTR", 1);
@@ -279,7 +278,6 @@
                                add_assoc_string(*subarray, "services", 
data_naptr->pService, 1);
                                add_assoc_string(*subarray, "regex", 
data_naptr->pRegularExpression, 1);
                                add_assoc_string(*subarray, "replacement", 
data_naptr->pReplacement, 1);
-#endif
                        }
                        break;


Modified: php/php-src/trunk/ext/standard/dns_win32.c
===================================================================
--- php/php-src/trunk/ext/standard/dns_win32.c  2009-08-07 09:48:57 UTC (rev 
286906)
+++ php/php-src/trunk/ext/standard/dns_win32.c  2009-08-07 13:31:09 UTC (rev 
286907)
@@ -269,7 +269,6 @@

                case DNS_TYPE_NAPTR:
                        {
-#ifdef DNS_NAPTR_DATA
                                DNS_NAPTR_DATA * data_naptr = &pRec->Data.Naptr;
                                add_ascii_assoc_rt_string(*subarray, "type", 
"NAPTR", ZSTR_DUPLICATE);
                                add_ascii_assoc_long(*subarray, "order", 
data_naptr->wOrder);
@@ -278,7 +277,6 @@
                                add_ascii_assoc_rt_string(*subarray, 
"services", data_naptr->pService, ZSTR_DUPLICATE);
                                add_ascii_assoc_rt_string(*subarray, "regex", 
data_naptr->pRegularExpression, ZSTR_DUPLICATE);
                                add_ascii_assoc_rt_string(*subarray, 
"replacement", data_naptr->pReplacement, ZSTR_DUPLICATE);
-#endif
                        }
                        break;


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to