X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_pool_api.c;h=aee2d89a29c6ef92fb18796434b029ddbd0ef2ea;hp=6bc43535acbfbd3c403bd3a417c774c306c87fcd;hb=ea76053f1595a10c79735e36a51f54478ff15acf;hpb=7fef44c902c86eebce30f36003a27905fbaeba65

diff --git a/http_request_pool_api.c b/http_request_pool_api.c
index 6bc4353..aee2d89 100644
--- a/http_request_pool_api.c
+++ b/http_request_pool_api.c
@@ -6,23 +6,21 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2007, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
 
-#ifdef HAVE_CONFIG_H
-#	include "config.h"
-#endif
-
 #define HTTP_WANT_CURL
+#define HTTP_WANT_EVENT
 #include "php_http.h"
 
 #if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
 
 #include "php_http_api.h"
 #include "php_http_exception_object.h"
+#include "php_http_persistent_handle_api.h"
 #include "php_http_request_api.h"
 #include "php_http_request_object.h"
 #include "php_http_request_pool_api.h"
@@ -32,14 +30,36 @@
 #	define HTTP_DEBUG_REQPOOLS 0
 #endif
 
-ZEND_EXTERN_MODULE_GLOBALS(http);
+#ifdef HTTP_HAVE_EVENT
+typedef struct _http_request_pool_event_t {
+	struct event evnt;
+	http_request_pool *pool;
+} http_request_pool_event;
 
-#ifndef HAVE_CURL_MULTI_STRERROR
-#	define curl_multi_strerror(dummy) "unknown error"
+static int http_request_pool_socket_callback(CURL *easy, curl_socket_t s, int action, void *, void *);
 #endif
 
 static int http_request_pool_compare_handles(void *h1, void *h2);
 
