mirror of
https://github.com/php/php-src.git
synced 2026-03-24 00:02:20 +01:00
ext/soap: SoapServer::handle() reduce retval scope. (#18657)
might have been a relic of past modifications, but pushing it down to the actual first case of error path.
This commit is contained in:
@@ -1336,8 +1336,6 @@ PHP_METHOD(SoapServer, handle)
|
||||
}
|
||||
}
|
||||
|
||||
ZVAL_NULL(&retval);
|
||||
|
||||
if (php_output_start_default() != SUCCESS) {
|
||||
php_error_docref(NULL, E_ERROR,"ob_start failed");
|
||||
}
|
||||
@@ -1388,7 +1386,6 @@ PHP_METHOD(SoapServer, handle)
|
||||
php_stream_filter_remove(zf, 1);
|
||||
}
|
||||
} else {
|
||||
zval_ptr_dtor(&retval);
|
||||
SOAP_SERVER_END_CODE();
|
||||
return;
|
||||
}
|
||||
@@ -1434,6 +1431,8 @@ PHP_METHOD(SoapServer, handle)
|
||||
|
||||
xmlFreeDoc(doc_request);
|
||||
|
||||
ZVAL_NULL(&retval);
|
||||
|
||||
if (EG(exception)) {
|
||||
if (!zend_is_unwind_exit(EG(exception))) {
|
||||
php_output_discard();
|
||||
|
||||
Reference in New Issue
Block a user