com php-src: Merge branch 'PHP-5.6': ext/soap/soap.c

Commit: ca783218e7a0f897c43a80e88ec39a054c9f5c99 Author: Dmitry Stogov <dmitry@zend.com> Thu, 19 Mar 2015 11:54:56 +0300 Parents: 9c5ded46d7c2d94d945aa05fb78de4f7ecd116fa 0c3de983682e65e174726d7d15fc74d9b6ee080b Branches: master Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=ca783218e7a0f897c43a80e88ec39a054c9f5c99 Log: Merge branch 'PHP-5.6' * PHP-5.6: Fixed bug #69152 Conflicts: ext/soap/soap.c Bugs: https://bugs.php.net/69152 Changed paths: MM ext/soap/soap.c Diff: diff --cc ext/soap/soap.c index 2f580cc,2a68944..ccfb951 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@@ -962,13 -930,17 +962,19 @@@ PHP_METHOD(SoapFault, __toString fci.params = NULL; fci.no_separation = 1; - zend_call_function(&fci, NULL TSRMLS_CC); + zend_call_function(&fci, NULL); + + zval_ptr_dtor(&fci.function_name); + convert_to_string(faultcode); + convert_to_string(faultstring); + convert_to_string(file); + convert_to_long(line); - convert_to_string(trace); ++ convert_to_string(&trace); + - len = spprintf(&str, 0, "SoapFault exception: [%s] %s in %s:%ld\nStack trace:\n%s", + str = strpprintf(0, "SoapFault exception: [%s] %s in %s:%pd\nStack trace:\n%s", Z_STRVAL_P(faultcode), Z_STRVAL_P(faultstring), Z_STRVAL_P(file), Z_LVAL_P(line), - Z_STRLEN_P(trace) ? Z_STRVAL_P(trace) : "#0 {main}\n"); + Z_STRLEN(trace) ? Z_STRVAL(trace) : "#0 {main}\n"); zval_ptr_dtor(&trace);