[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended /main main.c php_globals.h php_variables.c
stasWed Mar 12 20:53:04 2008 UTC Modified files: /php-srcphp.ini-dist php.ini-recommended /php-src/main main.c php_globals.h php_variables.c Log: MFB: add request_order INI variable to control $_REQUEST content # if not set (default), variables_order still is used # request_order accepts G,P and C http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.272r2=1.273diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.272 php-src/php.ini-dist:1.273 --- php-src/php.ini-dist:1.272 Thu Feb 21 13:36:24 2008 +++ php-src/php.ini-distWed Mar 12 20:53:04 2008 @@ -360,6 +360,12 @@ ; values override older values. variables_order = EGPCS +; This directive describes the order in which PHP registers GET, POST and Cookie +; variables into the _REQUEST array. Registration is done from left to right, +; newer values override older values. +; If this directive is not set, variables_order is used for _REQUEST contents. +; request_order = GP + ; This directive tells PHP whether to declare the argvargc variables (that ; would contain the GET information). If you don't use these variables, you ; should turn it off for increased performance. http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.222r2=1.223diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.222 php-src/php.ini-recommended:1.223 --- php-src/php.ini-recommended:1.222 Thu Feb 21 13:36:25 2008 +++ php-src/php.ini-recommended Wed Mar 12 20:53:04 2008 @@ -399,6 +399,12 @@ ; values override older values. variables_order = GPCS +; This directive describes the order in which PHP registers GET, POST and Cookie +; variables into the _REQUEST array. Registration is done from left to right, +; newer values override older values. +; If this directive is not set, variables_order is used for _REQUEST contents. +request_order = GP + ; This directive tells PHP whether to declare the argvargc variables (that ; would contain the GET information). If you don't use these variables, you ; should turn it off for increased performance. http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.763r2=1.764diff_format=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.763 php-src/main/main.c:1.764 --- php-src/main/main.c:1.763 Sat Mar 8 22:17:32 2008 +++ php-src/main/main.c Wed Mar 12 20:53:04 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: main.c,v 1.763 2008/03/08 22:17:32 colder Exp $ */ +/* $Id: main.c,v 1.764 2008/03/12 20:53:04 stas Exp $ */ /* {{{ includes */ @@ -529,6 +529,7 @@ STD_PHP_INI_ENTRY(user_dir, NULL, PHP_INI_SYSTEM, OnUpdateString, user_dir, php_core_globals, core_globals) STD_PHP_INI_ENTRY(variables_order,EGPCS, PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateStringUnempty, variables_order,php_core_globals, core_globals) + STD_PHP_INI_ENTRY(request_order, NULL, PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateString, request_order, php_core_globals, core_globals) STD_PHP_INI_ENTRY(error_append_string,NULL, PHP_INI_ALL,OnUpdateString, error_append_string, php_core_globals, core_globals) STD_PHP_INI_ENTRY(error_prepend_string, NULL, PHP_INI_ALL,OnUpdateString, error_prepend_string, php_core_globals, core_globals) http://cvs.php.net/viewvc.cgi/php-src/main/php_globals.h?r1=1.116r2=1.117diff_format=u Index: php-src/main/php_globals.h diff -u php-src/main/php_globals.h:1.116 php-src/main/php_globals.h:1.117 --- php-src/main/php_globals.h:1.116Sat Mar 8 22:17:32 2008 +++ php-src/main/php_globals.h Wed Mar 12 20:53:04 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_globals.h,v 1.116 2008/03/08 22:17:32 colder Exp $ */ +/* $Id: php_globals.h,v 1.117 2008/03/12 20:53:04 stas Exp $ */ #ifndef PHP_GLOBALS_H #define PHP_GLOBALS_H @@ -148,6 +148,8 @@ char *user_ini_filename; long user_ini_cache_ttl; + + char *request_order; }; http://cvs.php.net/viewvc.cgi/php-src/main/php_variables.c?r1=1.145r2=1.146diff_format=u Index: php-src/main/php_variables.c diff -u php-src/main/php_variables.c:1.145 php-src/main/php_variables.c:1.146 --- php-src/main/php_variables.c:1.145 Mon Dec 31 07:12:18 2007 +++ php-src/main/php_variables.cWed Mar 12 20:53:04 2008 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php_variables.c,v 1.145 2007/12/31 07:12:18 sebastian Exp $ */ +/* $Id: php_variables.c,v 1.146 2008/03/12 20:53:04 stas Exp $ */ #include
[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended /main main.c php_globals.h php_variables.c
sniper Sun Jan 25 23:15:09 2004 EDT Modified files: /php-srcphp.ini-dist php.ini-recommended /php-src/main main.c php_globals.h php_variables.c Log: - Remove gpc_order since it doesn't serve any purpose. http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.204r2=1.205ty=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.204 php-src/php.ini-dist:1.205 --- php-src/php.ini-dist:1.204 Sun Jan 25 10:18:02 2004 +++ php-src/php.ini-distSun Jan 25 23:15:04 2004 @@ -382,9 +382,6 @@ ; Maximum size of POST data that PHP will accept. post_max_size = 8M -; This directive is deprecated. Use variables_order instead. -gpc_order = GPC - ; Magic quotes ; @@ -531,7 +528,7 @@ ;Windows Extensions -;Note that ODBC support is now built in, so no dll is needed for it. +;Note that ODBC support is built in, so no dll is needed for it. ; ;extension=php_bz2.dll ;extension=php_cpdf.dll http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.149r2=1.150ty=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.149 php-src/php.ini-recommended:1.150 --- php-src/php.ini-recommended:1.149 Sun Jan 25 10:18:02 2004 +++ php-src/php.ini-recommended Sun Jan 25 23:15:04 2004 @@ -401,9 +401,6 @@ ; Maximum size of POST data that PHP will accept. post_max_size = 8M -; This directive is deprecated. Use variables_order instead. -gpc_order = GPC - ; Magic quotes ; @@ -550,7 +547,7 @@ ;Windows Extensions -;Note that ODBC support is now built in, so no dll is needed for it. +;Note that ODBC support is built in, so no dll is needed for it. ; ;extension=php_bz2.dll ;extension=php_cpdf.dll http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.585r2=1.586ty=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.585 php-src/main/main.c:1.586 --- php-src/main/main.c:1.585 Thu Jan 8 03:17:53 2004 +++ php-src/main/main.c Sun Jan 25 23:15:08 2004 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: main.c,v 1.585 2004/01/08 08:17:53 andi Exp $ */ +/* $Id: main.c,v 1.586 2004/01/26 04:15:08 sniper Exp $ */ /* {{{ includes */ @@ -297,7 +297,6 @@ STD_PHP_INI_ENTRY(default_mimetype, SAPI_DEFAULT_MIMETYPE, PHP_INI_ALL,OnUpdateString, default_mimetype, sapi_globals_struct,sapi_globals) STD_PHP_INI_ENTRY(error_log, NULL, PHP_INI_ALL,OnUpdateString, error_log, php_core_globals, core_globals) STD_PHP_INI_ENTRY(extension_dir, PHP_EXTENSION_DIR, PHP_INI_SYSTEM, OnUpdateStringUnempty, extension_dir, php_core_globals, core_globals) - STD_PHP_INI_ENTRY(gpc_order, GPC, PHP_INI_ALL,OnUpdateStringUnempty, gpc_order, php_core_globals, core_globals) STD_PHP_INI_ENTRY(include_path, PHP_INCLUDE_PATH, PHP_INI_ALL,OnUpdateStringUnempty, include_path, php_core_globals, core_globals) PHP_INI_ENTRY(max_execution_time, 30, PHP_INI_ALL,OnUpdateTimeout) STD_PHP_INI_ENTRY(open_basedir, NULL, PHP_INI_SYSTEM, OnUpdateString, open_basedir, php_core_globals, core_globals) @@ -309,7 +308,7 @@ STD_PHP_INI_ENTRY(upload_tmp_dir, NULL, PHP_INI_SYSTEM, OnUpdateStringUnempty, upload_tmp_dir, php_core_globals, core_globals) STD_PHP_INI_ENTRY(user_dir, NULL, PHP_INI_SYSTEM, OnUpdateString, user_dir, php_core_globals, core_globals) - STD_PHP_INI_ENTRY(variables_order,NULL, PHP_INI_ALL, OnUpdateStringUnempty, variables_order,php_core_globals, core_globals) + STD_PHP_INI_ENTRY(variables_order,EGPCS,PHP_INI_ALL, OnUpdateStringUnempty, variables_order,php_core_globals, core_globals) STD_PHP_INI_ENTRY(error_append_string,NULL, PHP_INI_ALL, OnUpdateString, error_append_string,php_core_globals, core_globals) STD_PHP_INI_ENTRY(error_prepend_string, NULL, PHP_INI_ALL, OnUpdateString, error_prepend_string, php_core_globals, core_globals) http://cvs.php.net/diff.php/php-src/main/php_globals.h?r1=1.95r2=1.96ty=u Index: php-src/main/php_globals.h diff -u php-src/main/php_globals.h:1.95 php-src/main/php_globals.h:1.96 ---