From: Dmitry Stogov <dmitry@zend.com>
Date: Fri, 16 May 2014 09:15:24 +0000 (+0400)
Subject: Restored __destructor() behavior
X-Git-Tag: POST_PHPNG_MERGE~335^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=87591db5f5232efcdcb07a6855db55c8cc6abef7;p=php

Restored __destructor() behavior
---

diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index d069d58bab..9660c32e24 100644
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -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 ||