X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_curl_client_pool.c;h=6d04b538fdf54bae1edd2b3d175a847fe7ab51ba;hp=6ae1da658ae99886433b3fb347fa106ee1fd749a;hb=8191c55421fb6ecc86185608a8b0510da1525e1e;hpb=d5de4f9eae86ae1dab0f8a906bf9543710ae124d

diff --git a/php_http_curl_client_pool.c b/php_http_curl_client_pool.c
index 6ae1da6..6d04b53 100644
--- a/php_http_curl_client_pool.c
+++ b/php_http_curl_client_pool.c
@@ -37,7 +37,7 @@ typedef struct php_http_curl_client_pool {
 #endif
 } php_http_curl_client_pool_t;
 
-static void *php_http_curlm_ctor(void *opaque TSRMLS_DC)
+static void *php_http_curlm_ctor(void *opaque, void *init_arg TSRMLS_DC)
 {
 	return curl_multi_init();
 }
@@ -62,7 +62,7 @@ static void php_http_curl_client_pool_responsehandler(php_http_client_pool_t *po
 			zval **request;
 
 			if (CURLE_OK != msg->data.result) {
-				php_http_curl_client_storage_t *st = get_storage(msg->easy_handle);
+				php_http_curl_client_storage_t *st = php_http_curl_client_get_storage(msg->easy_handle);
 				php_http_error(HE_WARNING, PHP_HTTP_E_CLIENT, "%s; %s (%s)", curl_easy_strerror(msg->data.result), STR_PTR(st->errorbuffer), STR_PTR(st->url));
 			}
 
@@ -246,7 +246,7 @@ static php_http_client_pool_t *php_http_curl_client_pool_init(php_http_client_po
 	php_http_curl_client_pool_t *curl;
 	TSRMLS_FETCH_FROM_CTX(h->ts);
 
-	if (!handle && !(handle = php_http_resource_factory_handle_ctor(h->rf TSRMLS_CC))) {
+	if (!handle && !(handle = php_resource_factory_handle_ctor(h->rf, NULL TSRMLS_CC))) {
 		php_http_error(HE_WARNING, PHP_HTTP_E_CLIENT_POOL, "could not initialize curl pool handle");
 		return NULL;
 	}
@@ -273,7 +273,7 @@ static void php_http_curl_client_pool_dtor(php_http_client_pool_t *h)
 	curl->unfinished = 0;
 	php_http_client_pool_reset(h);
 
-	php_http_resource_factory_handle_dtor(h->rf, curl->handle TSRMLS_CC);
+	php_resource_factory_handle_dtor(h->rf, curl->handle TSRMLS_CC);
 
 	efree(curl);
 	h->ctx = NULL;
@@ -471,7 +471,7 @@ static STATUS php_http_curl_client_pool_setopt(php_http_client_pool_t *h, php_ht
 	return SUCCESS;
 }
 
-static php_http_resource_factory_ops_t php_http_curlm_resource_factory_ops = {
+static php_resource_factory_ops_t php_http_curlm_resource_factory_ops = {
 	php_http_curlm_ctor,
 	NULL,
 	php_http_curlm_dtor
@@ -546,7 +546,7 @@ zend_object_value php_http_curl_client_pool_object_new_ex(zend_class_entry *ce,
 
 PHP_MINIT_FUNCTION(http_curl_client_pool)
 {
-	if (SUCCESS != php_http_persistent_handle_provide(ZEND_STRL("http_client_pool.curl"), &php_http_curlm_resource_factory_ops, NULL, NULL)) {
+	if (SUCCESS != php_persistent_handle_provide(ZEND_STRL("http_client_pool.curl"), &php_http_curlm_resource_factory_ops, NULL, NULL)) {
 		return FAILURE;
 	}
 
@@ -556,16 +556,26 @@ PHP_MINIT_FUNCTION(http_curl_client_pool)
 	return SUCCESS;
 }
 
+#if PHP_HTTP_HAVE_EVENT
 PHP_RINIT_FUNCTION(http_curl_client_pool)
 {
-#if PHP_HTTP_HAVE_EVENT
 	if (!PHP_HTTP_G->curl.event_base && !(PHP_HTTP_G->curl.event_base = event_base_new())) {
 		return FAILURE;
 	}
+	return SUCCESS;
+}
 #endif
 
+#if PHP_HTTP_HAVE_EVENT
+PHP_RSHUTDOWN_FUNCTION(http_curl_client_pool)
+{
+	if (PHP_HTTP_G->curl.event_base) {
+		event_base_free(PHP_HTTP_G->curl.event_base);
+		PHP_HTTP_G->curl.event_base = NULL;
+	}
 	return SUCCESS;
 }
+#endif
 
 #endif /* PHP_HTTP_HAVE_CURL */