mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-28 20:34:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

revert my last change; chasing ghosts.

Browse Source 
# the lesson is, ensure that php4 and php5 aren't loaded at the same time
This commit is contained in:
Wez Furlong 2005-07-19 19:25:33 +00:00
parent 546418a66b
commit 27c24383ee
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
main/php_variables.c
View File

@ -625,9 +625,7 @@ int php_hash_environment(TSRMLS_D)
case 'p': case 'p':
case 'P': case 'P':
if (!_gpc_flags[0] && !SG(headers_sent) && SG(request_info).request_method && !strcasecmp(SG(request_info).request_method, "POST")) { 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; _gpc_flags[0] = 1;
if (PG(register_globals)) { if (PG(register_globals)) {
php_autoglobal_merge(&EG(symbol_table), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_POST]) TSRMLS_CC); 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':
case 'C': case 'C':
if (!_gpc_flags[1]) { 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; _gpc_flags[1] = 1;
if (PG(register_globals)) { if (PG(register_globals)) {
php_autoglobal_merge(&EG(symbol_table), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_COOKIE]) TSRMLS_CC); 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':
case 'G': case 'G':
if (!_gpc_flags[2]) { 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; _gpc_flags[2] = 1;
if (PG(register_globals)) { if (PG(register_globals)) {
php_autoglobal_merge(&EG(symbol_table), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_GET]) TSRMLS_CC); php_autoglobal_merge(&EG(symbol_table), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_GET]) TSRMLS_CC);