X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_api.c;h=4cf683475dd56658d5226dc705c9801393c0bd5a;hp=5a9093690b4e32384e0b73f8188d09d5ca0b97ec;hb=ca377be0e3dec950f225474197f16c3aa1cd69b7;hpb=b272c1e03de58ff0c01f78421b824c7f45d43959

diff --git a/http_request_api.c b/http_request_api.c
index 5a90936..4cf6834 100644
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -40,10 +40,14 @@
 #	define HTTP_CURL_USE_ZEND_MM 0
 #endif
 
+#ifndef HTTP_DEBUG_REQPOOLS
+#	define HTTP_DEBUG_REQPOOLS 0
+#endif
+
 ZEND_EXTERN_MODULE_GLOBALS(http)
 
 #if LIBCURL_VERSION_NUM < 0x070c00
-#	define curl_easy_strerror(code) HTTP_G(request).curl.error
+#	define curl_easy_strerror(code) HTTP_G(request).error
 #endif
 
 #define HTTP_CURL_INFO(I) HTTP_CURL_INFO_EX(I, I)
@@ -124,10 +128,7 @@ typedef struct {
 static http_curl_callback_ctx *_http_curl_callback_data(void *data TSRMLS_DC);
 
 static void http_request_pool_freebody(http_request_body **body);
-static void http_request_pool_freehandle(zval **request);
-static void http_request_pool_responsehandler(zval **req TSRMLS_DC);
-static inline STATUS http_request_pool_select(http_request_pool *pool);
-static inline void http_request_pool_perform(http_request_pool *pool);
+static void http_request_pool_freehandle(zval **request, http_request_pool *pool TSRMLS_DC);
 
 #if HTTP_CURL_USE_ZEND_MM
 static void http_curl_free(void *p)					{ efree(p); }
@@ -601,7 +602,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, const
 		switch (body->type)
 		{
 			case HTTP_REQUEST_BODY_CSTRING:
-				curl_easy_setopt(ch, CURLOPT_POSTFIELDS, (char *) body->data);
+				curl_easy_setopt(ch, CURLOPT_POSTFIELDS, body->data);
 				curl_easy_setopt(ch, CURLOPT_POSTFIELDSIZE, body->size);
 			break;
 
@@ -610,8 +611,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, const
 			break;
 
 			case HTTP_REQUEST_BODY_UPLOADFILE:
-			case HTTP_REQUEST_BODY_UPLOADDATA:
-				curl_easy_setopt(ch, CURLOPT_READDATA, body);
+				curl_easy_setopt(ch, CURLOPT_READDATA, http_curl_callback_data(body));
 				curl_easy_setopt(ch, CURLOPT_INFILESIZE, body->size);
 			break;
 
@@ -803,7 +803,9 @@ PHP_HTTP_API STATUS _http_request_method_unregister(unsigned long method TSRMLS_
 PHP_HTTP_API http_request_pool *_http_request_pool_init(http_request_pool *pool TSRMLS_DC)
 {
 	zend_bool free_pool;
-
+#if HTTP_DEBUG_REQPOOLS
+	fprintf(stderr, "Initializing request pool\n");
+#endif
 	if ((free_pool = (!pool))) {
 		pool = emalloc(sizeof(http_request_pool));
 		pool->ch = NULL;
@@ -822,7 +824,9 @@ PHP_HTTP_API http_request_pool *_http_request_pool_init(http_request_pool *pool
 	pool->unfinished = 0;
 	zend_llist_init(&pool->handles, sizeof(zval *), (llist_dtor_func_t) ZVAL_PTR_DTOR, 0);
 	zend_llist_init(&pool->bodies, sizeof(http_request_body *), (llist_dtor_func_t) http_request_pool_freebody, 0);
-
+#if HTTP_DEBUG_REQPOOLS
+	fprintf(stderr, "Initialized request pool %p\n", pool);
+#endif
 	return pool;
 }
 /* }}} */
@@ -831,7 +835,9 @@ PHP_HTTP_API http_request_pool *_http_request_pool_init(http_request_pool *pool
 PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *request TSRMLS_DC)
 {
 	getObjectEx(http_request_object, req, request);
-
+#if HTTP_DEBUG_REQPOOLS
+	fprintf(stderr, "Attaching request %p to pool %p\n", req, pool);
+#endif
 	if (req->pool) {
 		http_error(E_WARNING, HTTP_E_CURL, "HttpRequest object is already member of an HttpRequestPool");
 	} else {
@@ -860,9 +866,11 @@ PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *req
 PHP_HTTP_API STATUS _http_request_pool_detach(http_request_pool *pool, zval *request TSRMLS_DC)
 {
 	getObjectEx(http_request_object, req, request);
-
+#if HTTP_DEBUG_REQPOOLS
+	fprintf(stderr, "Detaching request %p (pool: %p) from pool %p\n", req, req->pool, pool);
+#endif
 	if (req->pool != pool) {
-		http_error(E_WARNING, HTTP_E_CURL, "HttpRequest object is not attached to this HttpRequestPool");
+		http_error_ex(E_WARNING, HTTP_E_CURL, "HttpRequest object is not attached to this HttpRequestPool (%p != %p)", req->pool, pool);
 	} else {
 		CURLMcode code;
 
@@ -878,16 +886,30 @@ PHP_HTTP_API STATUS _http_request_pool_detach(http_request_pool *pool, zval *req
 }
 /* }}} */
 
+/* {{{ void http_request_pool_detach_all(http_request_pool *) */
+PHP_HTTP_API void _http_request_pool_detach_all(http_request_pool *pool TSRMLS_DC)
+{
+#if HTTP_DEBUG_REQPOOLS
+	fprintf(stderr, "Detaching all requests from pool %p\n", pool);
+#endif
+	zend_llist_apply_with_argument(&pool->handles, (llist_apply_with_arg_func_t) http_request_pool_freehandle, pool TSRMLS_CC);
+}
+
+
 /* {{{ STATUS http_request_pool_send(http_request_pool *) */
 PHP_HTTP_API STATUS _http_request_pool_send(http_request_pool *pool TSRMLS_DC)
 {
-	http_request_pool_perform(pool);
-	while (pool->unfinished) {
+#if HTTP_DEBUG_REQPOOLS
+	fprintf(stderr, "Attempt to send requests of pool %p\n", pool);
+#endif
+	while (http_request_pool_perform(pool)) {
+#if HTTP_DEBUG_REQPOOLS
+		fprintf(stderr, "%d unfinished requests of pool %p remaining\n", pool->unfinished, pool);
+#endif
 		if (SUCCESS != http_request_pool_select(pool)) {
 			http_error(E_WARNING, HTTP_E_CURL, "Socket error");
 			return FAILURE;
 		}
-		http_request_pool_perform(pool);
 	}
 	zend_llist_apply(&pool->handles, (llist_apply_func_t) http_request_pool_responsehandler TSRMLS_CC);
 	return SUCCESS;
@@ -897,6 +919,9 @@ PHP_HTTP_API STATUS _http_request_pool_send(http_request_pool *pool TSRMLS_DC)
 /* {{{ void http_request_pool_dtor(http_request_pool *) */
 PHP_HTTP_API void _http_request_pool_dtor(http_request_pool *pool TSRMLS_DC)
 {
+#if HTTP_DEBUG_REQPOOLS
+	fprintf(stderr, "Destructing request pool %p\n", pool);
+#endif
 	pool->unfinished = 0;
 	zend_llist_clean(&pool->handles);
 	zend_llist_clean(&pool->bodies);
@@ -904,26 +929,8 @@ PHP_HTTP_API void _http_request_pool_dtor(http_request_pool *pool TSRMLS_DC)
 }
 /* }}} */
 
-/*#*/
-
-/* {{{ static void http_request_pool_freebody(http_request_body **) */
-static void http_request_pool_freebody(http_request_body **body)
-{
-	TSRMLS_FETCH();
-	http_request_body_free(*body);
-}
-/* }}} */
-
-/* {{{ static void http_request_pool_responsehandler(zval **) */
-static void http_request_pool_responsehandler(zval **req TSRMLS_DC)
-{
-	getObjectEx(http_request_object, obj, *req);
-	http_request_object_responsehandler(obj, *req, NULL);
-}
-/* }}} */
-
-/* {{{ static inline STATUS http_request_pool_select(http_request_pool *) */
-static inline STATUS http_request_pool_select(http_request_pool *pool)
+/* {{{ STATUS http_request_pool_select(http_request_pool *) */
+PHP_HTTP_API STATUS _http_request_pool_select(http_request_pool *pool)
 {
 	int MAX;
 	fd_set R, W, E;
@@ -938,10 +945,45 @@ static inline STATUS http_request_pool_select(http_request_pool *pool)
 }
 /* }}} */
 
-/* {{{ static inline void http_request_pool_perform(http_request_pool *) */
-static inline void http_request_pool_perform(http_request_pool *pool)
+/* {{{ int http_request_pool_perform(http_request_pool *) */
+PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool)
 {
 	while (CURLM_CALL_MULTI_PERFORM == curl_multi_perform(pool->ch, &pool->unfinished));
+	return pool->unfinished;
+}
+/* }}} */
+
+/* {{{ void http_request_pool_responsehandler(zval **) */
+void _http_request_pool_responsehandler(zval **req TSRMLS_DC)
+{
+	getObjectEx(http_request_object, obj, *req);
+#if HTTP_DEBUG_REQPOOLS
+	fprintf(stderr, "Fetching data from request %p of pool %p\n", obj, obj->pool);
+#endif
+	http_request_object_responsehandler(obj, *req, NULL);
+}
+/* }}} */
+
+/*#*/
+
+/* {{{ static void http_request_pool_freebody(http_request_body **) */
+static void http_request_pool_freebody(http_request_body **body)
+{
+	TSRMLS_FETCH();
+	http_request_body_free(*body);
+}
+/* }}} */
+
+/* {{{ static void http_request_pool_freehandle(zval **, http_request_pool *) */
+static void http_request_pool_freehandle(zval **request, http_request_pool *pool TSRMLS_DC)
+{
+	getObjectEx(http_request_object, req, *request);
+	if (req->pool) {
+		http_request_pool_detach(pool, *request);
+	}
+#if HTTP_DEBUG_REQPOOLS
+	else fprintf(stderr, "Request %p (pool: %p) is not (anymore) attached to pool %p\n", req, req->pool, pool);
+#endif
 }
 /* }}} */
 
@@ -997,40 +1039,10 @@ static size_t http_curl_read_callback(void *data, size_t len, size_t n, void *s)
 	static char *offset = NULL, *original = NULL;
 	HTTP_CURL_CALLBACK_DATA(s, http_request_body *, body);
 
-	switch (body->type)
-	{
-		case HTTP_REQUEST_BODY_UPLOADFILE:
-		{
-			TSRMLS_FETCH();
-			return php_stream_read((php_stream *) body->data, data, len * n);
-		}
-		break;
-
-		case HTTP_REQUEST_BODY_UPLOADDATA:
-		{
-			size_t avail;
-			if (original != s) {
-				original = offset = s;
-			}
-			if ((avail = body->size - (offset - original)) < 1) {
-				return 0;
-			}
-			if (avail < (len * n)) {
-				memcpy(data, offset, avail);
-				offset += avail;
-				return avail;
-			} else {
-				memcpy(data, offset, len * n);
-				offset += len * n;
-				return len * n;
-			}
-		}
-		break;
-
-		default:
-			return 0;
-		break;
+	if (body->type != HTTP_REQUEST_BODY_UPLOADFILE) {
+		return 0;
 	}
+	return php_stream_read((php_stream *) body->data, data, len * n);
 }
 /* }}} */