diff options
| author | Wez Furlong <wez@php.net> | 2005-07-19 19:25:33 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2005-07-19 19:25:33 +0000 |
| commit | 27c24383eea4a3fe7291ef0461e25a987019d8d9 (patch) | |
| tree | 52a1b3903728f2fbf6978e194283f6f493a8d13f /main/php_variables.c | |
| parent | 546418a66b4df839325419eb70616357c0b55ffe (diff) | |
| download | php-git-27c24383eea4a3fe7291ef0461e25a987019d8d9.tar.gz | |
revert my last change; chasing ghosts.
# the lesson is, ensure that php4 and php5 aren't loaded at the same time
Diffstat (limited to 'main/php_variables.c')
| -rw-r--r-- | main/php_variables.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/main/php_variables.c b/main/php_variables.c index c6bdbbff47..b468c51df0 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -625,9 +625,7 @@ int php_hash_environment(TSRMLS_D) case 'p': case 'P': if (!_gpc_flags[0] && !SG(headers_sent) && SG(request_info).request_method && !strcasecmp(SG(request_info).request_method, "POST")) { - if (sapi_module.treat_data) { - sapi_module.treat_data(PARSE_POST, NULL, NULL TSRMLS_CC); /* POST Data */ - } + sapi_module.treat_data(PARSE_POST, NULL, NULL TSRMLS_CC); /* POST Data */ _gpc_flags[0] = 1; if (PG(register_globals)) { php_autoglobal_merge(&EG(symbol_table), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_POST]) TSRMLS_CC); @@ -637,9 +635,7 @@ int php_hash_environment(TSRMLS_D) case 'c': case 'C': if (!_gpc_flags[1]) { - if (sapi_module.treat_data) { - sapi_module.treat_data(PARSE_COOKIE, NULL, NULL TSRMLS_CC); /* Cookie Data */ - } + sapi_module.treat_data(PARSE_COOKIE, NULL, NULL TSRMLS_CC); /* Cookie Data */ _gpc_flags[1] = 1; if (PG(register_globals)) { php_autoglobal_merge(&EG(symbol_table), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_COOKIE]) TSRMLS_CC); @@ -649,9 +645,7 @@ int php_hash_environment(TSRMLS_D) case 'g': case 'G': if (!_gpc_flags[2]) { - if (sapi_module.treat_data) { - sapi_module.treat_data(PARSE_GET, NULL, NULL TSRMLS_CC); /* GET Data */ - } + sapi_module.treat_data(PARSE_GET, NULL, NULL TSRMLS_CC); /* GET Data */ _gpc_flags[2] = 1; if (PG(register_globals)) { php_autoglobal_merge(&EG(symbol_table), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_GET]) TSRMLS_CC); |