Merge branch 'PHP-7.0'

* PHP-7.0:
  port 4308c868f9 to 7.0
This commit is contained in:
Anatol Belski 2016-01-14 18:41:22 +01:00
commit 242775a19b

View File

@ -2135,7 +2135,7 @@ static void soap_error_handler(int error_num, const char *error_filename, const
_old_http_response_code = SG(sapi_headers).http_response_code;
_old_http_status_line = SG(sapi_headers).http_status_line;
if (!SOAP_GLOBAL(use_soap_error_handler) || !EG(objects_store).object_buckets) {
if (!PG(modules_activated) || !SOAP_GLOBAL(use_soap_error_handler) || !EG(objects_store).object_buckets) {
call_old_error_handler(error_num, error_filename, error_lineno, format, args);
return;
}