com php-src: port 4308c868f94df1f2b99e80038ba5ea1076d919a7 to 7.0: ext/soap/soap.c
| From: | Anatol Belski | Date: | Thu, 14 Jan 2016 17:38:30 +0000 |
| Subject: | com php-src: port 4308c868f94df1f2b99e80038ba5ea1076d919a7 to 7.0: ext/soap/soap.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90645@lists.php.net to get a copy of this message | ||
Commit: 33cc42d8a53fc89ac0ab9772dc11c8305f1d6d51
Author: Anatol Belski <ab@php.net> Thu, 14 Jan 2016 18:38:30 +0100
Parents: b05eb52c3511aa90bb1a266fd0b05e7b2d1b0efb
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=33cc42d8a53fc89ac0ab9772dc11c8305f1d6d51
Log:
port 4308c868f94df1f2b99e80038ba5ea1076d919a7 to 7.0
Changed paths:
M ext/soap/soap.c
Diff:
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index 49fc72d..ee41ff9 100644
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -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;
}