+PHP_MINIT_FUNCTION(http_request_pool)
+{
+	if (SUCCESS != http_persistent_handle_provide("http_request_pool", curl_multi_init, (http_persistent_handle_dtor) curl_multi_cleanup, NULL)) {
+		return FAILURE;
+	}
+	return SUCCESS;
+}
+
+#ifdef HTTP_HAVE_EVENT
+PHP_RINIT_FUNCTION(http_request_pool)
+{
+	if (!HTTP_G->request.pool.event.base && !(HTTP_G->request.pool.event.base = event_init())) {
+		return FAILURE;
+	}
+	
+	return SUCCESS;
+}
+#endif
+
 /* {{{ http_request_pool *http_request_pool_init(http_request_pool *) */
 PHP_HTTP_API http_request_pool *_http_request_pool_init(http_request_pool *pool TSRMLS_DC)
 {
@@ -54,14 +74,20 @@ PHP_HTTP_API http_request_pool *_http_request_pool_init(http_request_pool *pool
 		pool->ch = NULL;
 	}
 
-	HTTP_CHECK_CURL_INIT(pool->ch, curl_multi_init(), ;);
-	if (!pool->ch) {
+	if (SUCCESS != http_persistent_handle_acquire("http_request_pool", &pool->ch)) {
 		if (free_pool) {
 			efree(pool);
 		}
 		return NULL;
 	}
-
+	
+	TSRMLS_SET_CTX(pool->tsrm_ls);
+	
+#if HTTP_HAVE_EVENT
+	curl_multi_setopt(pool->ch, CURLMOPT_SOCKETDATA, pool);
+	curl_multi_setopt(pool->ch, CURLMOPT_SOCKETFUNCTION, http_request_pool_socket_callback);
+#endif
+	
 	pool->unfinished = 0;
 	zend_llist_init(&pool->finished, sizeof(zval *), (llist_dtor_func_t) ZVAL_PTR_DTOR, 0);
 	zend_llist_init(&pool->handles, sizeof(zval *), (llist_dtor_func_t) ZVAL_PTR_DTOR, 0);
@@ -75,8 +101,9 @@ PHP_HTTP_API http_request_pool *_http_request_pool_init(http_request_pool *pool
 /* }}} */
 
 /* {{{ STATUS http_request_pool_attach(http_request_pool *, zval *) */
-PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *request TSRMLS_DC)
+PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *request)
 {
+	TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls);
 	getObjectEx(http_request_object, req, request);
 	
 #if HTTP_DEBUG_REQPOOLS
@@ -86,12 +113,12 @@ PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *req
 	if (req->pool) {
 		http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "HttpRequest object(#%d) is already member of %s HttpRequestPool", Z_OBJ_HANDLE_P(request), req->pool == pool ? "this" : "another");
 	} else if (SUCCESS != http_request_object_requesthandler(req, request)) {
-		http_error_ex(HE_WARNING, HTTP_E_REQUEST, "Could not initialize HttpRequest object for attaching to the HttpRequestPool");
+		http_error_ex(HE_WARNING, HTTP_E_REQUEST, "Could not initialize HttpRequest object(#%d) for attaching to the HttpRequestPool", Z_OBJ_HANDLE_P(request));
 	} else {
-		CURLMcode code = curl_multi_add_handle(pool->ch, req->request.ch);
+		CURLMcode code = curl_multi_add_handle(pool->ch, req->request->ch);
 
 		if ((CURLM_OK != code) && (CURLM_CALL_MULTI_PERFORM != code)) {
-			http_error_ex(HE_WARNING, HTTP_E_REQUEST_POOL, "Could not attach HttpRequest object to the HttpRequestPool: %s", curl_multi_strerror(code));
+			http_error_ex(HE_WARNING, HTTP_E_REQUEST_POOL, "Could not attach HttpRequest object(#%d) to the HttpRequestPool: %s", Z_OBJ_HANDLE_P(request), curl_multi_strerror(code));
 		} else {
 			req->pool = pool;
 
@@ -109,9 +136,10 @@ PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *req
 /* }}} */
 
 /* {{{ STATUS http_request_pool_detach(http_request_pool *, zval *) */
-PHP_HTTP_API STATUS _http_request_pool_detach(http_request_pool *pool, zval *request TSRMLS_DC)
+PHP_HTTP_API STATUS _http_request_pool_detach(http_request_pool *pool, zval *request)
 {
 	CURLMcode code;
+	TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls);
 	getObjectEx(http_request_object, req, request);
 	
 #if HTTP_DEBUG_REQPOOLS
@@ -125,8 +153,10 @@ PHP_HTTP_API STATUS _http_request_pool_detach(http_request_pool *pool, zval *req
 #endif
 	} else if (req->pool != pool) {
 		http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "HttpRequest object(#%d) is not attached to this HttpRequestPool", Z_OBJ_HANDLE_P(request));
-	} else if (CURLM_OK != (code = curl_multi_remove_handle(pool->ch, req->request.ch))) {
-		http_error_ex(HE_WARNING, HTTP_E_REQUEST_POOL, "Could not detach HttpRequest object from the HttpRequestPool: %s", curl_multi_strerror(code));
+	} else if (req->request->_in_progress_cb) {
+		http_error_ex(HE_WARNING, HTTP_E_REQUEST_POOL, "HttpRequest object(#%d) cannot be detached from the HttpRequestPool while executing the progress callback", Z_OBJ_HANDLE_P(request));
+	} else if (CURLM_OK != (code = curl_multi_remove_handle(pool->ch, req->request->ch))) {
+		http_error_ex(HE_WARNING, HTTP_E_REQUEST_POOL, "Could not detach HttpRequest object(#%d) from the HttpRequestPool: %s", Z_OBJ_HANDLE_P(request), curl_multi_strerror(code));
 	} else {
 		req->pool = NULL;
 		zend_llist_del_element(&pool->finished, request, http_request_pool_compare_handles);
@@ -142,20 +172,41 @@ 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)
+/* {{{ void http_request_pool_apply(http_request_pool *, http_request_pool_apply_func) */
+PHP_HTTP_API void _http_request_pool_apply(http_request_pool *pool, http_request_pool_apply_func cb)
 {
 	int count = zend_llist_count(&pool->handles);
 	
-#if HTTP_DEBUG_REQPOOLS
-	fprintf(stderr, "Detaching %d requests from pool %p\n", count, pool);
-#endif
+	if (count) {
+		int i = 0;
+		zend_llist_position pos;
+		zval **handle, **handles = emalloc(count * sizeof(zval *));
+
+		for (handle = zend_llist_get_first_ex(&pool->handles, &pos); handle; handle = zend_llist_get_next_ex(&pool->handles, &pos)) {
+			handles[i++] = *handle;
+		}
+		
+		/* should never happen */
+		if (i != count) {
+			zend_error(E_ERROR, "number of fetched request handles do not match overall count");
+			count = i;
+		}
+		
+		for (i = 0; i < count; ++i) {
+			if (cb(pool, handles[i])) {
+				break;
+			}
+		}
+		efree(handles);
+	}
+}
+/* }}} */
+
+/* {{{ void http_request_pool_apply_with_arg(http_request_pool *, http_request_pool_apply_with_arg_func, void *) */
+PHP_HTTP_API void _http_request_pool_apply_with_arg(http_request_pool *pool, http_request_pool_apply_with_arg_func cb, void *arg)
+{
+	int count = zend_llist_count(&pool->handles);
 	
-	/*
-	 * we cannot apply a function to the llist which actually detaches
-	 * the curl handle *and* removes the llist element --
-	 * so let's get our hands dirty
-	 */
 	if (count) {
 		int i = 0;
 		zend_llist_position pos;
@@ -172,41 +223,76 @@ PHP_HTTP_API void _http_request_pool_detach_all(http_request_pool *pool TSRMLS_D
 		}
 		
 		for (i = 0; i < count; ++i) {
-			http_request_pool_detach(pool, handles[i]);
+			if (cb(pool, handles[i], arg)) {
+				break;
+			}
 		}
 		efree(handles);
 	}
 }
+/* }}} */
 
-/* {{{ STATUS http_request_pool_send(http_request_pool *) */
-PHP_HTTP_API STATUS _http_request_pool_send(http_request_pool *pool TSRMLS_DC)
+/* {{{ void http_request_pool_detach_all(http_request_pool *) */
+PHP_HTTP_API void _http_request_pool_detach_all(http_request_pool *pool)
 {
 #if HTTP_DEBUG_REQPOOLS
-	fprintf(stderr, "Attempt to send %d requests of pool %p\n", zend_llist_count(&pool->handles), pool);
+	fprintf(stderr, "Detaching %d requests from pool %p\n", zend_llist_count(&pool->handles), pool);
 #endif
+	http_request_pool_apply(pool, _http_request_pool_detach);
+}
+/* }}} */
+
+/* {{{ STATUS http_request_pool_send(http_request_pool *) */
+PHP_HTTP_API STATUS _http_request_pool_send(http_request_pool *pool)
+{
+	TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls);
+#ifdef HTTP_HAVE_EVENT
+	CURLMcode rc;
+	
+	do {
+		rc = curl_multi_socket_all(pool->ch, &pool->unfinished);
+	} while (CURLM_CALL_MULTI_PERFORM == rc);
+	
+	if (CURLM_OK != rc) {
+		http_error(HE_WARNING, HTTP_E_SOCKET, curl_multi_strerror(rc));
+		return FAILURE;
+	}
+	
+	event_base_dispatch(HTTP_G->request.pool.event.base);
+	
+	return SUCCESS;
+#else
+	
+#	if HTTP_DEBUG_REQPOOLS
+	fprintf(stderr, "Attempt to send %d requests of pool %p\n", zend_llist_count(&pool->handles), pool);
+#	endif
 	
 	while (http_request_pool_perform(pool)) {
 		if (SUCCESS != http_request_pool_select(pool)) {
-#ifdef PHP_WIN32
-			http_error(HE_WARNING, HTTP_E_SOCKET, WSAGetLastError());
-#else
+#	ifdef PHP_WIN32
+			/* see http://msdn.microsoft.com/library/en-us/winsock/winsock/windows_sockets_error_codes_2.asp */
+			http_error_ex(HE_WARNING, HTTP_E_SOCKET, "WinSock error: %d", WSAGetLastError());
+#	else
 			http_error(HE_WARNING, HTTP_E_SOCKET, strerror(errno));
-#endif
+#	endif
 			return FAILURE;
 		}
 	}
 	
-#if HTTP_DEBUG_REQPOOLS
+#	if HTTP_DEBUG_REQPOOLS
 	fprintf(stderr, "Finished sending %d HttpRequests of pool %p (still unfinished: %d)\n", zend_llist_count(&pool->handles), pool, pool->unfinished);
-#endif
+#	endif
 	
 	return SUCCESS;
+#endif
 }
 /* }}} */
 
 /* {{{ void http_request_pool_dtor(http_request_pool *) */
