dmitry Thu Mar 2 14:07:49 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/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/NEWS?r1=1.2027.2.433&r2=1.2027.2.434&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.433 php-src/NEWS:1.2027.2.434
--- php-src/NEWS:1.2027.2.433 Tue Feb 28 14:45:18 2006
+++ php-src/NEWS Thu Mar 2 14:07:48 2006
@@ -53,6 +53,8 @@
- Fixed bug #36396 (strtotime() fails to parse dates in dd-mm-yyyy format).
(Derick)
- Fixed bug #36345 (PDO/MySQL problem loading BLOB over 1MB). (Ilia)
+- Fixed bug #36388 (ext/soap crashes when throwing exception and session
+ persistence). (David)
- Fixed bug #36382 (PDO/PgSQL's getColumnMeta() crashes). (Derick)
- Fixed bug #36359 (splFileObject::fwrite() doesn't write when no data length
specified). (Tony)
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/soap.c?r1=1.156.2.15&r2=1.156.2.16&diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.15 php-src/ext/soap/soap.c:1.156.2.16
--- php-src/ext/soap/soap.c:1.156.2.15 Tue Feb 7 12:49:09 2006
+++ php-src/ext/soap/soap.c Thu Mar 2 14:07:48 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: soap.c,v 1.156.2.15 2006/02/07 12:49:09 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.16 2006/03/02 14:07:48 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1724,7 +1724,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;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
