- Added arginfo

4 files changed, 147 insertions, 27 deletions

diff --git a/sapi/aolserver/aolserver.c b/sapi/aolserver/aolserver.c
index 1cc5a5b87e..0cba81bcbc 100644
--- a/sapi/aolserver/aolserver.c
+++ b/sapi/aolserver/aolserver.c
@@ -240,8 +240,14 @@ static void php_info_aolserver(ZEND_MODULE_INFO_FUNC_ARGS)
 
 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}
 };
 
diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c
index 8f165c1577..ae8ec0a0ef 100644
--- a/sapi/apache2handler/php_functions.c
+++ b/sapi/apache2handler/php_functions.c
@@ -478,17 +478,64 @@ PHP_MINFO_FUNCTION(apache)
 	}
 }
 
+/* {{{ 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}
 };
 
diff --git a/sapi/milter/php_milter.c b/sapi/milter/php_milter.c
index d868f801c4..64f060bdb1 100644
--- a/sapi/milter/php_milter.c
+++ b/sapi/milter/php_milter.c
@@ -768,18 +768,69 @@ PHP_MINFO_FUNCTION(milter)
 /* }}} */
 /* }}} */
 
+/* {{{ 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 }
 };
 /* }}} */
diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c
index 19c1572af9..490d64e066 100644
--- a/sapi/nsapi/nsapi.c
+++ b/sapi/nsapi/nsapi.c
@@ -168,18 +168,34 @@ ZEND_DECLARE_MODULE_GLOBALS(nsapi)
 
 #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}
 };
 /* }}} */