Why are you making such a change in a feature freeze?
Andi
At 04:15 AM 1/26/2004 +0000, Jani Taskinen wrote:
sniper Sun Jan 25 23:15:09 2004 EDT
Modified files: /php-src php.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.204&r2=1.205&ty=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-dist Sun 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.149&r2=1.150&ty=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.585&r2=1.586&ty=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.95&r2=1.96&ty=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
--- php-src/main/php_globals.h:1.95 Thu Jan 8 12:33:04 2004
+++ php-src/main/php_globals.h Sun Jan 25 23:15:08 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_globals.h,v 1.95 2004/01/08 17:33:04 sniper Exp $ */ +/* $Id: php_globals.h,v 1.96 2004/01/26 04:15:08 sniper Exp $ */
#ifndef PHP_GLOBALS_H #define PHP_GLOBALS_H @@ -103,7 +103,6 @@
arg_separators arg_separator;
- char *gpc_order; char *variables_order;
HashTable rfc1867_protected_variables; http://cvs.php.net/diff.php/php-src/main/php_variables.c?r1=1.75&r2=1.76&ty=u Index: php-src/main/php_variables.c diff -u php-src/main/php_variables.c:1.75 php-src/main/php_variables.c:1.76 --- php-src/main/php_variables.c:1.75 Thu Jan 8 03:17:54 2004 +++ php-src/main/php_variables.c Sun Jan 25 23:15:08 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */
-/* $Id: php_variables.c,v 1.75 2004/01/08 08:17:54 andi Exp $ */ +/* $Id: php_variables.c,v 1.76 2004/01/26 04:15:08 sniper Exp $ */
#include <stdio.h>
#include "php.h"
@@ -549,11 +549,9 @@
{
char *p;
unsigned char _gpc_flags[5] = {0, 0, 0, 0, 0};
- zend_bool have_variables_order;
zval *dummy_track_vars_array = NULL;
zend_bool initialized_dummy_track_vars_array=0;
zend_bool jit_initialization = (!PG(register_globals) && !PG(register_long_arrays));
- char *variables_order;
struct auto_global_record {
char *name;
uint name_len;
@@ -576,22 +574,7 @@
PG(http_globals)[i] = NULL;
}
- if (PG(variables_order)) {
- variables_order = PG(variables_order);
- have_variables_order=1;
- } else {
- variables_order = PG(gpc_order);
- have_variables_order=0;
- ALLOC_ZVAL(PG(http_globals)[TRACK_VARS_ENV]);
- array_init(PG(http_globals)[TRACK_VARS_ENV]);
- INIT_PZVAL(PG(http_globals)[TRACK_VARS_ENV]);
- php_import_environment_variables(PG(http_globals)[TRACK_VARS_ENV] TSRMLS_CC);
- if (PG(register_globals)) {
- php_autoglobal_merge(&EG(symbol_table), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_ENV]) TSRMLS_CC);
- }
- }
-
- for (p=variables_order; p && *p; p++) {
+ for (p=PG(variables_order); p && *p; p++) {
switch(*p) {
case 'p':
case 'P':
@@ -626,15 +609,11 @@
case 'e':
case 'E':
if (!jit_initialization && !_gpc_flags[3]) {
- if (have_variables_order) {
- php_auto_globals_create_env("_ENV", sizeof("_ENV")-1 TSRMLS_CC);
- if (PG(register_globals)) {
- php_autoglobal_merge(&EG(symbol_table), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_ENV]) TSRMLS_CC);
- }
- } else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unsupported 'e' element (environment) used in gpc_order - use variables_order instead");
- }
+ php_auto_globals_create_env("_ENV", sizeof("_ENV")-1 TSRMLS_CC);
_gpc_flags[3]=1;
+ if (PG(register_globals)) {
+ php_autoglobal_merge(&EG(symbol_table), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_ENV]) TSRMLS_CC);
+ }
}
break;
case 's':
@@ -650,13 +629,6 @@
}
}
- if (!jit_initialization && !have_variables_order && !_gpc_flags[4]) {
- php_register_server_variables(TSRMLS_C);
- if (PG(register_globals)) {
- php_autoglobal_merge(&EG(symbol_table), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER]) TSRMLS_CC);
- }
- }
-
/* argv/argc support */
if (PG(register_argc_argv)) {
php_build_argv(SG(request_info).query_string, PG(http_globals)[TRACK_VARS_SERVER] TSRMLS_CC);
@@ -734,21 +706,14 @@
static zend_bool php_auto_globals_create_request(char *name, uint name_len TSRMLS_DC)
{
zval *form_variables;
- char *variables_order;
unsigned char _gpc_flags[3] = {0, 0, 0};
char *p;
- if (PG(variables_order)) { - variables_order = PG(variables_order); - } else { - variables_order = PG(gpc_order); - } - ALLOC_ZVAL(form_variables); array_init(form_variables); INIT_PZVAL(form_variables);
- for (p=variables_order; p && *p; p++) { + for (p=PG(variables_order); p && *p; p++) { switch (*p) { case 'g': case 'G':
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
-- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
