felipe Wed Jul 16 11:59:15 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/aolserver aolserver.c
/php-src/sapi/apache2handler php_functions.c
/php-src/sapi/milter php_milter.c
/php-src/sapi/nsapi nsapi.c
Log:
- Added arginfo
http://cvs.php.net/viewvc.cgi/php-src/sapi/aolserver/aolserver.c?r1=1.81.2.2.2.1.2.3&r2=1.81.2.2.2.1.2.4&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.3
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.3 Tue Mar 18 22:23:20 2008
+++ php-src/sapi/aolserver/aolserver.c Wed Jul 16 11:59:15 2008
@@ -22,7 +22,7 @@
* - CGI/1.1 conformance
*/
-/* $Id: aolserver.c,v 1.81.2.2.2.1.2.3 2008/03/18 22:23:20 rasmus Exp $ */
+/* $Id: aolserver.c,v 1.81.2.2.2.1.2.4 2008/07/16 11:59:15 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.3 2008/03/18 22:23:20 rasmus Exp $");
+ 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, "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());
@@ -240,8 +240,14 @@
PHP_FUNCTION(getallheaders);
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO(arginfo_aolserver_getallheaders, 0)
+ZEND_END_ARG_INFO()
+/* }}} */
+
const static zend_function_entry aolserver_functions[] = {
- PHP_FE(getallheaders, NULL)
+ PHP_FE(getallheaders, arginfo_aolserver_getallheaders)
{NULL, NULL, NULL}
};
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/php_functions.c?r1=1.18.2.6.2.5.2.3&r2=1.18.2.6.2.5.2.4&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.3
php-src/sapi/apache2handler/php_functions.c:1.18.2.6.2.5.2.4
--- php-src/sapi/apache2handler/php_functions.c:1.18.2.6.2.5.2.3 Mon Mar
10 22:12:33 2008
+++ php-src/sapi/apache2handler/php_functions.c Wed Jul 16 11:59:15 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_functions.c,v 1.18.2.6.2.5.2.3 2008/03/10 22:12:33 felipe Exp $ */
+/* $Id: php_functions.c,v 1.18.2.6.2.5.2.4 2008/07/16 11:59:15 felipe Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -478,17 +478,64 @@
}
}
+/* {{{ 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()
+/* }}} */
+
static const zend_function_entry apache_functions[] = {
- PHP_FE(apache_lookup_uri, NULL)
- PHP_FE(virtual, NULL)
- PHP_FE(apache_request_headers, NULL)
- PHP_FE(apache_response_headers, NULL)
- PHP_FE(apache_setenv, NULL)
- PHP_FE(apache_getenv, NULL)
- PHP_FE(apache_note, NULL)
- PHP_FE(apache_get_version, NULL)
- PHP_FE(apache_get_modules, NULL)
- PHP_FALIAS(getallheaders, apache_request_headers, NULL)
+ PHP_FE(apache_lookup_uri,
arginfo_apache2handler_lookup_uri)
+ PHP_FE(virtual,
arginfo_apache2handler_virtual)
+ PHP_FE(apache_request_headers, arginfo_apache2handler_getallheaders)
+ PHP_FE(apache_response_headers, arginfo_apache2handler_response_headers)
+ PHP_FE(apache_setenv, arginfo_apache2handler_setenv)
+ PHP_FE(apache_getenv, arginfo_apache2handler_getenv)
+ PHP_FE(apache_note, arginfo_apache2handler_note)
+ PHP_FE(apache_get_version, arginfo_apache2handler_get_version)
+ PHP_FE(apache_get_modules, arginfo_apache2handler_get_modules)
+ PHP_FALIAS(getallheaders, apache_request_headers,
arginfo_apache2handler_getallheaders)
{NULL, NULL, NULL}
};
http://cvs.php.net/viewvc.cgi/php-src/sapi/milter/php_milter.c?r1=1.14.2.2.2.3.2.4&r2=1.14.2.2.2.3.2.5&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.4
php-src/sapi/milter/php_milter.c:1.14.2.2.2.3.2.5
--- php-src/sapi/milter/php_milter.c:1.14.2.2.2.3.2.4 Tue Mar 18 22:23:21 2008
+++ php-src/sapi/milter/php_milter.c Wed Jul 16 11:59:15 2008
@@ -768,18 +768,69 @@
/* }}} */
/* }}} */
+/* {{{ 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()
+/* }}} */
+
/* {{{ milter_functions[]
*/
const static zend_function_entry milter_functions[] = {
- PHP_FE(smfi_setflags, NULL)
- PHP_FE(smfi_settimeout, NULL)
- PHP_FE(smfi_getsymval, NULL)
- PHP_FE(smfi_setreply, NULL)
- PHP_FE(smfi_addheader, NULL)
- PHP_FE(smfi_chgheader, NULL)
- PHP_FE(smfi_addrcpt, NULL)
- PHP_FE(smfi_delrcpt, NULL)
- PHP_FE(smfi_replacebody, NULL)
+ PHP_FE(smfi_setflags, arginfo_smfi_setflags)
+ PHP_FE(smfi_settimeout, arginfo_smfi_settimeout)
+ PHP_FE(smfi_getsymval, arginfo_smfi_getsymval)
+ PHP_FE(smfi_setreply, arginfo_smfi_setreply)
+ PHP_FE(smfi_addheader, arginfo_smfi_addheader)
+ PHP_FE(smfi_chgheader, arginfo_smfi_chgheader)
+ PHP_FE(smfi_addrcpt, arginfo_smfi_addrcpt)
+ PHP_FE(smfi_delrcpt, arginfo_smfi_delrcpt)
+ PHP_FE(smfi_replacebody, arginfo_smfi_replacebody)
{ NULL, NULL, NULL }
};
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.69.2.3.2.6.2.5&r2=1.69.2.3.2.6.2.6&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.5
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.5 Sun Jun 22 18:09:41 2008
+++ php-src/sapi/nsapi/nsapi.c Wed Jul 16 11:59:15 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: nsapi.c,v 1.69.2.3.2.6.2.5 2008/06/22 18:09:41 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.69.2.3.2.6.2.6 2008/07/16 11:59:15 felipe Exp $ */
/*
* PHP includes
@@ -168,18 +168,34 @@
#define NSAPI_G(v) TSRMG(nsapi_globals_id, zend_nsapi_globals *, v)
+
+/* {{{ 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()
+/* }}} */
+
/* {{{ nsapi_functions[]
*
* Every user visible function must have an entry in nsapi_functions[].
*/
const zend_function_entry nsapi_functions[] = {
- PHP_FE(nsapi_virtual, NULL)
/* Make subrequest */
- PHP_FALIAS(virtual, nsapi_virtual, NULL)
/* compatibility */
- PHP_FE(nsapi_request_headers, NULL)
/* get request headers */
- PHP_FALIAS(getallheaders, nsapi_request_headers, NULL)
/* compatibility */
- PHP_FALIAS(apache_request_headers, nsapi_request_headers, NULL)
/* compatibility */
- PHP_FE(nsapi_response_headers, NULL)
/* get response headers */
- PHP_FALIAS(apache_response_headers, nsapi_response_headers, NULL)
/* compatibility */
+ PHP_FE(nsapi_virtual, arginfo_nsapi_virtual)
/* Make subrequest */
+ PHP_FALIAS(virtual, nsapi_virtual, arginfo_nsapi_virtual)
/* compatibility */
+ PHP_FE(nsapi_request_headers, arginfo_nsapi_request_headers)
/* get request headers */
+ PHP_FALIAS(getallheaders, nsapi_request_headers,
arginfo_nsapi_request_headers) /* compatibility */
+ PHP_FALIAS(apache_request_headers, nsapi_request_headers,
arginfo_nsapi_request_headers) /* compatibility */
+ PHP_FE(nsapi_response_headers, arginfo_nsapi_response_headers)
/* get response headers */
+ PHP_FALIAS(apache_response_headers, nsapi_response_headers,
arginfo_nsapi_response_headers) /* compatibility */
{NULL, NULL, NULL}
};
/* }}} */
@@ -308,7 +324,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.5 $");
+ php_info_print_table_row(2, "NSAPI Module Revision", "$Revision:
1.69.2.3.2.6.2.6 $");
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
