X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_request_api.c;h=b8173bc5ef7060190b1c3aed794393ba1c837ab3;hb=0ac87717530843df93ca94ffa8c3fd8935f346cb;hp=3f77eff2ae55bc37e2ad541ed9bf1254a5f4e840;hpb=902d195a198f4976c8ff081a95cdd3e315c14f5f;p=m6w6%2Fext-http

diff --git a/http_request_api.c b/http_request_api.c
index 3f77eff..b8173bc 100644
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -355,6 +355,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 
 	/* 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 @@ static int http_curl_progress_callback(void *data, double dltotal, double dlnow,
 	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 @@ static int http_curl_debug_callback(CURL *ch, curl_infotype type, char *string,
 	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);
 
@@ -961,7 +968,7 @@ static inline zval *_http_curl_getopt_ex(HashTable *options, char *key, size_t k
 			case IS_DOUBLE:	convert_to_double_ex(zoption);	break;
 			case IS_STRING:	convert_to_string_ex(zoption);	break;
 			case IS_ARRAY:	convert_to_array_ex(zoption);	break;
-			case IS_OBJECT: convert_to_object_ex(zoption);	break;
+			case IS_OBJECT:	convert_to_object_ex(zoption);	break;
 			default:
 			break;
 		}