-PHP_HTTP_API void _http_request_pool_dtor(http_request_pool *pool TSRMLS_DC)
+PHP_HTTP_API void _http_request_pool_dtor(http_request_pool *pool)
 {
+	TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls);
+	
 #if HTTP_DEBUG_REQPOOLS
 	fprintf(stderr, "Destructing request pool %p\n", pool);
 #endif
@@ -214,7 +300,7 @@ PHP_HTTP_API void _http_request_pool_dtor(http_request_pool *pool TSRMLS_DC)
 	pool->unfinished = 0;
 	zend_llist_clean(&pool->finished);
 	zend_llist_clean(&pool->handles);
-	curl_multi_cleanup(pool->ch);
+	http_persistent_handle_release("http_request_pool", &pool->ch);
 }
 /* }}} */
 
@@ -227,26 +313,48 @@ PHP_HTTP_API void _http_request_pool_dtor(http_request_pool *pool TSRMLS_DC)
 /* {{{ STATUS http_request_pool_select(http_request_pool *) */
 PHP_HTTP_API STATUS _http_request_pool_select(http_request_pool *pool)
 {
+#ifdef HTTP_HAVE_EVENT
+	TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls);
+	http_error(HE_WARNING, HTTP_E_RUNTIME, "not implemented");
+	return FAILURE;
+#else
 	int MAX;
 	fd_set R, W, E;
 	struct timeval timeout = {1, 0};
