From: Uwe Schindler <thetaphi@php.net>
Date: Mon, 23 Mar 2009 23:13:14 +0000 (+0000)
Subject: MFH: Fix a sigsegv on server shutdown, add missing sapi_shutdown().
X-Git-Tag: php-5.3.0RC2~305
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0935ae193c3cc2b97fef7a010a472fb4985c0ab7;p=php

MFH: Fix a sigsegv on server shutdown, add missing sapi_shutdown().
---

diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c
index 95e07a41a2..eea290b01c 100644
--- a/sapi/nsapi/nsapi.c
+++ b/sapi/nsapi/nsapi.c
@@ -468,6 +468,11 @@ static void sapi_nsapi_flush(void *server_context)
 {
 	nsapi_request_context *rc = (nsapi_request_context *)server_context;
 	TSRMLS_FETCH();
+	
+	if (!rc) {
+		/* we have no context, so no flushing needed. This fixes a SIGSEGV on shutdown */
+		return;
+	}
 
 	if (!SG(headers_sent)) {
 		sapi_send_headers(TSRMLS_C);
@@ -882,6 +887,7 @@ void NSAPI_PUBLIC php5_close(void *vparam)
 	}
 #endif	
 
+	sapi_shutdown();
 	tsrm_shutdown();
 
 	log_error(LOG_INFORM, "php5_close", NULL, NULL, "Shutdown PHP Module");