From d82704b6779cf54e9c8bd16ecc78c612892b4c9d Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 16 May 2013 08:40:56 +0200 Subject: [PATCH 1/2] 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. --- NEWS | 2 ++ main/main.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/NEWS b/NEWS index 879f13bf71a..5aeb4c9973a 100644 --- a/NEWS +++ b/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) diff --git a/main/main.c b/main/main.c index 7a253f8b230..c0db64d184e 100644 --- a/main/main.c +++ b/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, ""); From 07bd1fac57b1f608c15c5d5ebaa6d9383c7cc564 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 16 May 2013 08:44:36 +0200 Subject: [PATCH 2/2] updated NEWS --- NEWS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/NEWS b/NEWS index 99dcbe70cd7..95ef3dcce5c 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,10 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2013, PHP 5.5.0 Release Candidate 2 +- Core: + . 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)