+#	ifdef HAVE_CURL_MULTI_TIMEOUT
+	long max_tout = 1000;
+	
+	if ((CURLM_OK == curl_multi_timeout(pool->ch, &max_tout)) && (max_tout != -1)) {
+		timeout.tv_sec = max_tout / 1000;
+		timeout.tv_usec = (max_tout % 1000) * 1000;
+	}
+#	endif
 
 	FD_ZERO(&R);
 	FD_ZERO(&W);
 	FD_ZERO(&E);
 
 	if (CURLM_OK == curl_multi_fdset(pool->ch, &R, &W, &E, &MAX)) {
-		if (MAX == -1 || SELECT_ERROR != select(MAX + 1, &R, &W, &E, &timeout)) {
+		if (MAX == -1) {
+			http_sleep((double) timeout.tv_sec + (double) (timeout.tv_usec / HTTP_MCROSEC));
+			return SUCCESS;
+		} else if (SELECT_ERROR != select(MAX + 1, &R, &W, &E, &timeout)) {
 			return SUCCESS;
 		}
 	}
 	return FAILURE;
+#endif
 }
 /* }}} */
 
 /* {{{ int http_request_pool_perform(http_request_pool *) */
-PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool TSRMLS_DC)
+PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool)
 {
+	TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls);
+#ifdef HTTP_HAVE_EVENT
+	http_error(HE_WARNING, HTTP_E_RUNTIME, "not implemented");
+	return FAILURE;
+#else
 	CURLMsg *msg;
 	int remaining = 0;
 	
