iliaa Sun Jul 15 14:15:03 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main main.c
Log:
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
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.43&r2=1.640.2.23.2.44&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.43 php-src/main/main.c:1.640.2.23.2.44
--- php-src/main/main.c:1.640.2.23.2.43 Wed Jul 11 17:36:56 2007
+++ php-src/main/main.c Sun Jul 15 14:15:02 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.640.2.23.2.43 2007/07/11 17:36:56 johannes Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.44 2007/07/15 14:15:02 iliaa Exp $ */
/* {{{ includes
*/
@@ -1337,6 +1337,16 @@
}
} 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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
