Clear out last error & last error file information at the end of the

request to ensure that they don't propogate to the next request

diff --git a/main/main.c b/main/main.c
index e55f26c8eb68de5b47a671ab66177200b41ae0b5..5b0ccf6729fa5e240ad933a45e01ad10307aaf31 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -1337,6 +1337,16 @@ void php_request_shutdown(void *dummy)
                }
        } zend_end_try();
 
+       /* 6.5 free last error information */
+       if (PG(last_error_message)) {
+               free(PG(last_error_message));
+               PG(last_error_message) = NULL;
+       }
+       if (PG(last_error_file)) {
+               free(PG(last_error_file));
+               PG(last_error_file) = NULL;
+       }
+
        /* 7. Shutdown scanner/executor/compiler and restore ini entries */
        zend_deactivate(TSRMLS_C);