@@ -254,108 +362,156 @@ PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool TSRMLS_DC)
 	
 	while ((msg = curl_multi_info_read(pool->ch, &remaining))) {
 		if (CURLMSG_DONE == msg->msg) {
-			if (CURLE_OK != msg->data.result) {
-				http_request_pool_try {
-					http_error(HE_WARNING, HTTP_E_REQUEST, curl_easy_strerror(msg->data.result));
-				} http_request_pool_catch();
-			}
-			http_request_pool_try {
-				zend_llist_apply_with_argument(&pool->handles, (llist_apply_with_arg_func_t) http_request_pool_responsehandler, msg->easy_handle TSRMLS_CC);
-			} http_request_pool_catch();
+				if (CURLE_OK != msg->data.result) {
+					http_request *r = NULL;
+					curl_easy_getinfo(msg->easy_handle, CURLINFO_PRIVATE, &r);
+					http_error_ex(HE_WARNING, HTTP_E_REQUEST, "%s; %s (%s)", curl_easy_strerror(msg->data.result), r?r->_error:"", r?r->url:"");
+				}
+				http_request_pool_apply_with_arg(pool, _http_request_pool_responsehandler, msg->easy_handle);
 		}
 	}
-	http_request_pool_final();
 	
 	return pool->unfinished;
+#endif
 }
 /* }}} */
 
-/* {{{ void http_request_pool_responsehandler(zval **) */
-void _http_request_pool_responsehandler(zval **req, CURL *ch TSRMLS_DC)
+/* {{{ void http_request_pool_responsehandler(http_request_pool *, zval *, void *) */
+int _http_request_pool_responsehandler(http_request_pool *pool, zval *req, void *ch)
 {
-	getObjectEx(http_request_object, obj, *req);
+	TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls);
+	getObjectEx(http_request_object, obj, req);
 	
-	if (obj->request.ch == ch) {
+	if ((!ch) || obj->request->ch == (CURL *) ch) {
 		
 #if HTTP_DEBUG_REQPOOLS
-		fprintf(stderr, "Fetching data from HttpRequest(#%d) %p of pool %p\n", Z_OBJ_HANDLE_PP(req), obj, obj->pool);
+		fprintf(stderr, "Fetching data from HttpRequest(#%d) %p of pool %p\n", Z_OBJ_HANDLE_P(req), obj, obj->pool);
 #endif
 		
-		ZVAL_ADDREF(*req);
-		zend_llist_add_element(&obj->pool->finished, req);
-		http_request_object_responsehandler(obj, *req);
+		ZVAL_ADDREF(req);
+		zend_llist_add_element(&obj->pool->finished, &req);
+		http_request_object_responsehandler(obj, req);
+		return 1;
 	}
+	return 0;
 }
 /* }}} */
 
