php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-07 16:13:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Restored __destructor() behavior

Browse Source
This commit is contained in:
Dmitry Stogov
2014-05-16 13:15:24 +04:00
parent 9389ce8034
commit 87591db5f5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ext/soap/soap.c
View File

@@ -2168,7 +2168,7 @@ static void soap_error_handler(int error_num, const char *error_filename, const
#ifdef va_copy
va_list argcopy;
#endif
//??? zend_object_store_bucket *old_objects;
zend_object **old_objects;
int old = PG(display_errors);
//??? INIT_ZVAL(outbuf);
@@ -2192,8 +2192,8 @@ static void soap_error_handler(int error_num, const char *error_filename, const
Z_ADDREF(fault);
zend_throw_exception_object(&fault TSRMLS_CC);
//??? old_objects = EG(objects_store).object_buckets;
//??? EG(objects_store).object_buckets = NULL;
old_objects = EG(objects_store).object_buckets;
EG(objects_store).object_buckets = NULL;
PG(display_errors) = 0;
SG(sapi_headers).http_status_line = NULL;
zend_try {
@@ -2208,7 +2208,7 @@ static void soap_error_handler(int error_num, const char *error_filename, const
SG(sapi_headers).http_status_line = _old_http_status_line;
SG(sapi_headers).http_response_code = _old_http_response_code;
} zend_end_try();
//??? EG(objects_store).object_buckets = old_objects;
EG(objects_store).object_buckets = old_objects;
PG(display_errors) = old;
zend_bailout();
} else if (!use_exceptions ||