From 35ad8e6c46d808073e2874db664ee73590b214c0 Mon Sep 17 00:00:00 2001
From: Pierre Joye <pajoye@php.net>
Date: Fri, 7 Aug 2009 13:31:09 +0000
Subject: [PATCH] - Fixed #49183, dns_get_record does not return NAPTR records

---
 NEWS                     | 1 +
 ext/standard/dns_win32.c | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 8c5417355a9..d4c55d3ead0 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ PHP                                                                        NEWS
 - 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)
diff --git a/ext/standard/dns_win32.c b/ext/standard/dns_win32.c
index 2779220ecb7..a61bc1d3c60 100644
--- a/ext/standard/dns_win32.c
+++ b/ext/standard/dns_win32.c
@@ -269,7 +269,6 @@ static void php_parserr(PDNS_RECORD pRec, int type_to_fetch, int store, zval **s
 
 		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 @@ static void php_parserr(PDNS_RECORD pRec, int type_to_fetch, int store, zval **s
 				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;