diff options
Diffstat (limited to 'sapi/nsapi')
| -rw-r--r-- | sapi/nsapi/nsapi.c | 6 |
1 files changed, 6 insertions, 0 deletions
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"); |