felipe Sun Jul 20 14:28:41 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mime_magic mime_magic.c /php-src/ext/msql php_msql.c /php-src/ext/odbc birdstep.c /php-src/ext/standard basic_functions.c /php-src/sapi/apache php_apache.c /php-src/sapi/apache2filter php_functions.c /php-src/sapi/apache_hooks php_apache.c Log: - Added arginfo
http://cvs.php.net/viewvc.cgi/php-src/ext/mime_magic/mime_magic.c?r1=1.42.2.5.2.7.2.2&r2=1.42.2.5.2.7.2.3&diff_format=u Index: php-src/ext/mime_magic/mime_magic.c diff -u php-src/ext/mime_magic/mime_magic.c:1.42.2.5.2.7.2.2 php-src/ext/mime_magic/mime_magic.c:1.42.2.5.2.7.2.3 --- php-src/ext/mime_magic/mime_magic.c:1.42.2.5.2.7.2.2 Mon Dec 31 07:17:10 2007 +++ php-src/ext/mime_magic/mime_magic.c Sun Jul 20 14:28:40 2008 @@ -15,7 +15,7 @@ | Author: Hartmut Holzgraefe <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ - $Id: mime_magic.c,v 1.42.2.5.2.7.2.2 2007/12/31 07:17:10 sebastian Exp $ + $Id: mime_magic.c,v 1.42.2.5.2.7.2.3 2008/07/20 14:28:40 felipe Exp $ This module contains a lot of stuff taken from Apache mod_mime_magic, so the license section is a little bit longer than usual: @@ -217,9 +217,16 @@ /* 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} }; /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/msql/php_msql.c?r1=1.60.2.4.2.2.2.4&r2=1.60.2.4.2.2.2.5&diff_format=u Index: php-src/ext/msql/php_msql.c diff -u php-src/ext/msql/php_msql.c:1.60.2.4.2.2.2.4 php-src/ext/msql/php_msql.c:1.60.2.4.2.2.2.5 --- php-src/ext/msql/php_msql.c:1.60.2.4.2.2.2.4 Sat Jul 5 13:13:27 2008 +++ php-src/ext/msql/php_msql.c Sun Jul 20 14:28:41 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_msql.c,v 1.60.2.4.2.2.2.4 2008/07/05 13:13:27 pajoye Exp $ */ +/* $Id: php_msql.c,v 1.60.2.4.2.2.2.5 2008/07/20 14:28:41 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -44,58 +44,224 @@ #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_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_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, 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, NULL) + 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} }; /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/birdstep.c?r1=1.13.2.2.2.2.2.3&r2=1.13.2.2.2.2.2.4&diff_format=u Index: php-src/ext/odbc/birdstep.c diff -u php-src/ext/odbc/birdstep.c:1.13.2.2.2.2.2.3 php-src/ext/odbc/birdstep.c:1.13.2.2.2.2.2.4 --- php-src/ext/odbc/birdstep.c:1.13.2.2.2.2.2.3 Wed Jun 25 16:18:55 2008 +++ php-src/ext/odbc/birdstep.c Sun Jul 20 14:28:41 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: birdstep.c,v 1.13.2.2.2.2.2.3 2008/06/25 16:18:55 felipe Exp $ */ +/* $Id: birdstep.c,v 1.13.2.2.2.2.2.4 2008/07/20 14:28:41 felipe Exp $ */ /* * TODO: @@ -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} }; http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.37&r2=1.725.2.31.2.64.2.38&diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.37 php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.38 --- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.37 Thu Jul 17 19:29:34 2008 +++ php-src/ext/standard/basic_functions.c Sun Jul 20 14:28:41 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.37 2008/07/17 19:29:34 felipe Exp $ */ +/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.38 2008/07/20 14:28:41 felipe Exp $ */ #include "php.h" #include "php_streams.h" @@ -688,6 +688,19 @@ /* }}} */ /* {{{ basic_functions.c */ static +ZEND_BEGIN_ARG_INFO(arginfo_get_magic_quotes_gpc, 0) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO(arginfo_get_magic_quotes_runtime, 0) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_set_magic_quotes_runtime, 0, 0, 1) + ZEND_ARG_INFO(0, new_setting) +ZEND_END_ARG_INFO() + +static ZEND_BEGIN_ARG_INFO(arginfo_constant, 0) ZEND_ARG_INFO(0, const_name) ZEND_END_ARG_INFO() @@ -3345,10 +3358,10 @@ PHP_FE(set_time_limit, arginfo_set_time_limit) PHP_FE(get_cfg_var, arginfo_get_cfg_var) - PHP_DEP_FALIAS(magic_quotes_runtime, set_magic_quotes_runtime, NULL) - PHP_DEP_FE(set_magic_quotes_runtime, NULL) - PHP_FE(get_magic_quotes_gpc, NULL) - PHP_FE(get_magic_quotes_runtime, NULL) + PHP_DEP_FALIAS(magic_quotes_runtime, set_magic_quotes_runtime, arginfo_set_magic_quotes_runtime) + PHP_DEP_FE(set_magic_quotes_runtime, arginfo_set_magic_quotes_runtime) + 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) http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/php_apache.c?r1=1.89.2.4.2.6.2.4&r2=1.89.2.4.2.6.2.5&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.4 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.4 Tue Jul 1 07:58:42 2008 +++ php-src/sapi/apache/php_apache.c Sun Jul 20 14:28:41 2008 @@ -17,7 +17,7 @@ | David Sklar <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: php_apache.c,v 1.89.2.4.2.6.2.4 2008/07/01 07:58:42 tony2001 Exp $ */ +/* $Id: php_apache.c,v 1.89.2.4.2.6.2.5 2008/07/20 14:28:41 felipe Exp $ */ #include "php_apache_http.h" @@ -56,18 +56,67 @@ 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} }; http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/php_functions.c?r1=1.44.2.2.2.2.2.2&r2=1.44.2.2.2.2.2.3&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.2 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.2 Mon Dec 31 07:17:18 2007 +++ php-src/sapi/apache2filter/php_functions.c Sun Jul 20 14:28:41 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_functions.c,v 1.44.2.2.2.2.2.2 2007/12/31 07:17:18 sebastian Exp $ */ +/* $Id: php_functions.c,v 1.44.2.2.2.2.2.3 2008/07/20 14:28:41 felipe Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -359,17 +359,64 @@ 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} }; http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache.c?r1=1.19.2.3.2.5.2.3&r2=1.19.2.3.2.5.2.4&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.3 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.3 Mon Mar 10 22:12:33 2008 +++ php-src/sapi/apache_hooks/php_apache.c Sun Jul 20 14:28:41 2008 @@ -17,7 +17,7 @@ | David Sklar <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: php_apache.c,v 1.19.2.3.2.5.2.3 2008/03/10 22:12:33 felipe Exp $ */ +/* $Id: php_apache.c,v 1.19.2.3.2.5.2.4 2008/07/20 14:28:41 felipe Exp $ */ #include "php_apache_http.h" @@ -59,18 +59,64 @@ 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} };
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php