cvs: php-src(PHP_5_1) /ext/soap php_http.c
| From: | Dmitry Stogov | Date: | Fri, 07 Oct 2005 11:56:19 +0000 |
| Subject: | cvs: php-src(PHP_5_1) /ext/soap php_http.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-34394@lists.php.net to get a copy of this message | ||
dmitry Fri Oct 7 07:56:19 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/soap php_http.c
Log:
Fixed bug #34766 (possible crash on HTTP redirection)
http://cvs.php.net/diff.php/php-src/ext/soap/php_http.c?r1=1.77.2.1&r2=1.77.2.2&ty=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.77.2.1 php-src/ext/soap/php_http.c:1.77.2.2
--- php-src/ext/soap/php_http.c:1.77.2.1 Fri Sep 16 11:48:30 2005
+++ php-src/ext/soap/php_http.c Fri Oct 7 07:56:19 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov <dmitry@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_http.c,v 1.77.2.1 2005/09/16 15:48:30 dmitry Exp $ */
+/* $Id: php_http.c,v 1.77.2.2 2005/10/07 11:56:19 dmitry Exp $ */
#include "php_soap.h"
#include "ext/standard/base64.h"
@@ -836,6 +836,7 @@
php_stream_close(stream);
zend_hash_del(Z_OBJPROP_P(this_ptr), "httpsocket", sizeof("httpsocket"));
zend_hash_del(Z_OBJPROP_P(this_ptr), "_use_proxy", sizeof("_use_proxy"));
+ stream = NULL;
}
/* Process HTTP status codes */
@@ -848,13 +849,6 @@
int body_size;
if (new_url != NULL) {
- if (get_http_body(stream, !http_1_1, http_headers, &body, &body_size TSRMLS_CC)) {
- efree(body);
- } else {
- php_stream_close(stream);
- zend_hash_del(Z_OBJPROP_P(this_ptr), "httpsocket", sizeof("httpsocket"));
- stream = NULL;
- }
efree(http_headers);
efree(http_body);
efree(loc);