sniper Fri Feb 21 03:45:58 2003 EDT
Modified files:
/php4/ext/standard basic_functions.c dns.c dns.h
Log:
- Fixed bug: #22339
# No NEWS, this was bug introduced by Marcus a while ago..
# Not present in php4.3.x branch
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.583
php4/ext/standard/basic_functions.c:1.584
--- php4/ext/standard/basic_functions.c:1.583 Tue Feb 18 04:37:52 2003
+++ php4/ext/standard/basic_functions.c Fri Feb 21 03:45:57 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.583 2003/02/18 09:37:52 wez Exp $ */
+/* $Id: basic_functions.c,v 1.584 2003/02/21 08:45:57 sniper Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -598,10 +598,10 @@
#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
Index: php4/ext/standard/dns.c
diff -u php4/ext/standard/dns.c:1.55 php4/ext/standard/dns.c:1.56
--- php4/ext/standard/dns.c:1.55 Thu Feb 20 00:34:58 2003
+++ php4/ext/standard/dns.c Fri Feb 21 03:45:58 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dns.c,v 1.55 2003/02/20 05:34:58 sniper Exp $ */
+/* $Id: dns.c,v 1.56 2003/02/21 08:45:58 sniper Exp $ */
/* {{{ includes */
#include "php.h"
@@ -630,6 +630,7 @@
}
}
/* }}} */
+#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 @@
}
/* }}} */
-#endif /* HAVE_DNS_FUNCS */
#endif /* HAVE_RES_SEARCH && !(defined(__BEOS__)||defined(PHP_WIN32) ||
defined(NETWARE)) */
/*
Index: php4/ext/standard/dns.h
diff -u php4/ext/standard/dns.h:1.13 php4/ext/standard/dns.h:1.14
--- php4/ext/standard/dns.h:1.13 Tue Dec 31 11:07:37 2002
+++ php4/ext/standard/dns.h Fri Feb 21 03:45:58 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dns.h,v 1.13 2002/12/31 16:07:37 sebastian Exp $ */
+/* $Id: dns.h,v 1.14 2003/02/21 08:45:58 sniper Exp $ */
#ifndef DNS_H
#define DNS_H
@@ -34,11 +34,11 @@
#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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
