cvs: /php4 ChangeLog main.c

zeev Sat Jul 24 16:36:31 1999 EDT Modified files: /php4 ChangeLog main.c Log: Congrats Andrey Index: php4/ChangeLog diff -u php4/ChangeLog:1.21 php4/ChangeLog:1.22 --- php4/ChangeLog:1.21 Sat Jul 24 10:40:08 1999 +++ php4/ChangeLog Sat Jul 24 16:36:30 1999 @@ -2,6 +2,8 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ??? ?? 1999, Version 4.0 Beta 2 +- Fixed a problem with the PHP error handler that could result in a crash + on certain operating systems (Zeev) - Apache php_flag values only recognized 'On' (case sensitive) - changed to case insensitive (Zeev) - Fixed a memory leak with switch statement containing return statements Index: php4/main.c diff -u php4/main.c:1.87 php4/main.c:1.88 --- php4/main.c:1.87 Sat Jul 24 12:52:00 1999 +++ php4/main.c Sat Jul 24 16:36:31 1999 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.87 1999/07/24 16:52:00 zeev Exp $ */ +/* $Id: main.c,v 1.88 1999/07/24 20:36:31 zeev Exp $ */ #include <stdio.h> @@ -359,6 +359,9 @@ error_filename = zend_get_compiled_filename(); error_lineno = CG(zend_lineno); + if (!error_filename) { + error_filename = zend_get_executed_filename(ELS_C); + } } break; case E_ERROR: @@ -371,6 +374,10 @@ error_filename = NULL; error_lineno = 0; break; + } + + if (!error_filename) { + error_filename = "Unknown"; } if (EG(error_reporting) & type || (type & E_CORE)) {