MFH: - Fixed bug #31717: Reject PATH_INFO if "AcceptPathInfo off" is used.

diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index b530d8c222d66c2d8c42fb9e7097c05ce7e6b938..a6c3ea0f440b6d7991850b67e91becac53db53d3 100644 (file)
--- 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 {