From: foobar <sniper@php.net>
Date: Fri, 21 Feb 2003 08:45:58 +0000 (+0000)
Subject: - Fixed bug: #22339
X-Git-Tag: RELEASE_0_5~832
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b420beba61671edc45418152c9dca3dc80031bbf;p=php

- Fixed bug: #22339
# No NEWS, this was bug introduced by Marcus a while ago..
# Not present in php4.3.x branch
---

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index fed8e51b93..31c7f54e07 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -598,10 +598,10 @@ function_entry basic_functions[] = {
 #if HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(PHP_WIN32) || defined(NETWARE))
 	PHP_FE(dns_check_record,												NULL)
 	PHP_FALIAS(checkdnsrr,			dns_check_record,						NULL)
+	PHP_FE(dns_get_mx,				second_and_third_args_force_ref)
+	PHP_FALIAS(getmxrr, 			dns_get_mx, second_and_third_args_force_ref)
 # if HAVE_DNS_FUNCS
 	PHP_FE(dns_get_record,			third_and_rest_force_ref)
-	PHP_FE(dns_get_mx,				second_and_third_args_force_ref)
-	PHP_FALIAS(getmxrr, 			dns_get_mx, 							NULL)
 # endif
 #endif
 
diff --git a/ext/standard/dns.c b/ext/standard/dns.c
index 236b2471f3..e170a85e3c 100644
--- a/ext/standard/dns.c
+++ b/ext/standard/dns.c
@@ -630,6 +630,7 @@ PHP_FUNCTION(dns_get_record)
 	}
 }
 /* }}} */
+#endif /* HAVE_DNS_FUNCS */
 
 /* {{{ proto bool dns_get_mx(string hostname, array mxhosts [, array weight])
    Get MX records corresponding to a given Internet host name */
@@ -712,7 +713,6 @@ PHP_FUNCTION(dns_get_mx)
 }
 /* }}} */
 
-#endif /* HAVE_DNS_FUNCS */
 #endif /* HAVE_RES_SEARCH && !(defined(__BEOS__)||defined(PHP_WIN32) || defined(NETWARE)) */
 
 /*
diff --git a/ext/standard/dns.h b/ext/standard/dns.h
index e9c917ee26..51519c85ca 100644
--- a/ext/standard/dns.h
+++ b/ext/standard/dns.h
@@ -34,11 +34,11 @@ PHP_FUNCTION(gethostbynamel);
 #if HAVE_RES_SEARCH && !(defined(__BEOS__)||defined(PHP_WIN32))
 
 PHP_FUNCTION(dns_check_record);
+PHP_FUNCTION(dns_get_mx);
 
 # if HAVE_DNS_FUNCS
 
 PHP_FUNCTION(dns_get_record);
-PHP_FUNCTION(dns_get_mx);
 
 PHP_MINIT_FUNCTION(dns);