dmitry Fri Mar 24 08:46:14 2006 UTC
Modified files:
/php-src/ext/soap soap.c
Log:
Fixed SoapFault::getMessage()
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/soap.c?r1=1.181&r2=1.182&diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.181 php-src/ext/soap/soap.c:1.182
--- php-src/ext/soap/soap.c:1.181 Tue Mar 21 12:27:10 2006
+++ php-src/ext/soap/soap.c Fri Mar 24 08:46:14 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: soap.c,v 1.181 2006/03/21 12:27:10 dmitry Exp $ */
+/* $Id: soap.c,v 1.182 2006/03/24 08:46:14 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -808,8 +808,8 @@
#ifdef ZEND_ENGINE_2
-/* {{{ proto object SoapFault::SoapFault ( string faultcode, string
faultstring [, string faultactor [, mixed detail [, string faultname [, mixed
headerfault]]]])
- SoapFault constructor */
+/* {{{ proto object SoapFault::__toString ()
+ */
PHP_METHOD(SoapFault, __toString)
{
zval *faultcode, *faultstring, *file, *line, *trace;
@@ -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);
@@ -2979,6 +2983,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(TSRMLS_C), 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
