scottmac Wed, 05 Aug 2009 23:20:17 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=286857
Log:
Change dns.h to php_dns.h, part of my dns cleanup
Changed paths:
U php/php-src/branches/PHP_5_3/configure.in
U php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c
U php/php-src/branches/PHP_5_3/ext/standard/config.m4
U php/php-src/branches/PHP_5_3/ext/standard/dns.c
D php/php-src/branches/PHP_5_3/ext/standard/dns.h
U php/php-src/branches/PHP_5_3/ext/standard/dns_win32.c
A + php/php-src/branches/PHP_5_3/ext/standard/php_dns.h
(from php/php-src/branches/PHP_5_3/ext/standard/dns.h:r286856)
U php/php-src/branches/PHP_5_3/ext/standard/php_standard.h
U php/php-src/trunk/configure.in
U php/php-src/trunk/ext/standard/basic_functions.c
U php/php-src/trunk/ext/standard/config.m4
U php/php-src/trunk/ext/standard/dns.c
D php/php-src/trunk/ext/standard/dns.h
U php/php-src/trunk/ext/standard/dns_win32.c
A + php/php-src/trunk/ext/standard/php_dns.h
(from php/php-src/trunk/ext/standard/dns.h:r286850)
U php/php-src/trunk/ext/standard/php_standard.h
U php/php-src/trunk/ext/standard/url_scanner_ex.c
Modified: php/php-src/branches/PHP_5_3/configure.in
===================================================================
--- php/php-src/branches/PHP_5_3/configure.in 2009-08-05 21:46:09 UTC (rev 286856)
+++ php/php-src/branches/PHP_5_3/configure.in 2009-08-05 23:20:17 UTC (rev 286857)
@@ -423,10 +423,11 @@
netinet/in.h \
alloca.h \
arpa/inet.h \
+arpa/nameser_compat.h \
arpa/nameser.h \
-arpa/nameser_compat.h \
assert.h \
crypt.h \
+dns.h \
fcntl.h \
grp.h \
ieeefp.h \
Modified: php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c 2009-08-05 21:46:09 UTC (rev 286856)
+++ php/php-src/branches/PHP_5_3/ext/standard/basic_functions.c 2009-08-05 23:20:17 UTC (rev 286857)
@@ -32,7 +32,7 @@
#include "ext/standard/info.h"
#include "ext/session/php_session.h"
#include "zend_operators.h"
-#include "ext/standard/dns.h"
+#include "ext/standard/php_dns.h"
#include "ext/standard/php_uuencode.h"
#include "safe_mode.h"
Modified: php/php-src/branches/PHP_5_3/ext/standard/config.m4
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/config.m4 2009-08-05 21:46:09 UTC (rev 286856)
+++ php/php-src/branches/PHP_5_3/ext/standard/config.m4 2009-08-05 23:20:17 UTC (rev 286857)
@@ -247,7 +247,7 @@
dnl
dnl Detect library functions needed by php dns_xxx functions
-dnl ext/standard/dns.h will collect these in a single define: HAVE_DNS_FUNCS
+dnl ext/standard/php_dns.h will collect these in a single define: HAVE_DNS_FUNCS
dnl
PHP_CHECK_FUNC(res_nmkquery, resolv, bind, socket)
PHP_CHECK_FUNC(res_nsend, resolv, bind, socket)
@@ -257,7 +257,7 @@
dnl
dnl These are old deprecated functions, a single define of HAVE_DEPRECATED_DNS_FUNCS
-dnl will be set in ext/standard/dns.h
+dnl will be set in ext/standard/php_dns.h
dnl
PHP_CHECK_FUNC(res_mkquery, resolv, bind, socket)
Modified: php/php-src/branches/PHP_5_3/ext/standard/dns.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/dns.c 2009-08-05 21:46:09 UTC (rev 286856)
+++ php/php-src/branches/PHP_5_3/ext/standard/dns.c 2009-08-05 23:20:17 UTC (rev 286857)
@@ -56,7 +56,7 @@
#define AF_INET 2 /* internetwork: UDP, TCP, etc. */
#endif
-#include "dns.h"
+#include "php_dns.h"
/* type compat */
#ifndef DNS_T_A
Deleted: php/php-src/branches/PHP_5_3/ext/standard/dns.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/dns.h 2009-08-05 21:46:09 UTC (rev 286856)
+++ php/php-src/branches/PHP_5_3/ext/standard/dns.h 2009-08-05 23:20:17 UTC (rev 286857)
@@ -1,71 +0,0 @@
-/*
- +----------------------------------------------------------------------+
- | PHP Version 5 |
- +----------------------------------------------------------------------+
- | Copyright (c) 1997-2008 The PHP Group |
- +----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | http://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | lice...@php.net so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Authors: The typical suspects |
- | Marcus Boerger <he...@php.net> |
- | Pollita <poll...@php.net> |
- +----------------------------------------------------------------------+
-*/
-
-/* $Id$ */
-
-#ifndef DNS_H
-#define DNS_H
-
-#if HAVE_RES_MKQUERY && !defined(HAVE_RES_NMKQUERY) && HAVE_RES_SEND && !defined(HAVE_RES_NSEND)
-#define HAVE_DEPRECATED_DNS_FUNCS 1
-#endif
-
-#if HAVE_DEPRECATED_DNS_FUNCS
-#define res_nmkquery(res, op, dname, class, type, data, datalen, newrr, buf, buflen) \
- res_mkquery(op, dname, class, type, data, datalen, newrr, buf, buflen)
-#define res_nsend(res, msg, msglen, answer, anslen) \
- res_send(msg, msglen, answer, anslen);
-#define res_nclose(res) /* noop */
-#endif
-
-#if ((HAVE_RES_NMKQUERY && HAVE_RES_NSEND) || HAVE_DEPRECATED_DNS_FUNCS) && HAVE_DN_EXPAND && HAVE_DN_SKIPNAME
-#define HAVE_DNS_FUNCS 1
-#endif
-
-PHP_FUNCTION(gethostbyaddr);
-PHP_FUNCTION(gethostbyname);
-PHP_FUNCTION(gethostbynamel);
-
-#ifdef HAVE_GETHOSTNAME
-PHP_FUNCTION(gethostname);
-#endif
-
-#if defined(PHP_WIN32) || (HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(NETWARE)))
-PHP_FUNCTION(dns_check_record);
-# if defined(PHP_WIN32) || (HAVE_DN_SKIPNAME && HAVE_DN_EXPAND)
-PHP_FUNCTION(dns_get_mx);
-# endif
-
-#if defined(PHP_WIN32) || HAVE_DNS_FUNCS
-PHP_FUNCTION(dns_get_record);
-PHP_MINIT_FUNCTION(dns);
-# endif
-
-#endif /* defined(PHP_WIN32) || (HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(NETWARE))) */
-
-#ifndef INT16SZ
-#define INT16SZ 2
-#endif
-
-#ifndef INT32SZ
-#define INT32SZ 4
-#endif
-
-#endif /* DNS_H */
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-05 21:46:09 UTC (rev 286856)
+++ php/php-src/branches/PHP_5_3/ext/standard/dns_win32.c 2009-08-05 23:20:17 UTC (rev 286857)
@@ -22,7 +22,7 @@
#include <Winbase.h >
#include <Windns.h>
-#include "dns.h"
+#include "php_dns.h"
#define PHP_DNS_NUM_TYPES 12 /* Number of DNS Types Supported by PHP currently */
Copied: php/php-src/branches/PHP_5_3/ext/standard/php_dns.h (from rev 286856, php/php-src/branches/PHP_5_3/ext/standard/dns.h)
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/php_dns.h (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/standard/php_dns.h 2009-08-05 23:20:17 UTC (rev 286857)
@@ -0,0 +1,71 @@
+/*
+ +----------------------------------------------------------------------+
+ | PHP Version 5 |
+ +----------------------------------------------------------------------+
+ | Copyright (c) 1997-2008 The PHP Group |
+ +----------------------------------------------------------------------+
+ | This source file is subject to version 3.01 of the PHP license, |
+ | that is bundled with this package in the file LICENSE, and is |
+ | available through the world-wide-web at the following url: |
+ | http://www.php.net/license/3_01.txt |
+ | If you did not receive a copy of the PHP license and are unable to |
+ | obtain it through the world-wide-web, please send a note to |
+ | lice...@php.net so we can mail you a copy immediately. |
+ +----------------------------------------------------------------------+
+ | Authors: The typical suspects |
+ | Marcus Boerger <he...@php.net> |
+ | Pollita <poll...@php.net> |
+ +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#ifndef PHP_DNS_H
+#define PHP_DNS_H
+
+#if HAVE_RES_MKQUERY && !defined(HAVE_RES_NMKQUERY) && HAVE_RES_SEND && !defined(HAVE_RES_NSEND)
+#define HAVE_DEPRECATED_DNS_FUNCS 1
+#endif
+
+#if HAVE_DEPRECATED_DNS_FUNCS
+#define res_nmkquery(res, op, dname, class, type, data, datalen, newrr, buf, buflen) \
+ res_mkquery(op, dname, class, type, data, datalen, newrr, buf, buflen)
+#define res_nsend(res, msg, msglen, answer, anslen) \
+ res_send(msg, msglen, answer, anslen);
+#define res_nclose(res) /* noop */
+#endif
+
+#if ((HAVE_RES_NMKQUERY && HAVE_RES_NSEND) || HAVE_DEPRECATED_DNS_FUNCS) && HAVE_DN_EXPAND && HAVE_DN_SKIPNAME
+#define HAVE_DNS_FUNCS 1
+#endif
+
+PHP_FUNCTION(gethostbyaddr);
+PHP_FUNCTION(gethostbyname);
+PHP_FUNCTION(gethostbynamel);
+
+#ifdef HAVE_GETHOSTNAME
+PHP_FUNCTION(gethostname);
+#endif
+
+#if defined(PHP_WIN32) || (HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(NETWARE)))
+PHP_FUNCTION(dns_check_record);
+# if defined(PHP_WIN32) || (HAVE_DN_SKIPNAME && HAVE_DN_EXPAND)
+PHP_FUNCTION(dns_get_mx);
+# endif
+
+#if defined(PHP_WIN32) || HAVE_DNS_FUNCS
+PHP_FUNCTION(dns_get_record);
+PHP_MINIT_FUNCTION(dns);
+# endif
+
+#endif /* defined(PHP_WIN32) || (HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(NETWARE))) */
+
+#ifndef INT16SZ
+#define INT16SZ 2
+#endif
+
+#ifndef INT32SZ
+#define INT32SZ 4
+#endif
+
+#endif /* PHP_DNS_H */
Modified: php/php-src/branches/PHP_5_3/ext/standard/php_standard.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/php_standard.h 2009-08-05 21:46:09 UTC (rev 286856)
+++ php/php-src/branches/PHP_5_3/ext/standard/php_standard.h 2009-08-05 23:20:17 UTC (rev 286857)
@@ -23,7 +23,7 @@
#include "php_string.h"
#include "base64.h"
#include "php_dir.h"
-#include "dns.h"
+#include "php_dns.h"
#include "php_mail.h"
#include "md5.h"
#include "sha1.h"
Modified: php/php-src/trunk/configure.in
===================================================================
--- php/php-src/trunk/configure.in 2009-08-05 21:46:09 UTC (rev 286856)
+++ php/php-src/trunk/configure.in 2009-08-05 23:20:17 UTC (rev 286857)
@@ -423,10 +423,11 @@
netinet/in.h \
alloca.h \
arpa/inet.h \
+arpa/nameser_compat.h \
arpa/nameser.h \
-arpa/nameser_compat.h \
assert.h \
crypt.h \
+dns.h \
fcntl.h \
grp.h \
ieeefp.h \
Modified: php/php-src/trunk/ext/standard/basic_functions.c
===================================================================
--- php/php-src/trunk/ext/standard/basic_functions.c 2009-08-05 21:46:09 UTC (rev 286856)
+++ php/php-src/trunk/ext/standard/basic_functions.c 2009-08-05 23:20:17 UTC (rev 286857)
@@ -32,7 +32,7 @@
#include "ext/standard/info.h"
#include "ext/session/php_session.h"
#include "zend_operators.h"
-#include "ext/standard/dns.h"
+#include "ext/standard/php_dns.h"
#include "ext/standard/php_uuencode.h"
#ifdef PHP_WIN32
Modified: php/php-src/trunk/ext/standard/config.m4
===================================================================
--- php/php-src/trunk/ext/standard/config.m4 2009-08-05 21:46:09 UTC (rev 286856)
+++ php/php-src/trunk/ext/standard/config.m4 2009-08-05 23:20:17 UTC (rev 286857)
@@ -247,7 +247,7 @@
dnl
dnl Detect library functions needed by php dns_xxx functions
-dnl ext/standard/dns.h will collect these in a single define: HAVE_DNS_FUNCS
+dnl ext/standard/php_dns.h will collect these in a single define: HAVE_DNS_FUNCS
dnl
PHP_CHECK_FUNC(res_nmkquery, resolv, bind, socket)
PHP_CHECK_FUNC(res_nsend, resolv, bind, socket)
@@ -257,7 +257,7 @@
dnl
dnl These are old deprecated functions, a single define of HAVE_DEPRECATED_DNS_FUNCS
-dnl will be set in ext/standard/dns.h
+dnl will be set in ext/standard/php_dns.h
dnl
PHP_CHECK_FUNC(res_mkquery, resolv, bind, socket)
Modified: php/php-src/trunk/ext/standard/dns.c
===================================================================
--- php/php-src/trunk/ext/standard/dns.c 2009-08-05 21:46:09 UTC (rev 286856)
+++ php/php-src/trunk/ext/standard/dns.c 2009-08-05 23:20:17 UTC (rev 286857)
@@ -56,7 +56,7 @@
#define AF_INET 2 /* internetwork: UDP, TCP, etc. */
#endif
-#include "dns.h"
+#include "php_dns.h"
/* type compat */
#ifndef DNS_T_A
Deleted: php/php-src/trunk/ext/standard/dns.h
===================================================================
--- php/php-src/trunk/ext/standard/dns.h 2009-08-05 21:46:09 UTC (rev 286856)
+++ php/php-src/trunk/ext/standard/dns.h 2009-08-05 23:20:17 UTC (rev 286857)
@@ -1,71 +0,0 @@
-/*
- +----------------------------------------------------------------------+
- | PHP Version 6 |
- +----------------------------------------------------------------------+
- | Copyright (c) 1997-2009 The PHP Group |
- +----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | http://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | lice...@php.net so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Authors: The typical suspects |
- | Marcus Boerger <he...@php.net> |
- | Pollita <poll...@php.net> |
- +----------------------------------------------------------------------+
-*/
-
-/* $Id$ */
-
-#ifndef DNS_H
-#define DNS_H
-
-#if HAVE_RES_MKQUERY && !defined(HAVE_RES_NMKQUERY) && HAVE_RES_SEND && !defined(HAVE_RES_NSEND)
-#define HAVE_DEPRECATED_DNS_FUNCS 1
-#endif
-
-#if HAVE_DEPRECATED_DNS_FUNCS
-#define res_nmkquery(res, op, dname, class, type, data, datalen, newrr, buf, buflen) \
- res_mkquery(op, dname, class, type, data, datalen, newrr, buf, buflen)
-#define res_nsend(res, msg, msglen, answer, anslen) \
- res_send(msg, msglen, answer, anslen);
-#define res_nclose(res) /* noop */
-#endif
-
-#if ((HAVE_RES_NMKQUERY && HAVE_RES_NSEND) || HAVE_DEPRECATED_DNS_FUNCS) && HAVE_DN_EXPAND && HAVE_DN_SKIPNAME
-#define HAVE_DNS_FUNCS 1
-#endif
-
-PHP_FUNCTION(gethostbyaddr);
-PHP_FUNCTION(gethostbyname);
-PHP_FUNCTION(gethostbynamel);
-
-#ifdef HAVE_GETHOSTNAME
-PHP_FUNCTION(gethostname);
-#endif
-
-#if defined(PHP_WIN32) || (HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(NETWARE)))
-PHP_FUNCTION(dns_check_record);
-# if defined(PHP_WIN32) || (HAVE_DN_SKIPNAME && HAVE_DN_EXPAND)
-PHP_FUNCTION(dns_get_mx);
-# endif
-
-#if defined(PHP_WIN32) || HAVE_DNS_FUNCS
-PHP_FUNCTION(dns_get_record);
-PHP_MINIT_FUNCTION(dns);
-# endif
-
-#endif /* defined(PHP_WIN32) || (HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(NETWARE))) */
-
-#ifndef INT16SZ
-#define INT16SZ 2
-#endif
-
-#ifndef INT32SZ
-#define INT32SZ 4
-#endif
-
-#endif /* DNS_H */
Modified: php/php-src/trunk/ext/standard/dns_win32.c
===================================================================
--- php/php-src/trunk/ext/standard/dns_win32.c 2009-08-05 21:46:09 UTC (rev 286856)
+++ php/php-src/trunk/ext/standard/dns_win32.c 2009-08-05 23:20:17 UTC (rev 286857)
@@ -22,7 +22,7 @@
#include <Winbase.h >
#include <Windns.h>
-#include "dns.h"
+#include "php_dns.h"
#define PHP_DNS_NUM_TYPES 12 /* Number of DNS Types Supported by PHP currently */
Copied: php/php-src/trunk/ext/standard/php_dns.h (from rev 286850, php/php-src/trunk/ext/standard/dns.h)
===================================================================
--- php/php-src/trunk/ext/standard/php_dns.h (rev 0)
+++ php/php-src/trunk/ext/standard/php_dns.h 2009-08-05 23:20:17 UTC (rev 286857)
@@ -0,0 +1,71 @@
+/*
+ +----------------------------------------------------------------------+
+ | PHP Version 6 |
+ +----------------------------------------------------------------------+
+ | Copyright (c) 1997-2009 The PHP Group |
+ +----------------------------------------------------------------------+
+ | This source file is subject to version 3.01 of the PHP license, |
+ | that is bundled with this package in the file LICENSE, and is |
+ | available through the world-wide-web at the following url: |
+ | http://www.php.net/license/3_01.txt |
+ | If you did not receive a copy of the PHP license and are unable to |
+ | obtain it through the world-wide-web, please send a note to |
+ | lice...@php.net so we can mail you a copy immediately. |
+ +----------------------------------------------------------------------+
+ | Authors: The typical suspects |
+ | Marcus Boerger <he...@php.net> |
+ | Pollita <poll...@php.net> |
+ +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#ifndef PHP_DNS_H
+#define PHP_DNS_H
+
+#if HAVE_RES_MKQUERY && !defined(HAVE_RES_NMKQUERY) && HAVE_RES_SEND && !defined(HAVE_RES_NSEND)
+#define HAVE_DEPRECATED_DNS_FUNCS 1
+#endif
+
+#if HAVE_DEPRECATED_DNS_FUNCS
+#define res_nmkquery(res, op, dname, class, type, data, datalen, newrr, buf, buflen) \
+ res_mkquery(op, dname, class, type, data, datalen, newrr, buf, buflen)
+#define res_nsend(res, msg, msglen, answer, anslen) \
+ res_send(msg, msglen, answer, anslen);
+#define res_nclose(res) /* noop */
+#endif
+
+#if ((HAVE_RES_NMKQUERY && HAVE_RES_NSEND) || HAVE_DEPRECATED_DNS_FUNCS) && HAVE_DN_EXPAND && HAVE_DN_SKIPNAME
+#define HAVE_DNS_FUNCS 1
+#endif
+
+PHP_FUNCTION(gethostbyaddr);
+PHP_FUNCTION(gethostbyname);
+PHP_FUNCTION(gethostbynamel);
+
+#ifdef HAVE_GETHOSTNAME
+PHP_FUNCTION(gethostname);
+#endif
+
+#if defined(PHP_WIN32) || (HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(NETWARE)))
+PHP_FUNCTION(dns_check_record);
+# if defined(PHP_WIN32) || (HAVE_DN_SKIPNAME && HAVE_DN_EXPAND)
+PHP_FUNCTION(dns_get_mx);
+# endif
+
+#if defined(PHP_WIN32) || HAVE_DNS_FUNCS
+PHP_FUNCTION(dns_get_record);
+PHP_MINIT_FUNCTION(dns);
+# endif
+
+#endif /* defined(PHP_WIN32) || (HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(NETWARE))) */
+
+#ifndef INT16SZ
+#define INT16SZ 2
+#endif
+
+#ifndef INT32SZ
+#define INT32SZ 4
+#endif
+
+#endif /* PHP_DNS_H */
Modified: php/php-src/trunk/ext/standard/php_standard.h
===================================================================
--- php/php-src/trunk/ext/standard/php_standard.h 2009-08-05 21:46:09 UTC (rev 286856)
+++ php/php-src/trunk/ext/standard/php_standard.h 2009-08-05 23:20:17 UTC (rev 286857)
@@ -23,7 +23,7 @@
#include "php_string.h"
#include "base64.h"
#include "php_dir.h"
-#include "dns.h"
+#include "php_dns.h"
#include "php_mail.h"
#include "md5.h"
#include "sha1.h"
Modified: php/php-src/trunk/ext/standard/url_scanner_ex.c
===================================================================
--- php/php-src/trunk/ext/standard/url_scanner_ex.c 2009-08-05 21:46:09 UTC (rev 286856)
+++ php/php-src/trunk/ext/standard/url_scanner_ex.c 2009-08-05 23:20:17 UTC (rev 286857)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Mon Jul 27 02:20:36 2009 */
+/* Generated by re2c 0.13.5 on Wed Aug 5 23:53:08 2009 */
#line 1 "ext/standard/url_scanner_ex.re"
/*
+----------------------------------------------------------------------+
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
