pajoye                                   Sat, 08 Aug 2009 13:01:13 +0000

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

Log:
- [DOC] Fixed #49183 patch for VC6, NAPTR is only available in VC9+ build

Bug: http://bugs.php.net/49183 (Closed) dns_get_record does not return NAPTR 
records when you query dot tel domains!
      
Changed paths:
    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/ext/standard/dns_win32.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/dns_win32.c       2009-08-08 
09:23:40 UTC (rev 286928)
+++ php/php-src/branches/PHP_5_3/ext/standard/dns_win32.c       2009-08-08 
13:01:13 UTC (rev 286929)
@@ -269,6 +269,7 @@

                case DNS_TYPE_NAPTR:
                        {
+#if _MSC_VER >= 1500
                                DNS_NAPTR_DATA * data_naptr = &pRec->Data.Naptr;

                                add_assoc_string(*subarray, "type", "NAPTR", 1);
@@ -278,6 +279,7 @@
                                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-08 09:23:40 UTC (rev 
286928)
+++ php/php-src/trunk/ext/standard/dns_win32.c  2009-08-08 13:01:13 UTC (rev 
286929)
@@ -269,7 +269,9 @@

                case DNS_TYPE_NAPTR:
                        {
+#if _MSC_VER >= 1500
                                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);
                                add_ascii_assoc_long(*subarray, "pref", 
data_naptr->wPreference);
@@ -277,6 +279,7 @@
                                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