pajoye Wed, 03 Feb 2010 18:38:11 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=294435
Log: - Addressing minor leak noticed while addressing bug #48590 Bug: http://bugs.php.net/48590 (Closed) SOAP Client (redirect loop) 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,293268,293341,293400,293502,293538,293558,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,293268,293341,293400,293502,293538,293558,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 18:35:58 UTC (rev 294434) +++ php/php-src/branches/PHP_5_3_2/ext/soap/php_http.c 2010-02-03 18:38:11 UTC (rev 294435) @@ -759,18 +759,17 @@ 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);} - smart_str_free(&soap_headers); php_stream_close(stream); zend_hash_del(Z_OBJPROP_P(this_ptr), "httpurl", sizeof("httpurl")); zend_hash_del(Z_OBJPROP_P(this_ptr), "httpsocket", sizeof("httpsocket")); zend_hash_del(Z_OBJPROP_P(this_ptr), "_use_proxy", sizeof("_use_proxy")); add_soap_fault(this_ptr, "HTTP", "Failed Sending HTTP SOAP request", NULL, NULL TSRMLS_CC); + 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); @@ -1022,8 +1021,8 @@ phpurl = new_url; if (--redirect_max < 1) { - smart_str_free(&soap_headers_z); add_soap_fault(this_ptr, "HTTP", "Redirection limit reached, aborting", NULL, NULL TSRMLS_CC); + smart_str_free(&soap_headers_z); return FALSE; } 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,293400,293502,293538,293558 /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,293400,293502,293538,293558 /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,293400,293502,293538,293558 /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,293400,293502,293538,293558 /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
