cvs: php-src /ext/soap soap.c
| From: | Dmitry Stogov | Date: | Thu, 02 Mar 2006 14:08:04 +0000 |
| Subject: | cvs: php-src /ext/soap soap.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-37077@lists.php.net to get a copy of this message | ||
dmitry Thu Mar 2 14:08:04 2006 UTC
Modified files:
/php-src/ext/soap soap.c
Log:
Fixed bug #36388 (ext/soap crashes when throwing exception and session persistence). (David)
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/soap.c?r1=1.174&r2=1.175&diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.174 php-src/ext/soap/soap.c:1.175
--- php-src/ext/soap/soap.c:1.174 Tue Feb 21 20:12:42 2006
+++ php-src/ext/soap/soap.c Thu Mar 2 14:08:04 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov <dmitry@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: soap.c,v 1.174 2006/02/21 20:12:42 dmitry Exp $ */
+/* $Id: soap.c,v 1.175 2006/03/02 14:08:04 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1726,7 +1726,13 @@
instanceof_function(Z_OBJCE_P(EG(exception)), soap_fault_class_entry TSRMLS_CC)) {
soap_server_fault_ex(function, EG(exception), NULL TSRMLS_CC);
} else {
- if (soap_obj) {zval_ptr_dtor(&soap_obj);}
+#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
+ if (soap_obj && service->soap_class.persistance != SOAP_PERSISTENCE_SESSION) {
+#else
+ if (soap_obj) {
+#endif
+ zval_ptr_dtor(&soap_obj);
+ }
php_end_ob_buffer(0, 0 TSRMLS_CC);
goto fail;
}