felipe Fri Oct 24 16:03:15 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/aolserver aolserver.c
/php-src/sapi/apache php_apache.c
/php-src/sapi/apache2filter php_functions.c
/php-src/sapi/apache2handler php_functions.c
/php-src/sapi/apache_hooks php_apache.c
/php-src/sapi/milter php_milter.c
/php-src/sapi/nsapi nsapi.c
Log:
- MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro
http://cvs.php.net/viewvc.cgi/php-src/sapi/aolserver/aolserver.c?r1=1.81.2.2.2.1.2.4&r2=1.81.2.2.2.1.2.5&diff_format=u
Index: php-src/sapi/aolserver/aolserver.c
diff -u php-src/sapi/aolserver/aolserver.c:1.81.2.2.2.1.2.4
php-src/sapi/aolserver/aolserver.c:1.81.2.2.2.1.2.5
--- php-src/sapi/aolserver/aolserver.c:1.81.2.2.2.1.2.4 Wed Jul 16 11:59:15 2008
+++ php-src/sapi/aolserver/aolserver.c Fri Oct 24 16:03:14 2008
@@ -22,7 +22,7 @@
* - CGI/1.1 conformance
*/
-/* $Id: aolserver.c,v 1.81.2.2.2.1.2.4 2008/07/16 11:59:15 felipe Exp $ */
+/* $Id: aolserver.c,v 1.81.2.2.2.1.2.5 2008/10/24 16:03:14 felipe Exp $ */
/* conflict between PHP and AOLserver headers */
#define Debug php_Debug
@@ -205,7 +205,7 @@
int i;
php_info_print_table_start();
- php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v
1.81.2.2.2.1.2.4 2008/07/16 11:59:15 felipe Exp $");
+ php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v
1.81.2.2.2.1.2.5 2008/10/24 16:03:14 felipe Exp $");
php_info_print_table_row(2, "Build date", Ns_InfoBuildDate());
php_info_print_table_row(2, "Config file path", Ns_InfoConfigFile());
php_info_print_table_row(2, "Error Log path", Ns_InfoErrorLog());
@@ -241,7 +241,6 @@
PHP_FUNCTION(getallheaders);
/* {{{ arginfo */
-static
ZEND_BEGIN_ARG_INFO(arginfo_aolserver_getallheaders, 0)
ZEND_END_ARG_INFO()
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/php_apache.c?r1=1.89.2.4.2.6.2.5&r2=1.89.2.4.2.6.2.6&diff_format=u
Index: php-src/sapi/apache/php_apache.c
diff -u php-src/sapi/apache/php_apache.c:1.89.2.4.2.6.2.5
php-src/sapi/apache/php_apache.c:1.89.2.4.2.6.2.6
--- php-src/sapi/apache/php_apache.c:1.89.2.4.2.6.2.5 Sun Jul 20 14:28:41 2008
+++ php-src/sapi/apache/php_apache.c Fri Oct 24 16:03:15 2008
@@ -17,7 +17,7 @@
| David Sklar <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_apache.c,v 1.89.2.4.2.6.2.5 2008/07/20 14:28:41 felipe Exp $ */
+/* $Id: php_apache.c,v 1.89.2.4.2.6.2.6 2008/10/24 16:03:15 felipe Exp $ */
#include "php_apache_http.h"
@@ -56,50 +56,40 @@
PHP_MINFO_FUNCTION(apache);
-static
ZEND_BEGIN_ARG_INFO(arginfo_apache_child_terminate, 0)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO_EX(arginfo_apache_note, 0, 0, 1)
ZEND_ARG_INFO(0, note_name)
ZEND_ARG_INFO(0, note_value)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO_EX(arginfo_apache_virtual, 0, 0, 1)
ZEND_ARG_INFO(0, filename)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO(arginfo_apache_request_headers, 0)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO(arginfo_apache_response_headers, 0)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO_EX(arginfo_apache_setenv, 0, 0, 2)
ZEND_ARG_INFO(0, variable)
ZEND_ARG_INFO(0, value)
ZEND_ARG_INFO(0, walk_to_top)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO_EX(arginfo_apache_lookup_uri, 0, 0, 1)
ZEND_ARG_INFO(0, uri)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO(arginfo_apache_get_version, 0)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO(arginfo_apache_get_modules, 0)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO(arginfo_apache_reset_timeout, 0)
ZEND_END_ARG_INFO()
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/php_functions.c?r1=1.44.2.2.2.2.2.3&r2=1.44.2.2.2.2.2.4&diff_format=u
Index: php-src/sapi/apache2filter/php_functions.c
diff -u php-src/sapi/apache2filter/php_functions.c:1.44.2.2.2.2.2.3
php-src/sapi/apache2filter/php_functions.c:1.44.2.2.2.2.2.4
--- php-src/sapi/apache2filter/php_functions.c:1.44.2.2.2.2.2.3 Sun Jul 20
14:28:41 2008
+++ php-src/sapi/apache2filter/php_functions.c Fri Oct 24 16:03:15 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_functions.c,v 1.44.2.2.2.2.2.3 2008/07/20 14:28:41 felipe Exp $ */
+/* $Id: php_functions.c,v 1.44.2.2.2.2.2.4 2008/10/24 16:03:15 felipe Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -360,48 +360,39 @@
}
/* {{{ arginfo */
-static
ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2filter_lookup_uri, 0, 0, 1)
ZEND_ARG_INFO(0, filename)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2filter_virtual, 0, 0, 1)
ZEND_ARG_INFO(0, uri)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO(arginfo_apache2filter_getallheaders, 0)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO(arginfo_apache2filter_response_headers, 0)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2filter_note, 0, 0, 1)
ZEND_ARG_INFO(0, note_name)
ZEND_ARG_INFO(0, note_value)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2filter_setenv, 0, 0, 2)
ZEND_ARG_INFO(0, variable)
ZEND_ARG_INFO(0, value)
ZEND_ARG_INFO(0, walk_to_top)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2filter_getenv, 0, 0, 1)
ZEND_ARG_INFO(0, variable)
ZEND_ARG_INFO(0, walk_to_top)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO(arginfo_apache2filter_get_version, 0)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO(arginfo_apache2filter_get_modules, 0)
ZEND_END_ARG_INFO()
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/php_functions.c?r1=1.18.2.6.2.5.2.5&r2=1.18.2.6.2.5.2.6&diff_format=u
Index: php-src/sapi/apache2handler/php_functions.c
diff -u php-src/sapi/apache2handler/php_functions.c:1.18.2.6.2.5.2.5
php-src/sapi/apache2handler/php_functions.c:1.18.2.6.2.5.2.6
--- php-src/sapi/apache2handler/php_functions.c:1.18.2.6.2.5.2.5 Tue Aug
26 17:34:16 2008
+++ php-src/sapi/apache2handler/php_functions.c Fri Oct 24 16:03:15 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_functions.c,v 1.18.2.6.2.5.2.5 2008/08/26 17:34:16 indeyets Exp $
*/
+/* $Id: php_functions.c,v 1.18.2.6.2.5.2.6 2008/10/24 16:03:15 felipe Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -469,48 +469,39 @@
}
/* {{{ arginfo */
-static
ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2handler_lookup_uri, 0, 0, 1)
ZEND_ARG_INFO(0, filename)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2handler_virtual, 0, 0, 1)
ZEND_ARG_INFO(0, uri)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO(arginfo_apache2handler_response_headers, 0)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO(arginfo_apache2handler_getallheaders, 0)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2handler_note, 0, 0, 1)
ZEND_ARG_INFO(0, note_name)
ZEND_ARG_INFO(0, note_value)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2handler_setenv, 0, 0, 2)
ZEND_ARG_INFO(0, variable)
ZEND_ARG_INFO(0, value)
ZEND_ARG_INFO(0, walk_to_top)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2handler_getenv, 0, 0, 1)
ZEND_ARG_INFO(0, variable)
ZEND_ARG_INFO(0, walk_to_top)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO(arginfo_apache2handler_get_version, 0)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO(arginfo_apache2handler_get_modules, 0)
ZEND_END_ARG_INFO()
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache.c?r1=1.19.2.3.2.5.2.4&r2=1.19.2.3.2.5.2.5&diff_format=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.5.2.4
php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.5.2.5
--- php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.5.2.4 Sun Jul 20
14:28:41 2008
+++ php-src/sapi/apache_hooks/php_apache.c Fri Oct 24 16:03:15 2008
@@ -17,7 +17,7 @@
| David Sklar <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_apache.c,v 1.19.2.3.2.5.2.4 2008/07/20 14:28:41 felipe Exp $ */
+/* $Id: php_apache.c,v 1.19.2.3.2.5.2.5 2008/10/24 16:03:15 felipe Exp $ */
#include "php_apache_http.h"
@@ -59,48 +59,38 @@
PHP_MINFO_FUNCTION(apache);
-static
ZEND_BEGIN_ARG_INFO_EX(arginfo_apachehooks_virtual, 0, 0, 1)
ZEND_ARG_INFO(0, filename)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO(arginfo_apachehooks_request_headers, 0)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO(arginfo_apachehooks_response_headers, 0)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO_EX(arginfo_apachehooks_setenv, 0, 0, 2)
ZEND_ARG_INFO(0, variable)
ZEND_ARG_INFO(0, value)
ZEND_ARG_INFO(0, walk_to_top)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO_EX(arginfo_apachehooks_lookup_uri, 0, 0, 1)
ZEND_ARG_INFO(0, uri)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO(arginfo_apachehooks_get_version, 0)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO(arginfo_apachehooks_get_modules, 0)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO(arginfo_apachehooks_request_run, 0)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO(arginfo_apachehooks_child_terminate, 0)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO_EX(arginfo_apachehooks_note, 0, 0, 1)
ZEND_ARG_INFO(0, note_name)
ZEND_ARG_INFO(0, note_value)
http://cvs.php.net/viewvc.cgi/php-src/sapi/milter/php_milter.c?r1=1.14.2.2.2.3.2.6&r2=1.14.2.2.2.3.2.7&diff_format=u
Index: php-src/sapi/milter/php_milter.c
diff -u php-src/sapi/milter/php_milter.c:1.14.2.2.2.3.2.6
php-src/sapi/milter/php_milter.c:1.14.2.2.2.3.2.7
--- php-src/sapi/milter/php_milter.c:1.14.2.2.2.3.2.6 Wed Aug 13 00:53:28 2008
+++ php-src/sapi/milter/php_milter.c Fri Oct 24 16:03:15 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_milter.c,v 1.14.2.2.2.3.2.6 2008/08/13 00:53:28 jani Exp $ */
+/* $Id: php_milter.c,v 1.14.2.2.2.3.2.7 2008/10/24 16:03:15 felipe Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -770,51 +770,42 @@
/* }}} */
/* {{{ arginfo */
-static
ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_setflags, 0, 0, 1)
ZEND_ARG_INFO(0, flags)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_settimeout, 0, 0, 1)
ZEND_ARG_INFO(0, timeout)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_getsymval, 0, 0, 1)
ZEND_ARG_INFO(0, macro)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_setreply, 0, 0, 3)
ZEND_ARG_INFO(0, rcode)
ZEND_ARG_INFO(0, xcode)
ZEND_ARG_INFO(0, message)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_addheader, 0, 0, 2)
ZEND_ARG_INFO(0, headerf)
ZEND_ARG_INFO(0, headerv)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_chgheader, 0, 0, 2)
ZEND_ARG_INFO(0, headerf)
ZEND_ARG_INFO(0, headerv)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_addrcpt, 0, 0, 1)
ZEND_ARG_INFO(0, rcpt)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_delrcpt, 0, 0, 1)
ZEND_ARG_INFO(0, rcpt)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_replacebody, 0, 0, 1)
ZEND_ARG_INFO(0, body)
ZEND_END_ARG_INFO()
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.69.2.3.2.6.2.6&r2=1.69.2.3.2.6.2.7&diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.6
php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.7
--- php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.6 Wed Jul 16 11:59:15 2008
+++ php-src/sapi/nsapi/nsapi.c Fri Oct 24 16:03:15 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: nsapi.c,v 1.69.2.3.2.6.2.6 2008/07/16 11:59:15 felipe Exp $ */
+/* $Id: nsapi.c,v 1.69.2.3.2.6.2.7 2008/10/24 16:03:15 felipe Exp $ */
/*
* PHP includes
@@ -170,16 +170,13 @@
/* {{{ arginfo */
-static
ZEND_BEGIN_ARG_INFO_EX(arginfo_nsapi_virtual, 0, 0, 1)
ZEND_ARG_INFO(0, uri)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO(arginfo_nsapi_request_headers, 0)
ZEND_END_ARG_INFO()
-static
ZEND_BEGIN_ARG_INFO(arginfo_nsapi_response_headers, 0)
ZEND_END_ARG_INFO()
/* }}} */
@@ -324,7 +321,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, "NSAPI Module Revision", "$Revision:
1.69.2.3.2.6.2.6 $");
+ php_info_print_table_row(2, "NSAPI Module Revision", "$Revision:
1.69.2.3.2.6.2.7 $");
php_info_print_table_row(2, "Server Software", system_version());
php_info_print_table_row(2, "Sub-requests with nsapi_virtual()",
(nsapi_servact_service)?((zend_ini_long("zlib.output_compression",
sizeof("zlib.output_compression"), 0))?"not supported with
zlib.output_compression":"enabled"):"not supported on this platform" );
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
