diff options
| author | Dmitry Stogov <dmitry@php.net> | 2006-03-16 09:44:42 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2006-03-16 09:44:42 +0000 |
| commit | 22055cb8fddf93085b518a5c21370c26c0a1cb2c (patch) | |
| tree | 3c887b8361fb10ce77bc211573a40a9bbe455909 /main/php_variables.c | |
| parent | 37ab9aa47430f893f50ac654a17ea1fb209318ac (diff) | |
| download | php-git-22055cb8fddf93085b518a5c21370c26c0a1cb2c.tar.gz | |
Dropped register_long_arrays, added E_CORE for all dropped setting
Diffstat (limited to 'main/php_variables.c')
| -rw-r--r-- | main/php_variables.c | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/main/php_variables.c b/main/php_variables.c index 153c2d3fe3..10888ec5f1 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -818,20 +818,18 @@ int php_hash_environment(TSRMLS_D) unsigned char _gpc_flags[5] = {0, 0, 0, 0, 0}; zval *dummy_track_vars_array = NULL; zend_bool initialized_dummy_track_vars_array=0; - zend_bool jit_initialization = (PG(auto_globals_jit) && !PG(register_long_arrays) && !PG(register_argc_argv)); + zend_bool jit_initialization = (PG(auto_globals_jit) && !PG(register_argc_argv)); struct auto_global_record { char *name; uint name_len; - char *long_name; - uint long_name_len; zend_bool jit_initialization; } auto_global_records[] = { - { "_POST", sizeof("_POST"), "HTTP_POST_VARS", sizeof("HTTP_POST_VARS"), 0 }, - { "_GET", sizeof("_GET"), "HTTP_GET_VARS", sizeof("HTTP_GET_VARS"), 0 }, - { "_COOKIE", sizeof("_COOKIE"), "HTTP_COOKIE_VARS", sizeof("HTTP_COOKIE_VARS"), 0 }, - { "_SERVER", sizeof("_SERVER"), "HTTP_SERVER_VARS", sizeof("HTTP_SERVER_VARS"), 1 }, - { "_ENV", sizeof("_ENV"), "HTTP_ENV_VARS", sizeof("HTTP_ENV_VARS"), 1 }, - { "_FILES", sizeof("_FILES"), "HTTP_POST_FILES", sizeof("HTTP_POST_FILES"), 0 }, + { "_POST", sizeof("_POST"), 0 }, + { "_GET", sizeof("_GET"), 0 }, + { "_COOKIE", sizeof("_COOKIE"), 0 }, + { "_SERVER", sizeof("_SERVER"), 1 }, + { "_ENV", sizeof("_ENV"), 1 }, + { "_FILES", sizeof("_FILES"), 0 }, }; size_t num_track_vars = sizeof(auto_global_records)/sizeof(struct auto_global_record); size_t i; @@ -906,10 +904,6 @@ int php_hash_environment(TSRMLS_D) PG(http_globals)[i]->refcount++; zend_hash_update(&EG(symbol_table), auto_global_records[i].name, auto_global_records[i].name_len, &PG(http_globals)[i], sizeof(zval *), NULL); - if (PG(register_long_arrays)) { - zend_hash_update(&EG(symbol_table), auto_global_records[i].long_name, auto_global_records[i].long_name_len, &PG(http_globals)[i], sizeof(zval *), NULL); - PG(http_globals)[i]->refcount++; - } } /* Create _REQUEST */ @@ -940,11 +934,6 @@ static zend_bool php_auto_globals_create_server(char *name, uint name_len TSRMLS zend_hash_update(&EG(symbol_table), name, name_len + 1, &PG(http_globals)[TRACK_VARS_SERVER], sizeof(zval *), NULL); PG(http_globals)[TRACK_VARS_SERVER]->refcount++; - if (PG(register_long_arrays)) { - zend_hash_update(&EG(symbol_table), "HTTP_SERVER_VARS", sizeof("HTTP_SERVER_VARS"), &PG(http_globals)[TRACK_VARS_SERVER], sizeof(zval *), NULL); - PG(http_globals)[TRACK_VARS_SERVER]->refcount++; - } - return 0; /* don't rearm */ } @@ -966,11 +955,6 @@ static zend_bool php_auto_globals_create_env(char *name, uint name_len TSRMLS_DC zend_hash_update(&EG(symbol_table), name, name_len + 1, &PG(http_globals)[TRACK_VARS_ENV], sizeof(zval *), NULL); PG(http_globals)[TRACK_VARS_ENV]->refcount++; - if (PG(register_long_arrays)) { - zend_hash_update(&EG(symbol_table), "HTTP_ENV_VARS", sizeof("HTTP_ENV_VARS"), &PG(http_globals)[TRACK_VARS_ENV], sizeof(zval *), NULL); - PG(http_globals)[TRACK_VARS_ENV]->refcount++; - } - return 0; /* don't rearm */ } |