diff options
| author | Anatol Belski <ab@php.net> | 2014-09-22 10:26:17 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-09-22 10:26:17 +0200 |
| commit | 6bb530d1eba583143efda0b4f49e43cb6d6fb203 (patch) | |
| tree | 75f5432eac05df91defaf2f530efd08eb4796605 /ext/soap/php_encoding.c | |
| parent | 403709aaf46f2fe563df4d9f238528428287eb92 (diff) | |
| parent | 065edced71c7f15f32fc2fb483a9048328b8108e (diff) | |
| download | php-git-6bb530d1eba583143efda0b4f49e43cb6d6fb203.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (24 commits)
added a comment
fix the REPARSE_DATA_BUFFER struct def
simplify the condition
Fix two memory errors by interning earlier
Add smart_str_append for appending zend_strings
Rename smart_str_append to smart_str_append_smart_str
Use smart_str for exception stack traces
Use smart_str in get_function_declaration
Move smart_str implementation into Zend/
UPGRADING for Integer Semantics
Fixed bug #66242 (don't assume char is signed)
Fixed bug #67633
Fixed if/else if ordering
Use SIZEOF_ZEND_LONG instead of SIZEOF_LONG
Use zend_ polyfilled nan/finite, check finite
Updated 32-bit << test
Updated << 64-bit tests
Prevent bit shift count wrapping quirkiness on some CPUs for left shift
Cast NaN and Infinity to zero
Updated >> 64-bit tests
...
Diffstat (limited to 'ext/soap/php_encoding.c')
| -rw-r--r-- | ext/soap/php_encoding.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c index 99375be050..d34587b85e 100644 --- a/ext/soap/php_encoding.c +++ b/ext/soap/php_encoding.c @@ -2441,7 +2441,7 @@ iterator_done: smart_str_appendl(&array_type,"xsd:ur-type",sizeof("xsd:ur-type")-1); } smart_str_appendc(&array_type, '['); - smart_str_append(&array_type, &array_size); + smart_str_append_smart_str(&array_type, &array_size); smart_str_appendc(&array_type, ']'); smart_str_0(&array_type); set_ns_prop(xmlParam, SOAP_1_1_ENC_NAMESPACE, "arrayType", array_type.s->val); |