Patch pm_return_404_without_scriptfilename_v2.diff for FPM related Bug #69625

Patch version 2015-05-12 06:45 UTC

Obsoleted by patches:

• fpm_return_404_without_scriptfilename_v3.diff, revision 2015-05-12 13:12 UTC

Obsolete patches:

• fpm_return_404_without_scriptfilename.diff, revision 2015-05-12 05:19 UTC

• 2015-05-12 06:45 UTC [diff to current]

Developer: cfc4n@cnxct.com

--- fpm_main.c	2015-05-12 13:05:25.000000000 +0800
+++ fpm_main_fix.c	2015-05-12 13:08:15.000000000 +0800
@@ -1833,16 +1833,6 @@
 				return FPM_EXIT_SOFTWARE;
 			}
 
-			/* check if request_method has been sent.
-			 * if not, it's certainly not an HTTP over fcgi request */
-			if (!SG(request_info).request_method) {
-				goto fastcgi_request_done;
-			}
-
-			if (fpm_status_handle_request()) {
-				goto fastcgi_request_done;
-			}
-
 			/* If path_translated is NULL, terminate here with a 404 */
 			if (!SG(request_info).path_translated) {
 				zend_try {
@@ -1854,6 +1844,16 @@
 				goto fastcgi_request_done;
 			}
 
+			/* check if request_method has been sent.
+			 * if not, it's certainly not an HTTP over fcgi request */
+			if (!SG(request_info).request_method) {
+				goto fastcgi_request_done;
+			}
+
+			if (fpm_status_handle_request()) {
+				goto fastcgi_request_done;
+			}
+
 			if (fpm_php_limit_extensions(SG(request_info).path_translated)) {
 				SG(sapi_headers).http_response_code = 403;
 				PUTS("Access denied.\n");