cvs: pecl /http http_request_api.c

mike            Fri Jul 22 10:30:20 2005 EDT

  Modified files:              
    /pecl/http  http_request_api.c 
  Log:
  - fix leaking curl callbacks
  
http://cvs.php.net/diff.php/pecl/http/http_request_api.c?r1=1.28&r2=1.29&ty=u
Index: pecl/http/http_request_api.c
diff -u pecl/http/http_request_api.c:1.28 pecl/http/http_request_api.c:1.29
--- pecl/http/http_request_api.c:1.28   Tue Jul 19 12:19:27 2005
+++ pecl/http/http_request_api.c        Fri Jul 22 10:30:18 2005
@@ -13,7 +13,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: http_request_api.c,v 1.28 2005/07/19 16:19:27 mike Exp $ */
+/* $Id: http_request_api.c,v 1.29 2005/07/22 14:30:18 mike Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #      include "config.h"
@@ -355,6 +355,7 @@
 
        /* progress callback */
        if (zoption = http_curl_getopt(options, "onprogress", 0)) {
+               HTTP_CURL_OPT(NOPROGRESS, 0);
                HTTP_CURL_OPT(PROGRESSFUNCTION, http_curl_progress_callback);
                HTTP_CURL_OPT(PROGRESSDATA,  http_curl_callback_data(zoption));
        } else {
@@ -920,6 +921,10 @@
        params_pass[2] = &params_local[2];
        params_pass[3] = &params_local[3];
 
+       INIT_PZVAL(params_pass[0]);
+       INIT_PZVAL(params_pass[1]);
+       INIT_PZVAL(params_pass[2]);
+       INIT_PZVAL(params_pass[3]);
        ZVAL_DOUBLE(params_pass[0], dltotal);
        ZVAL_DOUBLE(params_pass[1], dlnow);
        ZVAL_DOUBLE(params_pass[2], ultotal);
@@ -937,8 +942,10 @@
        params_pass[0] = &params_local[0];
        params_pass[1] = &params_local[1];
 
+       INIT_PZVAL(params_pass[0]);
+       INIT_PZVAL(params_pass[1]);
        ZVAL_LONG(params_pass[0], type);
-       ZVAL_STRINGL(params_pass[1], string, length, 1);
+       ZVAL_STRINGL(params_pass[1], string, length, 0);
 
        call_user_function(EG(function_table), NULL, func, &retval, 2, 
params_pass TSRMLS_CC);