Merge branch 'PHP-5.5'

* PHP-5.5:
  updated NEWS
  Fixed bug #64853Use of no longer available ini directives causes crash on TS build
This commit is contained in:
Anatol Belski 2013-05-16 08:45:02 +02:00
commit 2933f77e39

View file

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