diff options
| author | Joe Orton <jorton@php.net> | 2005-03-10 11:39:04 +0000 |
|---|---|---|
| committer | Joe Orton <jorton@php.net> | 2005-03-10 11:39:04 +0000 |
| commit | 6cd9eb9736f35db39000446b28bb86fe329c46f1 (patch) | |
| tree | 881a7784eb5a87413d6b45968e7e22e2c1719bc7 | |
| parent | 1147c223ad476443524a6551812b3b5ea6c6890a (diff) | |
| download | php-git-6cd9eb9736f35db39000446b28bb86fe329c46f1.tar.gz | |
MFH: - Fixed bug #31717: Reject PATH_INFO if "AcceptPathInfo off" is used.
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index b530d8c222..a6c3ea0f44 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -471,6 +471,16 @@ static int php_handler(request_rec *r) } } + /* Give a 404 if PATH_INFO is used but is explicitly disabled in + * the configuration; default behaviour is to accept. */ + if (r->used_path_info == AP_REQ_REJECT_PATH_INFO + && r->path_info && r->path_info[0]) { + zend_try { + zend_ini_deactivate(TSRMLS_C); + } zend_end_try(); + return HTTP_NOT_FOUND; + } + /* handle situations where user turns the engine off */ if (!AP2(engine)) { zend_try { |