felipe Fri Oct 24 16:02:16 2008 UTC
Modified files:
/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/cgi cgi_main.c
/php-src/sapi/cli php_cli.c
/php-src/sapi/embed php_embed.c
/php-src/sapi/milter php_milter.c
/php-src/sapi/nsapi nsapi.c
Log:
- Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro
http://cvs.php.net/viewvc.cgi/php-src/sapi/aolserver/aolserver.c?r1=1.88&r2=1.89&diff_format=u
Index: php-src/sapi/aolserver/aolserver.c
diff -u php-src/sapi/aolserver/aolserver.c:1.88
php-src/sapi/aolserver/aolserver.c:1.89
--- php-src/sapi/aolserver/aolserver.c:1.88 Wed Jul 16 11:59:34 2008
+++ php-src/sapi/aolserver/aolserver.c Fri Oct 24 16:02:16 2008
@@ -22,7 +22,7 @@
* - CGI/1.1 conformance
*/
-/* $Id: aolserver.c,v 1.88 2008/07/16 11:59:34 felipe Exp $ */
+/* $Id: aolserver.c,v 1.89 2008/10/24 16:02:16 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.88 2008/07/16 11:59:34 felipe Exp $");
+ php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v
1.89 2008/10/24 16:02:16 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.106&r2=1.107&diff_format=u
Index: php-src/sapi/apache/php_apache.c
diff -u php-src/sapi/apache/php_apache.c:1.106
php-src/sapi/apache/php_apache.c:1.107
--- php-src/sapi/apache/php_apache.c:1.106 Sun Jul 20 14:29:29 2008
+++ php-src/sapi/apache/php_apache.c Fri Oct 24 16:02:16 2008
@@ -17,7 +17,7 @@
| David Sklar <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_apache.c,v 1.106 2008/07/20 14:29:29 felipe Exp $ */
+/* $Id: php_apache.c,v 1.107 2008/10/24 16:02:16 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.52&r2=1.53&diff_format=u
Index: php-src/sapi/apache2filter/php_functions.c
diff -u php-src/sapi/apache2filter/php_functions.c:1.52
php-src/sapi/apache2filter/php_functions.c:1.53
--- php-src/sapi/apache2filter/php_functions.c:1.52 Sun Jul 20 14:29:29 2008
+++ php-src/sapi/apache2filter/php_functions.c Fri Oct 24 16:02:16 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_functions.c,v 1.52 2008/07/20 14:29:29 felipe Exp $ */
+/* $Id: php_functions.c,v 1.53 2008/10/24 16:02:16 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.34&r2=1.35&diff_format=u
Index: php-src/sapi/apache2handler/php_functions.c
diff -u php-src/sapi/apache2handler/php_functions.c:1.34
php-src/sapi/apache2handler/php_functions.c:1.35
--- php-src/sapi/apache2handler/php_functions.c:1.34 Tue Aug 26 17:36:33 2008
+++ php-src/sapi/apache2handler/php_functions.c Fri Oct 24 16:02:16 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_functions.c,v 1.34 2008/08/26 17:36:33 indeyets Exp $ */
+/* $Id: php_functions.c,v 1.35 2008/10/24 16:02:16 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.33&r2=1.34&diff_format=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.33
php-src/sapi/apache_hooks/php_apache.c:1.34
--- php-src/sapi/apache_hooks/php_apache.c:1.33 Sun Jul 20 14:29:29 2008
+++ php-src/sapi/apache_hooks/php_apache.c Fri Oct 24 16:02:16 2008
@@ -17,7 +17,7 @@
| David Sklar <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_apache.c,v 1.33 2008/07/20 14:29:29 felipe Exp $ */
+/* $Id: php_apache.c,v 1.34 2008/10/24 16:02:16 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/cgi/cgi_main.c?r1=1.367&r2=1.368&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.367 php-src/sapi/cgi/cgi_main.c:1.368
--- php-src/sapi/cgi/cgi_main.c:1.367 Tue Oct 21 03:19:07 2008
+++ php-src/sapi/cgi/cgi_main.c Fri Oct 24 16:02:16 2008
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cgi_main.c,v 1.367 2008/10/21 03:19:07 lbarnaud Exp $ */
+/* $Id: cgi_main.c,v 1.368 2008/10/24 16:02:16 felipe Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -848,7 +848,6 @@
/* }}} */
/* {{{ arginfo ext/standard/dl.c */
-static
ZEND_BEGIN_ARG_INFO(arginfo_dl, 0)
ZEND_ARG_INFO(0, extension_filename)
ZEND_END_ARG_INFO()
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.196&r2=1.197&diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.196 php-src/sapi/cli/php_cli.c:1.197
--- php-src/sapi/cli/php_cli.c:1.196 Thu Aug 14 09:46:12 2008
+++ php-src/sapi/cli/php_cli.c Fri Oct 24 16:02:16 2008
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_cli.c,v 1.196 2008/08/14 09:46:12 tony2001 Exp $ */
+/* $Id: php_cli.c,v 1.197 2008/10/24 16:02:16 felipe Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -434,7 +434,6 @@
};
/* }}} */
/* {{{ arginfo ext/standard/dl.c */
-static
ZEND_BEGIN_ARG_INFO(arginfo_dl, 0)
ZEND_ARG_INFO(0, extension_filename)
ZEND_END_ARG_INFO()
http://cvs.php.net/viewvc.cgi/php-src/sapi/embed/php_embed.c?r1=1.25&r2=1.26&diff_format=u
Index: php-src/sapi/embed/php_embed.c
diff -u php-src/sapi/embed/php_embed.c:1.25 php-src/sapi/embed/php_embed.c:1.26
--- php-src/sapi/embed/php_embed.c:1.25 Tue Mar 25 22:04:58 2008
+++ php-src/sapi/embed/php_embed.c Fri Oct 24 16:02:16 2008
@@ -15,7 +15,7 @@
| Author: Edin Kadribasic <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_embed.c,v 1.25 2008/03/25 22:04:58 helly Exp $ */
+/* $Id: php_embed.c,v 1.26 2008/10/24 16:02:16 felipe Exp $ */
#include "php_embed.h"
#include <ext/standard/dl.h>
@@ -141,7 +141,6 @@
};
/* }}} */
/* {{{ arginfo ext/standard/dl.c */
-static
ZEND_BEGIN_ARG_INFO(arginfo_dl, 0)
ZEND_ARG_INFO(0, extension_filename)
ZEND_END_ARG_INFO()
http://cvs.php.net/viewvc.cgi/php-src/sapi/milter/php_milter.c?r1=1.26&r2=1.27&diff_format=u
Index: php-src/sapi/milter/php_milter.c
diff -u php-src/sapi/milter/php_milter.c:1.26
php-src/sapi/milter/php_milter.c:1.27
--- php-src/sapi/milter/php_milter.c:1.26 Wed Aug 13 00:49:59 2008
+++ php-src/sapi/milter/php_milter.c Fri Oct 24 16:02:16 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_milter.c,v 1.26 2008/08/13 00:49:59 jani Exp $ */
+/* $Id: php_milter.c,v 1.27 2008/10/24 16:02:16 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.91&r2=1.92&diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.91 php-src/sapi/nsapi/nsapi.c:1.92
--- php-src/sapi/nsapi/nsapi.c:1.91 Wed Jul 16 11:59:34 2008
+++ php-src/sapi/nsapi/nsapi.c Fri Oct 24 16:02:16 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: nsapi.c,v 1.91 2008/07/16 11:59:34 felipe Exp $ */
+/* $Id: nsapi.c,v 1.92 2008/10/24 16:02:16 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.91
$");
+ php_info_print_table_row(2, "NSAPI Module Revision", "$Revision: 1.92
$");
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
