pajoye Wed, 03 Feb 2010 20:29:09 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=294456
Log:
- Don't free soap_headers just before comparing the length. This causes
SoapClient..
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/ext/soap/php_http.c
_U php/php-src/branches/PHP_5_3_2/ext/tidy/tests/
_U
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
Property changes on: php/php-src/branches/PHP_5_3_2
___________________________________________________________________
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627,293644,293653,293655,293699,293726-293728,293974
/php/php-src/trunk:284726
+
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293597,293627,293644,293653,293655,293699,293726-293728,293974
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/ext/soap/php_http.c
===================================================================
--- php/php-src/branches/PHP_5_3_2/ext/soap/php_http.c 2010-02-03 20:26:26 UTC
(rev 294455)
+++ php/php-src/branches/PHP_5_3_2/ext/soap/php_http.c 2010-02-03 20:29:09 UTC
(rev 294456)
@@ -759,7 +759,6 @@
smart_str_0(&soap_headers);
err = php_stream_write(stream, soap_headers.c,
soap_headers.len);
- smart_str_free(&soap_headers);
if (err != soap_headers.len) {
if (request != buf) {efree(request);}
php_stream_close(stream);
@@ -770,6 +769,7 @@
smart_str_free(&soap_headers_z);
return FALSE;
}
+ smart_str_free(&soap_headers);
} else {
add_soap_fault(this_ptr, "HTTP", "Failed to create stream??",
NULL, NULL TSRMLS_CC);
smart_str_free(&soap_headers_z);
Property changes on: php/php-src/branches/PHP_5_3_2/ext/tidy/tests
___________________________________________________________________
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627,293644,293653,293655,293699,293726-293728
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293597,293627,293644,293653,293655,293699,293726-293728
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Property changes on:
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___________________________________________________________________
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293502,293538,293548,293558,293597,293627,293644,293653,293655,293699,293726-293728
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
+
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293597,293627,293644,293653,293655,293699,293726-293728
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
