com php-src: Merge branch 'str_size_and_int64' of git.php.net:php-src into str_size_and_int 64: ext/soap/php_http.c

Commit: d8fa7f49901c0a7dcbc28d9b8438182dbc9e587f Author: Anatol Belski <ab@php.net> Fri, 29 Nov 2013 17:00:24 +0100 Parents: 40f9958c085a85beeb31014cf58e690c4713e166 132bd2130d85e2a9faf87f22bc51543ef2ba7226 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d8fa7f49901c0a7dcbc28d9b8438182dbc9e587f Log: Merge branch 'str_size_and_int64' of git.php.net:php-src into str_size_and_int64 Changed paths: MM ext/soap/php_http.c Diff: diff --cc ext/soap/php_http.c index 14366f1,5bec57b..56d68a6 --- a/ext/soap/php_http.c +++ b/ext/soap/php_http.c @@@ -830,9 -829,9 +830,9 @@@ try_again (zend_hash_index_find(Z_ARRVAL_PP(data), 2, (void**)&tmp) == FAILURE || in_domain(phpurl->host,Z_STRVAL_PP(tmp))) && (use_ssl || zend_hash_index_find(Z_ARRVAL_PP(data), 3, (void**)&tmp) == FAILURE)) { - smart_str_appendl(&soap_headers, key, strlen(key)); + smart_str_appendl(&soap_headers, key, key_len); smart_str_appendc(&soap_headers, '='); - smart_str_appendl(&soap_headers, Z_STRVAL_PP(value), Z_STRLEN_PP(value)); + smart_str_appendl(&soap_headers, Z_STRVAL_PP(value), Z_STRSIZE_PP(value)); smart_str_appendc(&soap_headers, ';'); } }