-static void move_backtrace_args(zval *from, zval *to TSRMLS_DC)
+/*#*/
+
+/* {{{ static int http_request_pool_compare_handles(void *, void *) */
+static int http_request_pool_compare_handles(void *h1, void *h2)
 {
-	zval **args, **trace_0, *old_trace_0, *trace = NULL;
-	
-	if ((trace = zend_read_property(zend_exception_get_default(), from, "trace", lenof("trace"), 0 TSRMLS_CC))) {
-		if (SUCCESS == zend_hash_index_find(Z_ARRVAL_P(trace), 0, (void **) &trace_0)) {
-			old_trace_0 = *trace_0;
-			if (SUCCESS == zend_hash_find(Z_ARRVAL_PP(trace_0), "args", sizeof("args"), (void **) &args)) {
-				if ((trace = zend_read_property(zend_exception_get_default(), to, "trace", lenof("trace"), 0 TSRMLS_CC))) {
-					if (SUCCESS == zend_hash_index_find(Z_ARRVAL_P(trace), 0, (void **) &trace_0)) {
-						ZVAL_ADDREF(*args);
-						add_assoc_zval(*trace_0, "args", *args);
-						zend_hash_del(Z_ARRVAL_P(old_trace_0), "args", sizeof("args"));
-					}
-				}
-			}
-		}
-	}
+	return (Z_OBJ_HANDLE_PP((zval **) h1) == Z_OBJ_HANDLE_P((zval *) h2));
 }
