[PHP-CVS] cvs: php-src(PHP_5_0) /ext/soap php_http.c

[Dmitry Stogov]

dmitry          Fri Oct  7 07:56:40 2005 EDT

  Modified files:              (Branch: PHP_5_0)
    /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.55.2.20&r2=1.55.2.21&ty=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.55.2.20 
php-src/ext/soap/php_http.c:1.55.2.21
--- php-src/ext/soap/php_http.c:1.55.2.20       Fri Sep 16 11:48:51 2005
+++ php-src/ext/soap/php_http.c Fri Oct  7 07:56:40 2005
@@ -17,7 +17,7 @@
   |          Dmitry Stogov <[EMAIL PROTECTED]>                             |
   +----------------------------------------------------------------------+
 */
-/* $Id: php_http.c,v 1.55.2.20 2005/09/16 15:48:51 dmitry Exp $ */
+/* $Id: php_http.c,v 1.55.2.21 2005/10/07 11:56:40 dmitry Exp $ */
 
 #include "php_soap.h"
 #include "ext/standard/base64.h"
@@ -861,6 +861,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 */
@@ -873,13 +874,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);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php