diff options
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/apache/mod_php5.c | 3 | ||||
| -rw-r--r-- | sapi/apache_hooks/mod_php5.c | 3 | ||||
| -rw-r--r-- | sapi/apache_hooks/sapi_apache.c | 10 | ||||
| -rw-r--r-- | sapi/cli/README | 4 |
4 files changed, 5 insertions, 15 deletions
diff --git a/sapi/apache/mod_php5.c b/sapi/apache/mod_php5.c index 9711e3fa70..6b287c1a6b 100644 --- a/sapi/apache/mod_php5.c +++ b/sapi/apache/mod_php5.c @@ -278,9 +278,6 @@ static void sapi_apache_register_server_variables(zval *track_vars_array TSRMLS_ /* If PATH_TRANSLATED doesn't exist, copy it from SCRIPT_FILENAME */ if (track_vars_array) { symbol_table = track_vars_array->value.ht; - } else if (PG(register_globals)) { - /* should never happen nowadays */ - symbol_table = EG(active_symbol_table); } else { symbol_table = NULL; } diff --git a/sapi/apache_hooks/mod_php5.c b/sapi/apache_hooks/mod_php5.c index 33d20969be..aaedb69b80 100644 --- a/sapi/apache_hooks/mod_php5.c +++ b/sapi/apache_hooks/mod_php5.c @@ -403,9 +403,6 @@ static void sapi_apache_register_server_variables(zval *track_vars_array TSRMLS_ /* If PATH_TRANSLATED doesn't exist, copy it from SCRIPT_FILENAME */ if (track_vars_array) { symbol_table = track_vars_array->value.ht; - } else if (PG(register_globals)) { - /* should never happen nowadays */ - symbol_table = EG(active_symbol_table); } else { symbol_table = NULL; } diff --git a/sapi/apache_hooks/sapi_apache.c b/sapi/apache_hooks/sapi_apache.c index 5c9fbb7816..b7fd658eb5 100644 --- a/sapi/apache_hooks/sapi_apache.c +++ b/sapi/apache_hooks/sapi_apache.c @@ -78,13 +78,9 @@ int apache_php_module_hook(request_rec *r, php_handler *handler, zval **ret TSRM return FAILURE; } - req = php_apache_request_new(r); - if(PG(register_globals)) { - php_register_variable_ex("request", req, NULL TSRMLS_CC); - } - else { - php_register_variable_ex("request", req, PG(http_globals)[TRACK_VARS_SERVER] TSRMLS_CC); - } + req = php_apache_request_new(r); + php_register_variable_ex("request", req, PG(http_globals)[TRACK_VARS_SERVER] TSRMLS_CC); + switch(handler->type) { case AP_HANDLER_TYPE_FILE: php_register_variable("PHP_SELF_HOOK", handler->name, PG(http_globals)[TRACK_VARS_SERVER] TSRMLS_CC); diff --git a/sapi/cli/README b/sapi/cli/README index 9e519e9bd0..8720250f6a 100644 --- a/sapi/cli/README +++ b/sapi/cli/README @@ -11,8 +11,8 @@ The main differences between the two: * It does not change the working directory to that of the script. (-C switch kept for compatibility) * Plain text error message -* $argc and $argv registered irrespective of register_globals - and register_argc_argv php.ini settings. +* $argc and $argv registered irrespective of the register_argc_argv + php.ini setting. * implicit_flush always on * -r option which allows execution of PHP code directly from the command line (e.g. php -r 'echo md5("test");' ) |