-/* {{{ void http_request_pool_wrap_exception(zval *, zval *) */
-void _http_request_pool_wrap_exception(zval *old_exception, zval *new_exception TSRMLS_DC)
+/* }}} */
+
+#ifdef HTTP_HAVE_EVENT
+static void http_request_pool_event_callback(int socket, short action, void *event_data)
 {
-	zend_class_entry *ce = HTTP_EX_CE(request_pool);
+	CURLMcode rc;
+	CURLMsg *msg;
+	int remaining;
+	http_request_pool_event *ev = event_data;
+	http_request_pool *pool = ev->pool;
+	TSRMLS_FETCH_FROM_CTX(ev->pool->tsrm_ls);
 	
-	/*	if old_exception is already an HttpRequestPoolException append the new one, 
-		else create a new HttpRequestPoolException and append the old and new exceptions */
-	if (old_exception && Z_OBJCE_P(old_exception) == ce) {
-		zval *exprop;
-		
-		exprop = zend_read_property(ce, old_exception, "exceptionStack", lenof("exceptionStack"), 0 TSRMLS_CC);
-		SEP_PROP(&exprop);
-		convert_to_array(exprop);
-		
-		add_next_index_zval(exprop, new_exception);
-		zend_update_property(ce, old_exception, "exceptionStack", lenof("exceptionStack"), exprop TSRMLS_CC);
-		
-		EG(exception) = old_exception;
-	} else if (new_exception && Z_OBJCE_P(new_exception) != ce){
-		zval *exval, *exprop;
-		
-		MAKE_STD_ZVAL(exval);
-		object_init_ex(exval, ce);
-		MAKE_STD_ZVAL(exprop);
-		array_init(exprop);
-		
-		if (old_exception) {
-			add_next_index_zval(exprop, old_exception);
+#if HTTP_DEBUG_REQPOOLS
+	{
+		static const char event_strings[][20] = {"TIMEOUT","READ","TIMEOUT|READ","WRITE","TIMEOUT|WRITE","READ|WRITE","TIMEOUT|READ|WRITE","SIGNAL"};
+		fprintf(stderr, "Event on socket %d (%s) event %p of pool %p\n", socket, event_strings[action], ev, pool);
+	}
+#endif
+	
+	do {
+#ifdef HAVE_CURL_MULTI_SOCKET_ACTION
+		switch (action & (EV_READ|EV_WRITE)) {
+			case EV_READ:
+				rc = curl_multi_socket_action(pool->ch, socket, CURL_CSELECT_IN, &pool->unfinished);
+				break;
+			case EV_WRITE:
+				rc = curl_multi_socket_action(pool->ch, socket, CURL_CSELECT_OUT, &pool->unfinished);
+				break;
+			case EV_READ|EV_WRITE:
+				rc = curl_multi_socket_action(pool->chm socket, CURL_CSELECT_IN|CURL_CSELECT_OUT, &pool->unfinished);
+				break;
+			default:
+				http_error(HE_WARNING, HTTP_E_SOCKET, "Unknown event %d", (int) action);
+				return;
+		}
+#else
+		rc = curl_multi_socket(pool->ch, socket, &pool->unfinished);
+#endif
+	} while (CURLM_CALL_MULTI_PERFORM == rc);
+	
+	/* don't use 'ev' below here, as it might 've been freed in the socket callback */
+	
+	if (CURLM_OK != rc) {
+		http_error(HE_WARNING, HTTP_E_SOCKET, curl_multi_strerror(rc));
+	}
+	
+	while ((msg = curl_multi_info_read(pool->ch, &remaining))) {
+		if (CURLMSG_DONE == msg->msg) {
+			if (CURLE_OK != msg->data.result) {
+				http_request *r = NULL;
+				curl_easy_getinfo(msg->easy_handle, CURLINFO_PRIVATE, &r);
+				http_error_ex(HE_WARNING, HTTP_E_REQUEST, "%s; %s (%s)", curl_easy_strerror(msg->data.result), r?r->_error:"", r?r->url:"");
+			}
+			http_request_pool_apply_with_arg(pool, _http_request_pool_responsehandler, msg->easy_handle);
 		}
-		move_backtrace_args(new_exception, exval TSRMLS_CC);
-		zend_update_property_long(ce, exval, "code", lenof("code"), HTTP_E_REQUEST_POOL TSRMLS_CC);
-		zend_update_property_string(ce, exval, "message", lenof("message"), "See exceptionStack property" TSRMLS_CC);
-		add_next_index_zval(exprop, new_exception);
-		zend_update_property(ce, exval, "exceptionStack", lenof("exceptionStack"), exprop TSRMLS_CC);
-		zval_ptr_dtor(&exprop);
-		
-		EG(exception) = exval;
 	}
 }
-/* }}} */
 
-/*#*/
-
-/* {{{ static int http_request_pool_compare_handles(void *, void *) */
-static int http_request_pool_compare_handles(void *h1, void *h2)
+static int http_request_pool_socket_callback(CURL *easy, curl_socket_t sock, int action, void *socket_data, void *assign_data)
 {
-	return (Z_OBJ_HANDLE_PP((zval **) h1) == Z_OBJ_HANDLE_P((zval *) h2));
+	int events = EV_PERSIST;
+	http_request_pool *pool = socket_data;
+	http_request_pool_event *ev = assign_data;
+	TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls);
+	
+	if (!ev) {
+		ev = ecalloc(1, sizeof(http_request_pool_event));
+		ev->pool = pool;
+		curl_multi_assign(pool->ch, sock, ev);
+	} else {
+		event_del(&ev->evnt);
+	}
+	
+#if HTTP_DEBUG_REQPOOLS
+	{
+		static const char action_strings[][8] = {"NONE", "IN", "OUT", "INOUT", "REMOVE"};
+		fprintf(stderr, "Callback on socket %d (%s) event %p of pool %p\n", (int) sock, action_strings[action], ev, pool);
+	}
+#endif
+	
+	switch (action) {
+		case CURL_POLL_IN:
+			events |= EV_READ;
+			break;
+		case CURL_POLL_OUT:
+			events |= EV_WRITE;
+			break;
+		case CURL_POLL_INOUT:
+			events |= EV_READ|EV_WRITE;
+			break;
+			
+		case CURL_POLL_REMOVE:
+			efree(ev);
+		case CURL_POLL_NONE:
+			return 0;
+			
+		default:
+			http_error_ex(HE_WARNING, HTTP_E_SOCKET, "Unknown socket action %d", action);
+			return -1;
+	}
+	
+	event_set(&ev->evnt, sock, events, http_request_pool_event_callback, ev);
+	event_base_set(HTTP_G->request.pool.event.base, &ev->evnt);
+	event_add(&ev->evnt, NULL);
+	
+	return 0;
 }
-/* }}} */
+#endif /* HTTP_HAVE_EVENT */
 
 #endif /* ZEND_ENGINE_2 && HTTP_HAVE_CURL */