From: Pierre Joye <pajoye@php.net>
Date: Mon, 19 Oct 2009 17:04:44 +0000 (+0000)
Subject: - Merge: improve fix for #49767 and #47627 - make PHP report 'no script' on 404 again
X-Git-Tag: php-5.3.1RC2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f9333d925c9918e4301f9957a7428ed65c3b1858;p=php

- 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 80110dd83f..f78cc484aa 100644
--- 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;