- Merge: improve fix for #49767 and #47627 - make PHP report 'no script' on 404 again

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 80110dd83fc365b031de527e2d9862edf8953835..f78cc484aaaa478d666c549a1955518c34d6ff01 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -2038,7 +2038,7 @@ consult the installation file that came with this distribution, or visit \n\
                                1. we are running from shell and got filename was there
                                2. we are running as cgi or fastcgi
                        */
-                       if (cgi || SG(request_info).path_translated) {
+                       if (cgi || fastcgi || SG(request_info).path_translated) {
                                if (php_fopen_primary_script(&file_handle TSRMLS_CC) == FAILURE) {
                                        if (errno == EACCES) {
                                                SG(sapi_headers).http_response_code = 403;