Mirrors
/
php
mirror of https://github.com/php/php-src
3
0
Fork 0
Code Releases Activity
Browse Source

- Remove gpc_order since it doesn't serve any purpose.

PEAR_1_4DEV
foobar 22 years ago
parent
3507f04062
commit
e3c80d52da
5 changed files with 9 additions and 52 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      main/main.c
  2. 1
      main/php_globals.h
  3. 47
      main/php_variables.c
  4. 5
      php.ini-dist
  5. 5
      php.ini-recommended

3
main/main.c
View File

@ -297,7 +297,6 @@ PHP_INI_BEGIN()
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 @@ PHP_INI_BEGIN()
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)

1
main/php_globals.h
View File

@ -103,7 +103,6 @@ struct _php_core_globals {
arg_separators arg_separator;
char *gpc_order;
char *variables_order;
HashTable rfc1867_protected_variables;

47
main/php_variables.c
View File

@ -549,11 +549,9 @@ int php_hash_environment(TSRMLS_D)
{
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 @@ int php_hash_environment(TSRMLS_D)
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 @@ int php_hash_environment(TSRMLS_D)
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 @@ int php_hash_environment(TSRMLS_D)
}
}
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_env(char *name, uint name_len TSRMLS_DC
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':

5
php.ini-dist
View File

@ -382,9 +382,6 @@ register_argc_argv = On
; 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 @@ default_socket_timeout = 60
;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

5
php.ini-recommended
View File

@ -401,9 +401,6 @@ register_argc_argv = Off
; 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 @@ default_socket_timeout = 60
;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

Write Preview
Loading…
Cancel
Save