diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2010-04-21 01:27:22 +0000 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2010-04-21 01:27:22 +0000 |
| commit | febee112850af0e56a57e2b38c9043c07dc99465 (patch) | |
| tree | 42888ff0eb0f99d65dddeea4b1b0f5e161906ee0 /sapi/apache_hooks/sapi_apache.c | |
| parent | bae9248602dc16b90db44473c903fbf539793aa7 (diff) | |
| download | php-git-febee112850af0e56a57e2b38c9043c07dc99465.tar.gz | |
Removed register_globals
Diffstat (limited to 'sapi/apache_hooks/sapi_apache.c')
| -rw-r--r-- | sapi/apache_hooks/sapi_apache.c | 10 |
1 files changed, 3 insertions, 7 deletions
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); |