From d986dd8bc14353c4b31ee603211317c8534c40e0 Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Sun, 20 Jul 2008 14:29:30 +0000 Subject: [PATCH] - MFB: Added arginfo --- ext/mime_magic/mime_magic.c | 9 +- ext/msql/php_msql.c | 258 ++++++++++++++++++++++++----- ext/odbc/birdstep.c | 115 ++++++++++--- ext/standard/basic_functions.c | 4 +- sapi/apache/php_apache.c | 71 ++++++-- sapi/apache2filter/php_functions.c | 67 ++++++-- sapi/apache_hooks/php_apache.c | 66 ++++++-- 7 files changed, 486 insertions(+), 104 deletions(-) diff --git a/ext/mime_magic/mime_magic.c b/ext/mime_magic/mime_magic.c index 153a9069b7..d2879742cc 100644 --- a/ext/mime_magic/mime_magic.c +++ b/ext/mime_magic/mime_magic.c @@ -217,9 +217,16 @@ static PHP_GINIT_FUNCTION(mime_magic); /* True global resources - no need for thread safety here */ static magic_server_config_rec mime_global; +/* {{{ arginfo */ +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_mime_content_type, 0, 0, 1) + ZEND_ARG_INFO(0, filename) +ZEND_END_ARG_INFO() +/* }}} */ + /* {{{ mime_magic_functions[] */ const zend_function_entry mime_magic_functions[] = { - PHP_FE(mime_content_type, NULL) + PHP_FE(mime_content_type, arginfo_mime_content_type) {NULL, NULL, NULL} }; /* }}} */ diff --git a/ext/msql/php_msql.c b/ext/msql/php_msql.c index 5d174bd241..ca2f1e25c7 100644 --- a/ext/msql/php_msql.c +++ b/ext/msql/php_msql.c @@ -44,58 +44,224 @@ static php_msql_globals msql_globals; #define MSQL_NUM 1<<1 #define MSQL_BOTH (MSQL_ASSOC|MSQL_NUM) +/* {{{ arginfo */ +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_connect, 0, 0, 0) + ZEND_ARG_INFO(0, hostname) + ZEND_ARG_INFO(0, username) + ZEND_ARG_INFO(0, password) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_pconnect, 0, 0, 0) + ZEND_ARG_INFO(0, hostname) + ZEND_ARG_INFO(0, username) + ZEND_ARG_INFO(0, password) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_close, 0, 0, 0) + ZEND_ARG_INFO(0, link_identifier) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_select_db, 0, 0, 1) + ZEND_ARG_INFO(0, database_name) + ZEND_ARG_INFO(0, link_identifier) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_create_db, 0, 0, 1) + ZEND_ARG_INFO(0, database_name) + ZEND_ARG_INFO(0, link_identifier) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_drop_db, 0, 0, 1) + ZEND_ARG_INFO(0, database_name) + ZEND_ARG_INFO(0, link_identifier) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_query, 0, 0, 1) + ZEND_ARG_INFO(0, query) + ZEND_ARG_INFO(0, link_identifier) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_db_query, 0, 0, 2) + ZEND_ARG_INFO(0, database_name) + ZEND_ARG_INFO(0, query) + ZEND_ARG_INFO(0, link_identifier) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_list_dbs, 0, 0, 0) + ZEND_ARG_INFO(0, link_identifier) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_list_tables, 0, 0, 1) + ZEND_ARG_INFO(0, database_name) + ZEND_ARG_INFO(0, link_identifier) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_list_fields, 0, 0, 2) + ZEND_ARG_INFO(0, database_name) + ZEND_ARG_INFO(0, table_name) + ZEND_ARG_INFO(0, link_identifier) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO(arginfo_msql_error, 0) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_result, 0, 0, 2) + ZEND_ARG_INFO(0, query) + ZEND_ARG_INFO(0, row) + ZEND_ARG_INFO(0, field) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_num_rows, 0, 0, 1) + ZEND_ARG_INFO(0, query) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_num_fields, 0, 0, 1) + ZEND_ARG_INFO(0, query) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_fetch_row, 0, 0, 1) + ZEND_ARG_INFO(0, query) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_fetch_object, 0, 0, 1) + ZEND_ARG_INFO(0, query) + ZEND_ARG_INFO(0, result_type) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_fetch_array, 0, 0, 1) + ZEND_ARG_INFO(0, query) + ZEND_ARG_INFO(0, result_type) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_data_seek, 0, 0, 2) + ZEND_ARG_INFO(0, query) + ZEND_ARG_INFO(0, row_number) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_fetch_field, 0, 0, 1) + ZEND_ARG_INFO(0, query) + ZEND_ARG_INFO(0, field_offset) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_field_seek, 0, 0, 2) + ZEND_ARG_INFO(0, query) + ZEND_ARG_INFO(0, field_offset) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_field_name, 0, 0, 2) + ZEND_ARG_INFO(0, query) + ZEND_ARG_INFO(0, field_index) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_field_table, 0, 0, 2) + ZEND_ARG_INFO(0, query) + ZEND_ARG_INFO(0, field_offset) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_field_len, 0, 0, 2) + ZEND_ARG_INFO(0, query) + ZEND_ARG_INFO(0, field_offet) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_field_type, 0, 0, 2) + ZEND_ARG_INFO(0, query) + ZEND_ARG_INFO(0, field_offset) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_field_flags, 0, 0, 2) + ZEND_ARG_INFO(0, query) + ZEND_ARG_INFO(0, field_offset) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_free_result, 0, 0, 1) + ZEND_ARG_INFO(0, query) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_affected_rows, 0, 0, 1) + ZEND_ARG_INFO(0, query) +ZEND_END_ARG_INFO() +/* }}} */ + /* {{{ msql_functions[] */ const zend_function_entry msql_functions[] = { - PHP_FE(msql_connect, NULL) - PHP_FE(msql_pconnect, NULL) - PHP_FE(msql_close, NULL) - PHP_FE(msql_select_db, NULL) - PHP_FE(msql_create_db, NULL) - PHP_FE(msql_drop_db, NULL) - PHP_FE(msql_query, NULL) - PHP_FE(msql_db_query, NULL) - PHP_FE(msql_list_dbs, NULL) - PHP_FE(msql_list_tables, NULL) - PHP_FE(msql_list_fields, NULL) - PHP_FE(msql_error, NULL) - PHP_FE(msql_result, NULL) - PHP_FE(msql_num_rows, NULL) - PHP_FE(msql_num_fields, NULL) - PHP_FE(msql_fetch_row, NULL) - PHP_FE(msql_fetch_array, NULL) - PHP_FE(msql_fetch_object, NULL) - PHP_FE(msql_data_seek, NULL) - PHP_FE(msql_fetch_field, NULL) - PHP_FE(msql_field_seek, NULL) - PHP_FE(msql_free_result, NULL) - PHP_FE(msql_field_name, NULL) - PHP_FE(msql_field_table, NULL) - PHP_FE(msql_field_len, NULL) - PHP_FE(msql_field_type, NULL) - PHP_FE(msql_field_flags, NULL) + PHP_FE(msql_connect, arginfo_msql_connect) + PHP_FE(msql_pconnect, arginfo_msql_pconnect) + PHP_FE(msql_close, arginfo_msql_close) + PHP_FE(msql_select_db, arginfo_msql_select_db) + PHP_FE(msql_create_db, arginfo_msql_create_db) + PHP_FE(msql_drop_db, arginfo_msql_drop_db) + PHP_FE(msql_query, arginfo_msql_query) + PHP_FE(msql_db_query, arginfo_msql_db_query) + PHP_FE(msql_list_dbs, arginfo_msql_list_dbs) + PHP_FE(msql_list_tables, arginfo_msql_list_tables) + PHP_FE(msql_list_fields, arginfo_msql_list_fields) + PHP_FE(msql_error, arginfo_msql_error) + PHP_FE(msql_result, arginfo_msql_result) + PHP_FE(msql_num_rows, arginfo_msql_num_rows) + PHP_FE(msql_num_fields, arginfo_msql_num_fields) + PHP_FE(msql_fetch_row, arginfo_msql_fetch_row) + PHP_FE(msql_fetch_array, arginfo_msql_fetch_array) + PHP_FE(msql_fetch_object, arginfo_msql_fetch_object) + PHP_FE(msql_data_seek, arginfo_msql_data_seek) + PHP_FE(msql_fetch_field, arginfo_msql_fetch_field) + PHP_FE(msql_field_seek, arginfo_msql_field_seek) + PHP_FE(msql_free_result, arginfo_msql_free_result) + PHP_FE(msql_field_name, arginfo_msql_field_name) + PHP_FE(msql_field_table, arginfo_msql_field_table) + PHP_FE(msql_field_len, arginfo_msql_field_len) + PHP_FE(msql_field_type, arginfo_msql_field_type) + PHP_FE(msql_field_flags, arginfo_msql_field_flags) - PHP_FALIAS(msql_fieldname, msql_field_name, NULL) - PHP_FALIAS(msql_fieldtable, msql_field_table, NULL) - PHP_FALIAS(msql_fieldlen, msql_field_len, NULL) - PHP_FALIAS(msql_fieldtype, msql_field_type, NULL) - PHP_FALIAS(msql_fieldflags, msql_field_flags, NULL) - - PHP_FALIAS(msql_affected_rows, msql_affected_rows, NULL) + PHP_FALIAS(msql_fieldname, msql_field_name, arginfo_msql_field_name) + PHP_FALIAS(msql_fieldtable, msql_field_table, arginfo_msql_field_table) + PHP_FALIAS(msql_fieldlen, msql_field_len, arginfo_msql_field_len) + PHP_FALIAS(msql_fieldtype, msql_field_type, arginfo_msql_field_type) + PHP_FALIAS(msql_fieldflags, msql_field_flags, arginfo_msql_field_flags) + + PHP_FALIAS(msql_affected_rows, msql_affected_rows, arginfo_msql_affected_rows) /* for downwards compatability */ - PHP_FALIAS(msql, msql_db_query, NULL) - PHP_FALIAS(msql_selectdb, msql_select_db, NULL) - PHP_FALIAS(msql_createdb, msql_create_db, NULL) - PHP_FALIAS(msql_dropdb, msql_drop_db, NULL) - PHP_FALIAS(msql_freeresult, msql_free_result, NULL) - PHP_FALIAS(msql_numfields, msql_num_fields, NULL) - PHP_FALIAS(msql_numrows, msql_num_rows, NULL) - PHP_FALIAS(msql_listdbs, msql_list_dbs, NULL) - PHP_FALIAS(msql_listtables, msql_list_tables, NULL) - PHP_FALIAS(msql_listfields, msql_list_fields, NULL) - PHP_FALIAS(msql_dbname, msql_result, NULL) - PHP_FALIAS(msql_tablename, msql_result, NULL) + PHP_FALIAS(msql, msql_db_query, arginfo_msql_db_query) + PHP_FALIAS(msql_selectdb, msql_select_db, arginfo_msql_select_db) + PHP_FALIAS(msql_createdb, msql_create_db, arginfo_msql_create_db) + PHP_FALIAS(msql_dropdb, msql_drop_db, arginfo_msql_drop_db) + PHP_FALIAS(msql_freeresult, msql_free_result, arginfo_msql_free_result) + PHP_FALIAS(msql_numfields, msql_num_fields, arginfo_msql_num_fields) + PHP_FALIAS(msql_numrows, msql_num_rows, arginfo_msql_num_rows) + PHP_FALIAS(msql_listdbs, msql_list_dbs, arginfo_msql_list_dbs) + PHP_FALIAS(msql_listtables, msql_list_tables, arginfo_msql_list_tables) + PHP_FALIAS(msql_listfields, msql_list_fields, arginfo_msql_list_fields) + PHP_FALIAS(msql_dbname, msql_result, arginfo_msql_result) + PHP_FALIAS(msql_tablename, msql_result, arginfo_msql_result) {NULL, NULL, NULL} }; /* }}} */ diff --git a/ext/odbc/birdstep.c b/ext/odbc/birdstep.c index 6d12452da3..0f1f3b58a5 100644 --- a/ext/odbc/birdstep.c +++ b/ext/odbc/birdstep.c @@ -49,37 +49,104 @@ #include "ext/standard/info.h" #include "php_ini.h" +/* {{{ arginfo */ +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_connect, 0, 0, 3) + ZEND_ARG_INFO(0, server) + ZEND_ARG_INFO(0, user) + ZEND_ARG_INFO(0, pass) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_close, 0, 0, 1) + ZEND_ARG_INFO(0, id) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_exec, 0, 0, 2) + ZEND_ARG_INFO(0, index) + ZEND_ARG_INFO(0, exec_str) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_fetch, 0, 0, 1) + ZEND_ARG_INFO(0, index) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_result, 0, 0, 2) + ZEND_ARG_INFO(0, index) + ZEND_ARG_INFO(0, col) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_freeresult, 0, 0, 1) + ZEND_ARG_INFO(0, index) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_autocommit, 0, 0, 1) + ZEND_ARG_INFO(0, index) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_off_autocommit, 0, 0, 1) + ZEND_ARG_INFO(0, index) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_commit, 0, 0, 1) + ZEND_ARG_INFO(0, index) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_rollback, 0, 0, 1) + ZEND_ARG_INFO(0, index) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_fieldname, 0, 0, 2) + ZEND_ARG_INFO(0, index) + ZEND_ARG_INFO(0, col) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_fieldnum, 0, 0, 1) + ZEND_ARG_INFO(0, index) +ZEND_END_ARG_INFO() +/* }}} */ + const zend_function_entry birdstep_functions[] = { - PHP_FE(birdstep_connect, NULL) - PHP_FE(birdstep_close, NULL) - PHP_FE(birdstep_exec, NULL) - PHP_FE(birdstep_fetch, NULL) - PHP_FE(birdstep_result, NULL) - PHP_FE(birdstep_freeresult, NULL) - PHP_FE(birdstep_autocommit, NULL) - PHP_FE(birdstep_off_autocommit, NULL) - PHP_FE(birdstep_commit, NULL) - PHP_FE(birdstep_rollback, NULL) - PHP_FE(birdstep_fieldnum, NULL) - PHP_FE(birdstep_fieldname, NULL) + PHP_FE(birdstep_connect, arginfo_birdstep_connect) + PHP_FE(birdstep_close, arginfo_birdstep_close) + PHP_FE(birdstep_exec, arginfo_birdstep_exec) + PHP_FE(birdstep_fetch, arginfo_birdstep_fetch) + PHP_FE(birdstep_result, arginfo_birdstep_result) + PHP_FE(birdstep_freeresult, arginfo_birdstep_freeresult) + PHP_FE(birdstep_autocommit, arginfo_birdstep_autocommit) + PHP_FE(birdstep_off_autocommit, arginfo_birdstep_off_autocommit) + PHP_FE(birdstep_commit, arginfo_birdstep_commit) + PHP_FE(birdstep_rollback, arginfo_birdstep_rollback) + PHP_FE(birdstep_fieldnum, arginfo_birdstep_fieldnum) + PHP_FE(birdstep_fieldname, arginfo_birdstep_fieldname) /* * Temporary Function aliases until the next major upgrade to PHP. * These should allow users to continue to use their current scripts, * but should in reality warn the user that this functionality is * deprecated. */ - PHP_FALIAS(velocis_connect, birdstep_connect, NULL) - PHP_FALIAS(velocis_close, birdstep_close, NULL) - PHP_FALIAS(velocis_exec, birdstep_exec, NULL) - PHP_FALIAS(velocis_fetch, birdstep_fetch, NULL) - PHP_FALIAS(velocis_result, birdstep_result, NULL) - PHP_FALIAS(velocis_freeresult, birdstep_freeresult, NULL) - PHP_FALIAS(velocis_autocommit, birdstep_autocommit, NULL) - PHP_FALIAS(velocis_off_autocommit, birdstep_off_autocommit, NULL) - PHP_FALIAS(velocis_commit, birdstep_commit, NULL) - PHP_FALIAS(velocis_rollback, birdstep_rollback, NULL) - PHP_FALIAS(velocis_fieldnum, birdstep_fieldnum, NULL) - PHP_FALIAS(velocis_fieldname, birdstep_fieldname, NULL) + PHP_FALIAS(velocis_connect, birdstep_connect, arginfo_birdstep_connect) + PHP_FALIAS(velocis_close, birdstep_close, arginfo_birdstep_close) + PHP_FALIAS(velocis_exec, birdstep_exec, arginfo_birdstep_exec) + PHP_FALIAS(velocis_fetch, birdstep_fetch, arginfo_birdstep_fetch) + PHP_FALIAS(velocis_result, birdstep_result, arginfo_birdstep_result) + PHP_FALIAS(velocis_freeresult, birdstep_freeresult, arginfo_birdstep_freeresult) + PHP_FALIAS(velocis_autocommit, birdstep_autocommit, arginfo_birdstep_autocommit) + PHP_FALIAS(velocis_off_autocommit, birdstep_off_autocommit, arginfo_birdstep_off_autocommit) + PHP_FALIAS(velocis_commit, birdstep_commit, arginfo_birdstep_commit) + PHP_FALIAS(velocis_rollback, birdstep_rollback, arginfo_birdstep_rollback) + PHP_FALIAS(velocis_fieldnum, birdstep_fieldnum, arginfo_birdstep_fieldnum) + PHP_FALIAS(velocis_fieldname, birdstep_fieldname, arginfo_birdstep_fieldname) /* End temporary aliases */ {NULL, NULL, NULL} }; diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 7b372d8597..008a80209b 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -3392,8 +3392,8 @@ const zend_function_entry basic_functions[] = { /* {{{ */ PHP_FE(set_time_limit, arginfo_set_time_limit) PHP_FE(get_cfg_var, arginfo_get_cfg_var) - PHP_FE(get_magic_quotes_gpc, NULL) - PHP_FE(get_magic_quotes_runtime, NULL) + PHP_FE(get_magic_quotes_gpc, arginfo_get_magic_quotes_gpc) + PHP_FE(get_magic_quotes_runtime, arginfo_get_magic_quotes_runtime) PHP_FE(import_request_variables, arginfo_import_request_variables) PHP_FE(error_log, arginfo_error_log) diff --git a/sapi/apache/php_apache.c b/sapi/apache/php_apache.c index d68e192875..78ab895f9d 100644 --- a/sapi/apache/php_apache.c +++ b/sapi/apache/php_apache.c @@ -56,18 +56,67 @@ PHP_FUNCTION(apache_reset_timeout); 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() + + + const zend_function_entry apache_functions[] = { - PHP_FE(virtual, NULL) - PHP_FE(apache_request_headers, NULL) - PHP_FE(apache_note, NULL) - PHP_FE(apache_lookup_uri, NULL) - PHP_FE(apache_child_terminate, NULL) - PHP_FE(apache_setenv, NULL) - PHP_FE(apache_response_headers, NULL) - PHP_FE(apache_get_version, NULL) - PHP_FE(apache_get_modules, NULL) - PHP_FE(apache_reset_timeout, NULL) - PHP_FALIAS(getallheaders, apache_request_headers, NULL) + PHP_FE(virtual, arginfo_apache_virtual) + PHP_FE(apache_request_headers, arginfo_apache_request_headers) + PHP_FE(apache_note, arginfo_apache_note) + PHP_FE(apache_lookup_uri, arginfo_apache_lookup_uri) + PHP_FE(apache_child_terminate, arginfo_apache_child_terminate) + PHP_FE(apache_setenv, arginfo_apache_setenv) + PHP_FE(apache_response_headers, arginfo_apache_response_headers) + PHP_FE(apache_get_version, arginfo_apache_get_version) + PHP_FE(apache_get_modules, arginfo_apache_get_modules) + PHP_FE(apache_reset_timeout, arginfo_apache_reset_timeout) + PHP_FALIAS(getallheaders, apache_request_headers, arginfo_apache_request_headers) {NULL, NULL, NULL} }; diff --git a/sapi/apache2filter/php_functions.c b/sapi/apache2filter/php_functions.c index 239b1d6893..290e575f24 100644 --- a/sapi/apache2filter/php_functions.c +++ b/sapi/apache2filter/php_functions.c @@ -359,17 +359,64 @@ PHP_MINFO_FUNCTION(apache) php_info_print_table_end(); } +/* {{{ 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() +/* }}} */ + 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_apache2filter_lookup_uri) + PHP_FE(virtual, arginfo_apache2filter_virtual) + PHP_FE(apache_request_headers, arginfo_apache2filter_getallheaders) + PHP_FE(apache_response_headers, arginfo_apache2filter_response_headers) + PHP_FE(apache_setenv, arginfo_apache2filter_setenv) + PHP_FE(apache_getenv, arginfo_apache2filter_getenv) + PHP_FE(apache_note, arginfo_apache2filter_note) + PHP_FE(apache_get_version, arginfo_apache2filter_get_version) + PHP_FE(apache_get_modules, arginfo_apache2filter_get_modules) + PHP_FALIAS(getallheaders, apache_request_headers, arginfo_apache2filter_getallheaders) {NULL, NULL, NULL} }; diff --git a/sapi/apache_hooks/php_apache.c b/sapi/apache_hooks/php_apache.c index 1b24dd8b1c..2e43bf3058 100644 --- a/sapi/apache_hooks/php_apache.c +++ b/sapi/apache_hooks/php_apache.c @@ -59,18 +59,64 @@ PHP_FUNCTION(apache_get_modules); 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) +ZEND_END_ARG_INFO() const zend_function_entry apache_functions[] = { - PHP_FE(virtual, NULL) - PHP_FE(apache_request_headers, NULL) - PHP_FE(apache_note, NULL) - PHP_FE(apache_lookup_uri, NULL) - PHP_FE(apache_child_terminate, NULL) - PHP_FE(apache_setenv, NULL) - PHP_FE(apache_response_headers, NULL) - PHP_FE(apache_get_version, NULL) - PHP_FE(apache_get_modules, NULL) - PHP_FALIAS(getallheaders, apache_request_headers, NULL) + PHP_FE(virtual, arginfo_apachehooks_virtual) + PHP_FE(apache_request_headers, arginfo_apachehooks_request_headers) + PHP_FE(apache_note, arginfo_apachehooks_note) + PHP_FE(apache_lookup_uri, arginfo_apachehooks_lookup_uri) + PHP_FE(apache_child_terminate, arginfo_apachehooks_child_terminate) + PHP_FE(apache_setenv, arginfo_apachehooks_setenv) + PHP_FE(apache_response_headers, arginfo_apachehooks_response_headers) + PHP_FE(apache_get_version, arginfo_apachehooks_get_version) + PHP_FE(apache_get_modules, arginfo_apachehooks_get_modules) + PHP_FALIAS(getallheaders, apache_request_headers, arginfo_apachehooks_request_headers) {NULL, NULL, NULL} }; -- 2.40.0