MFH: Fixed bug #24958 (Incorrect handling of 404s)

diff --git a/NEWS b/NEWS
index b4ddad708447172ad5262ce4de55b82fdbdf24ba..2131f898b1e029bd43abf0937ad0569aba64de62 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 PHP 4                                                                      NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? Aug 2003, Version 4.3.3RC3
+- Fixed bug #24958 (Incorrect handling of 404s). (Ilia, Justin)
 - Fixed bug #24936 (ext/fdf not linked properly as shared extension). (Jani)
 - Fixed bug #24883 (variables_order and gpc_order being ignored). (Ilia)
 - Fixed bug #24871 (methods misidentified as constructors). (Ilia)

diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index d766b28011cdbf25b8768888661d41b241eac21e..93cc3fdab50b28d0f1db0311e92d3b12ebc4d596 100644 (file)
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -473,6 +473,15 @@ static int php_handler(request_rec *r)
                return DECLINED;
        }
 
+       if (r->finfo.filetype == 0) {
+               php_apache_sapi_log_message("script not found or unable to stat");
+               return HTTP_NOT_FOUND;
+       }
+       if (r->finfo.filetype == APR_DIR) {
+               php_apache_sapi_log_message("attempt to invoke directory as script");
+               return HTTP_FORBIDDEN;
+       }
+
        /* Setup the CGI variables if this is the main request */
        if (r->main == NULL || 
                /* .. or if the sub-request envinronment differs from the main-request. */ 
@@ -503,15 +512,6 @@ static int php_handler(request_rec *r)
                brigade = ctx->brigade;
        }
 
-       if (r->finfo.filetype == 0) {
-               php_apache_sapi_log_message("script not found or unable to stat");
-               return HTTP_NOT_FOUND;
-       }
-       if (r->finfo.filetype == APR_DIR) {
-               php_apache_sapi_log_message("attempt to invoke directory as script");
-               return HTTP_FORBIDDEN;
-       }
-
        if (AP2(last_modified)) {
                ap_update_mtime(r, r->finfo.mtime);
                ap_set_last_modified(r);