archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 23:18:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Congrats Andrey

Browse source
This commit is contained in:
Zeev Suraski 1999-07-24 20:36:31 +00:00
parent 46783929a3
commit fff675c448
2 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -2,6 +2,8 @@ PHP 4.0 CHANGE LOG ChangeLog
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
??? ?? 1999, Version 4.0 Beta 2 ??? ?? 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 - Apache php_flag values only recognized 'On' (case sensitive) - changed
to case insensitive (Zeev) to case insensitive (Zeev)
- Fixed a memory leak with switch statement containing return statements - Fixed a memory leak with switch statement containing return statements

7
main/main.c
View file

@ -359,6 +359,9 @@ PHPAPI void php3_error(int type, const char *format,...)
error_filename = zend_get_compiled_filename(); error_filename = zend_get_compiled_filename();
error_lineno = CG(zend_lineno); error_lineno = CG(zend_lineno);
if (!error_filename) {
error_filename = zend_get_executed_filename(ELS_C);
}
} }
break; break;
case E_ERROR: case E_ERROR:
@ -372,6 +375,10 @@ PHPAPI void php3_error(int type, const char *format,...)
error_lineno = 0; error_lineno = 0;
break; break;
} }
if (!error_filename) {
error_filename = "Unknown";
}
if (EG(error_reporting) & type || (type & E_CORE)) { if (EG(error_reporting) & type || (type & E_CORE)) {
char *error_type_str; char *error_type_str;