Browse Source

Fixed bug #64853Use of no longer available ini directives causes crash on TS build

The fatal error for removed ini options is thrown before the executor
init, so ensure the relevant variables are initialized.
pull/315/merge
Anatol Belski 13 years ago
parent
commit
d82704b677
  1. 2
      NEWS
  2. 2
      main/main.c

2
NEWS

@ -4,6 +4,8 @@ PHP NEWS
- Core:
. Fixed bug #64729 (compilation failure on x32). (Gustavo)
. Fixed bug #64853 (Use of no longer available ini directives causes crash on
TS build). (Anatol)
- Fileinfo:
. Fixed bug #64830 (mimetype detection segfaults on mp3 file). (Anatol)

2
main/main.c

@ -2070,6 +2070,8 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
EG(exception_class) = NULL;
PG(disable_functions) = NULL;
PG(disable_classes) = NULL;
EG(exception) = NULL;
EG(objects_store).object_buckets = NULL;
#if HAVE_SETLOCALE
setlocale(LC_CTYPE, "");

Loading…
Cancel
Save