dmitry Fri Mar 24 08:45:54 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/ext/soap soap.c
Log:
Fixed SoapFault::getMessage()
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.478&r2=1.2027.2.479&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.478 php-src/NEWS:1.2027.2.479
--- php-src/NEWS:1.2027.2.478 Wed Mar 22 21:56:40 2006
+++ php-src/NEWS Fri Mar 24 08:45:54 2006
@@ -10,6 +10,7 @@
(also fixes bug #36764). (Tony)
- Removed the E_STRICT deprecation notice from "var". (Ilia)
- Fixed debug_zval_dump() to support private and protected members. (Dmitry)
+- Fixed SoapFault::getMessage(). (Dmitry)
- Fixed bug #36825 (Exceptions thrown in ArrayObject::offsetGet cause
segfault). (Tony)
- Fixed bug #36820 (Privileged connection with an Oracle password file fails).
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/soap.c?r1=1.156.2.22&r2=1.156.2.23&diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.22 php-src/ext/soap/soap.c:1.156.2.23
--- php-src/ext/soap/soap.c:1.156.2.22 Thu Mar 23 10:44:39 2006
+++ php-src/ext/soap/soap.c Fri Mar 24 08:45:54 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: soap.c,v 1.156.2.22 2006/03/23 10:44:39 helly Exp $ */
+/* $Id: soap.c,v 1.156.2.23 2006/03/24 08:45:54 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -818,6 +818,10 @@
zend_fcall_info fci;
zval fname;
+ if (ZEND_NUM_ARGS() > 0) {
+ ZEND_WRONG_PARAM_COUNT();
+ }
+
faultcode = zend_read_property(soap_fault_class_entry, this_ptr,
"faultcode", sizeof("faultcode")-1, 1 TSRMLS_CC);
faultstring = zend_read_property(soap_fault_class_entry, this_ptr,
"faultstring", sizeof("faultstring")-1, 1 TSRMLS_CC);
file = zend_read_property(soap_fault_class_entry, this_ptr, "file",
sizeof("file")-1, 1 TSRMLS_CC);
@@ -2985,6 +2989,9 @@
}
if (fault_string != NULL) {
add_property_string(obj, "faultstring", fault_string, 1);
+#ifdef ZEND_ENGINE_2
+ zend_update_property_string(zend_exception_get_default(), obj,
"message", sizeof("message")-1, fault_string TSRMLS_CC);
+#endif
}
if (fault_code != NULL) {
int soap_version = SOAP_GLOBAL(soap_version);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
