X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_request_api.c;h=b3f7150e62fa240a74aed4ad122afb22e8662b20;hb=153ce526e9d8e81ff03388cf536babab704c76f5;hp=24b1acc5a8bd3e0a3cd53f237f7cbbd5f916a158;hpb=046207d5dd06a35f4c492c6169ecfbd8999671cb;p=m6w6%2Fext-http

diff --git a/http_request_api.c b/http_request_api.c
index 24b1acc..b3f7150 100644
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -18,6 +18,18 @@
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
+#include "php.h"
+
+#include "php_http.h"
+#include "php_http_std_defs.h"
+#include "php_http_api.h"
+#include "php_http_request_api.h"
+#include "php_http_url_api.h"
+#ifdef ZEND_ENGINE_2
+#	include "php_http_request_object.h"
+#endif
+
+#include "phpstr/phpstr.h"
 
 #ifdef PHP_WIN32
 #	include <winsock2.h>
@@ -25,21 +37,12 @@
 
 #include <curl/curl.h>
 
-#include "phpstr/phpstr.h"
-
-#include "php.h"
-#include "php_http.h"
-#include "php_http_std_defs.h"
-#include "php_http_api.h"
-#include "php_http_request_api.h"
-#include "php_http_url_api.h"
+ZEND_EXTERN_MODULE_GLOBALS(http);
 
 #ifndef HTTP_CURL_USE_ZEND_MM
 #	define HTTP_CURL_USE_ZEND_MM 0
 #endif
 
-ZEND_EXTERN_MODULE_GLOBALS(http)
-
 #if LIBCURL_VERSION_NUM < 0x070c00
 #	define curl_easy_strerror(code) HTTP_G(request).error
 #endif
@@ -355,6 +358,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 {
@@ -507,7 +511,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 	} else {
 		HTTP_CURL_OPT(COOKIEFILE, NULL);
 	}
-	
+
 	/* cookiestore, read initial cookies from that file and store cookies back into that file */
 	if ((zoption = http_curl_getopt(options, "cookiestore", IS_STRING)) && Z_STRLEN_P(zoption)) {
 		HTTP_CURL_OPT(COOKIEFILE, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
@@ -920,6 +924,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);
@@ -929,6 +937,7 @@ static int http_curl_progress_callback(void *data, double dltotal, double dlnow,
 }
 /* }}} */
 
+/* {{{ static int http_curl_debug_callback(CURL *, curl_infotype, char *, size_t, void *) */
 static int http_curl_debug_callback(CURL *ch, curl_infotype type, char *string, size_t length, void *data)
 {
 	zval *params_pass[2], params_local[2], retval;
@@ -937,13 +946,28 @@ 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(&retval);
+	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);
+#ifdef ZEND_ENGINE_2
+	/* ensure we can call private HttpRequest::debugWrapper() */
+	{
+		void *sc = EG(scope);
+		EG(scope) = http_request_object_ce;
+#endif
+		call_user_function(EG(function_table), NULL, func, &retval, 2, params_pass TSRMLS_CC);
+#ifdef ZEND_ENGINE_2
+		EG(scope) = sc;
+	}
+#endif
 
 	return 0;
 }
+/* }}} */
+
 /* {{{ static inline zval *http_curl_getopt(HashTable *, char *, size_t, int) */
 static inline zval *_http_curl_getopt_ex(HashTable *options, char *key, size_t keylen, int type TSRMLS_DC)
 {
@@ -961,7 +985,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;
 		}