Patch Runkit_FPM for FPM related Bug #63746

Patch version 2012-12-11 22:33 UTC

• 2012-12-11 22:33 UTC [diff to current]

Developer: tranelson@x.com

diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
index edd75be..d9abcce 100644
--- a/sapi/fpm/fpm/fpm_main.c
+++ b/sapi/fpm/fpm/fpm_main.c
@@ -836,6 +836,7 @@ static int sapi_cgi_deactivate(TSRMLS_D)
 		2. When the first call occurs and the request is not set up, flush fails on FastCGI.
 	*/
 	if (SG(sapi_started)) {
+	    if ((fcgi_request*)SG(server_context)!=0x0){ // check first to see if we have a fcgi request to finish.
 		if (
 #ifndef PHP_WIN32
 		    !parent &&
@@ -843,6 +844,7 @@ static int sapi_cgi_deactivate(TSRMLS_D)
 		    !fcgi_finish_request((fcgi_request*)SG(server_context), 0)) {
 			php_handle_aborted_connection();
 		}
+	    }
 	}
 	return SUCCESS;
 }