X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=src%2Fphp_http_client_curl.c;h=d3f5200c141921bc6dbf922fdc9f83f6ff6c1a06;hb=286dfcc5b1e7b24117132c7bff5b8e64ac6ac5d0;hp=5dab9e210037a95b7fe055759f4fadaf68029ec6;hpb=d28ddced9537977072dff996ccbb69f421ce48cf;p=m6w6%2Fext-http

diff --git a/src/php_http_client_curl.c b/src/php_http_client_curl.c
index 5dab9e2..d3f5200 100644
--- a/src/php_http_client_curl.c
+++ b/src/php_http_client_curl.c
@@ -12,30 +12,10 @@
 
 #include "php_http_api.h"
 #include "php_http_client.h"
+#include "php_http_client_curl_event.h"
 
 #if PHP_HTTP_HAVE_CURL
 
-#if PHP_HTTP_HAVE_EVENT
-#	if !PHP_HTTP_HAVE_EVENT2 && /* just be really sure */ !(LIBEVENT_VERSION_NUMBER >= 0x02000000)
-#		include <event.h>
-#		define event_base_new event_init
-#		define event_assign(e, b, s, a, cb, d) do {\
-			event_set(e, s, a, cb, d); \
-			event_base_set(b, e); \
-		} while(0)
-#	else
-#		if PHP_HTTP_HAVE_EVENT2
-#			include <event2/event.h>
-#			include <event2/event_struct.h>
-#		else
-#			error "libevent presence is unknown"
-#		endif
-#	endif
-#	ifndef DBG_EVENTS
-#		define DBG_EVENTS 0
-#	endif
-#endif
-
 #ifdef PHP_HTTP_HAVE_OPENSSL
 #	include <openssl/ssl.h>
 #endif
@@ -43,23 +23,6 @@
 #	include <gnutls.h>
 #endif
 
-typedef struct php_http_client_curl_handle {
-	CURLM *multi;
-	CURLSH *share;
-} php_http_client_curl_handle_t;
-
-typedef struct php_http_client_curl {
-	php_http_client_curl_handle_t *handle;
-
-	int unfinished;  /* int because of curl_multi_perform() */
-
-#if PHP_HTTP_HAVE_EVENT
-	struct event_base *evbase;
-	struct event *timeout;
-	unsigned useevents:1;
-#endif
-} php_http_client_curl_t;
-
 typedef struct php_http_client_curl_handler {
 	CURL *handle;
 	php_resource_factory_t *rf;
@@ -651,7 +614,7 @@ static php_http_message_t *php_http_curlm_responseparser(php_http_client_curl_ha
 	return response;
 }
 
-static void php_http_curlm_responsehandler(php_http_client_t *context)
+void php_http_client_curl_responsehandler(php_http_client_t *context)
 {
 	int err_count = 0, remaining = 0;
 	php_http_curle_storage_t *st, *err = NULL;
@@ -704,161 +667,6 @@ static void php_http_curlm_responsehandler(php_http_client_t *context)
 	}
 }
 
-#if PHP_HTTP_HAVE_EVENT
-
-typedef struct php_http_curlm_event {
-	struct event evnt;
-	php_http_client_t *context;
-} php_http_curlm_event_t;
-
-static inline int etoca(short action) {
-	switch (action & (EV_READ|EV_WRITE)) {
-		case EV_READ:
-			return CURL_CSELECT_IN;
-			break;
-		case EV_WRITE:
-			return CURL_CSELECT_OUT;
-			break;
-		case EV_READ|EV_WRITE:
-			return CURL_CSELECT_IN|CURL_CSELECT_OUT;
-			break;
-		default:
-			return 0;
-	}
-}
-
-static void php_http_curlm_timeout_callback(int socket, short action, void *event_data)
-{
-	php_http_client_t *context = event_data;
-	php_http_client_curl_t *curl = context->ctx;
-
-#if DBG_EVENTS
-	fprintf(stderr, "T");
-#endif
-	if (curl->useevents) {
-		CURLMcode rc;
-		TSRMLS_FETCH_FROM_CTX(context->ts);
-
-		/* ignore and use -1,0 on timeout */
-		(void) socket;
-		(void) action;
-
-		while (CURLM_CALL_MULTI_PERFORM == (rc = curl_multi_socket_action(curl->handle->multi, CURL_SOCKET_TIMEOUT, 0, &curl->unfinished)));
-
-		if (CURLM_OK != rc) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s",  curl_multi_strerror(rc));
-		}
-
-		php_http_curlm_responsehandler(context);
-	}
-}
-
-static void php_http_curlm_event_callback(int socket, short action, void *event_data)
-{
-	php_http_client_t *context = event_data;
-	php_http_client_curl_t *curl = context->ctx;
-
-#if DBG_EVENTS
-	fprintf(stderr, "E");
-#endif
-	if (curl->useevents) {
-		CURLMcode rc = CURLM_OK;
-		TSRMLS_FETCH_FROM_CTX(context->ts);
-
-		while (CURLM_CALL_MULTI_PERFORM == (rc = curl_multi_socket_action(curl->handle->multi, socket, etoca(action), &curl->unfinished)));
-
-		if (CURLM_OK != rc) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", curl_multi_strerror(rc));
-		}
-
-		php_http_curlm_responsehandler(context);
-
-		/* remove timeout if there are no transfers left */
-		if (!curl->unfinished && event_initialized(curl->timeout) && event_pending(curl->timeout, EV_TIMEOUT, NULL)) {
-			event_del(curl->timeout);
-		}
-	}
-}
-
-static int php_http_curlm_socket_callback(CURL *easy, curl_socket_t sock, int action, void *socket_data, void *assign_data)
-{
-	php_http_client_t *context = socket_data;
-	php_http_client_curl_t *curl = context->ctx;
-
-#if DBG_EVENTS
-	fprintf(stderr, "S");
-#endif
-	if (curl->useevents) {
-		int events = EV_PERSIST;
-		php_http_curlm_event_t *ev = assign_data;
-		TSRMLS_FETCH_FROM_CTX(context->ts);
-
-		if (!ev) {
-			ev = ecalloc(1, sizeof(php_http_curlm_event_t));
-			ev->context = context;
-			curl_multi_assign(curl->handle->multi, sock, ev);
-		} else {
-			event_del(&ev->evnt);
-		}
-
-		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);
-				/* no break */
-			case CURL_POLL_NONE:
-				return 0;
-
-			default:
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown socket action %d", action);
-				return -1;
-		}
-
-		event_assign(&ev->evnt, curl->evbase, sock, events, php_http_curlm_event_callback, context);
-		event_add(&ev->evnt, NULL);
-	}
-
-	return 0;
-}
-
-static void php_http_curlm_timer_callback(CURLM *multi, long timeout_ms, void *timer_data)
-{
-	php_http_client_t *context = timer_data;
-	php_http_client_curl_t *curl = context->ctx;
-
-#if DBG_EVENTS
-	fprintf(stderr, "\ntimer <- timeout_ms: %ld\n", timeout_ms);
-#endif
-	if (curl->useevents) {
-
-		if (timeout_ms < 0) {
-			php_http_curlm_timeout_callback(CURL_SOCKET_TIMEOUT, /*EV_READ|EV_WRITE*/0, context);
-		} else if (timeout_ms > 0 || !event_initialized(curl->timeout) || !event_pending(curl->timeout, EV_TIMEOUT, NULL)) {
-			struct timeval timeout;
-
-			if (!event_initialized(curl->timeout)) {
-				event_assign(curl->timeout, curl->evbase, CURL_SOCKET_TIMEOUT, 0, php_http_curlm_timeout_callback, context);
-			}
-
-			timeout.tv_sec = timeout_ms / 1000;
-			timeout.tv_usec = (timeout_ms % 1000) * 1000;
-
-			event_add(curl->timeout, &timeout);
-		}
-	}
-}
-
-#endif /* HAVE_EVENT */
-
 /* curl options */
 
 static php_http_options_t php_http_curle_options, php_http_curlm_options;
@@ -1731,22 +1539,24 @@ static inline ZEND_RESULT_CODE php_http_curlm_use_eventloop(php_http_client_t *h
 {
 	php_http_client_curl_t *curl = h->ctx;
 
-	if ((curl->useevents = enable)) {
-		if (!curl->evbase) {
-			curl->evbase = event_base_new();
+	if (enable) {
+		if (!curl->ev_ops) {
+			if (!(curl->ev_ops = php_http_client_curl_event_ops_get())) {
+				return FAILURE;
+			}
 		}
-		if (!curl->timeout) {
-			curl->timeout = ecalloc(1, sizeof(struct event));
+		if (curl->ev_ops && !curl->ev_ctx) {
+			if (!(curl->ev_ctx = curl->ev_ops->init(h))) {
+				return FAILURE;
+			}
 		}
-		curl_multi_setopt(curl->handle->multi, CURLMOPT_SOCKETDATA, h);
-		curl_multi_setopt(curl->handle->multi, CURLMOPT_SOCKETFUNCTION, php_http_curlm_socket_callback);
-		curl_multi_setopt(curl->handle->multi, CURLMOPT_TIMERDATA, h);
-		curl_multi_setopt(curl->handle->multi, CURLMOPT_TIMERFUNCTION, php_http_curlm_timer_callback);
 	} else {
-		curl_multi_setopt(curl->handle->multi, CURLMOPT_SOCKETDATA, NULL);
-		curl_multi_setopt(curl->handle->multi, CURLMOPT_SOCKETFUNCTION, NULL);
-		curl_multi_setopt(curl->handle->multi, CURLMOPT_TIMERDATA, NULL);
-		curl_multi_setopt(curl->handle->multi, CURLMOPT_TIMERFUNCTION, NULL);
+		if (curl->ev_ops) {
+			if (curl->ev_ctx) {
+				curl->ev_ops->dtor(&curl->ev_ctx);
+			}
+			curl->ev_ops = NULL;
+		}
 	}
 
 	return SUCCESS;
@@ -1756,7 +1566,52 @@ static ZEND_RESULT_CODE php_http_curlm_option_set_use_eventloop(php_http_option_
 {
 	php_http_client_t *client = userdata;
 
-	return php_http_curlm_use_eventloop(client, value && Z_BVAL_P(value));
+	if (Z_TYPE_P(value) == IS_OBJECT /* && instanceof_function */) {
+		abort();
+	}
+	return php_http_curlm_use_eventloop(client, value && z_is_true(value));
+}
+#endif
+
+static ZEND_RESULT_CODE php_http_curlm_option_set_share_cookies(php_http_option_t *opt, zval *value, void *userdata)
+{
+	php_http_client_t *client = userdata;
+	php_http_client_curl_t *curl = client->ctx;
+	CURLSHcode rc;
+
+	if (Z_BVAL_P(value)) {
+		rc = curl_share_setopt(curl->handle->share, CURLSHOPT_SHARE, CURL_LOCK_DATA_COOKIE);
+	} else {
+		rc = curl_share_setopt(curl->handle->share, CURLSHOPT_UNSHARE, CURL_LOCK_DATA_COOKIE);
+	}
+
+	if (CURLSHE_OK != rc) {
+		TSRMLS_FETCH_FROM_CTX(client->ts);
+		php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not set option %s (%s)", opt->name.s, curl_share_strerror(rc));
+		return FAILURE;
+	}
+	return SUCCESS;
+}
+
+#if PHP_HTTP_CURL_VERSION(7,23,0)
+static ZEND_RESULT_CODE php_http_curlm_option_set_share_ssl(php_http_option_t *opt, zval *value, void *userdata)
+{
+	php_http_client_t *client = userdata;
+	php_http_client_curl_t *curl = client->ctx;
+	CURLSHcode rc;
+
+	if (Z_BVAL_P(value)) {
+		rc = curl_share_setopt(curl->handle->share, CURLSHOPT_SHARE, CURL_LOCK_DATA_SSL_SESSION);
+	} else {
+		rc = curl_share_setopt(curl->handle->share, CURLSHOPT_UNSHARE, CURL_LOCK_DATA_SSL_SESSION);
+	}
+
+	if (CURLSHE_OK != rc) {
+		TSRMLS_FETCH_FROM_CTX(client->ts);
+		php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not set option %s (%s)", opt->name.s, curl_share_strerror(rc));
+		return FAILURE;
+	}
+	return SUCCESS;
 }
 #endif
 
@@ -1810,6 +1665,17 @@ static void php_http_curlm_options_init(php_http_options_t *registry TSRMLS_DC)
 	if ((opt = php_http_option_register(registry, ZEND_STRL("use_eventloop"), 0, IS_BOOL))) {
 		opt->setter = php_http_curlm_option_set_use_eventloop;
 	}
+#endif
+	/* share */
+	if ((opt = php_http_option_register(registry, ZEND_STRL("share_cookies"), 0, IS_BOOL))) {
+		opt->setter = php_http_curlm_option_set_share_cookies;
+		ZVAL_BOOL(&opt->defval, 1);
+	}
+#if PHP_HTTP_CURL_VERSION(7,23,0)
+	if ((opt = php_http_option_register(registry, ZEND_STRL("share_ssl"), 0, IS_BOOL))) {
+		opt->setter = php_http_curlm_option_set_share_ssl;
+		ZVAL_BOOL(&opt->defval, 1);
+	}
 #endif
 }
 
@@ -1836,15 +1702,18 @@ static ZEND_RESULT_CODE php_http_curlm_set_option(php_http_option_t *opt, zval *
 		case IS_BOOL:
 			if (CURLM_OK != (rc = curl_multi_setopt(ch, opt->option, (long) Z_BVAL_P(val)))) {
 				rv = FAILURE;
+				php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not set option %s (%s)", opt->name.s, curl_multi_strerror(rc));
 			}
 			break;
 		case IS_LONG:
 			if (CURLM_OK != (rc = curl_multi_setopt(ch, opt->option, Z_LVAL_P(val)))) {
 				rv = FAILURE;
+				php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not set option %s (%s)", opt->name.s, curl_multi_strerror(rc));
 			}
 			break;
 		default:
 			rv = FAILURE;
+			php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not set option %s", opt->name.s);
 			break;
 		}
 	}
@@ -1853,9 +1722,6 @@ static ZEND_RESULT_CODE php_http_curlm_set_option(php_http_option_t *opt, zval *
 		zval_ptr_dtor(&val);
 	}
 
-	if (rv != SUCCESS) {
-		php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not set option %s (%s)", opt->name.s, curl_easy_strerror(rc));
-	}
 	return rv;
 }
 
@@ -2139,19 +2005,9 @@ static void php_http_client_curl_dtor(php_http_client_t *h)
 	php_http_client_curl_t *curl = h->ctx;
 	TSRMLS_FETCH_FROM_CTX(h->ts);
 
-#if PHP_HTTP_HAVE_EVENT
-	if (curl->timeout) {
-		if (event_initialized(curl->timeout) && event_pending(curl->timeout, EV_TIMEOUT, NULL)) {
-			event_del(curl->timeout);
-		}
-		efree(curl->timeout);
-		curl->timeout = NULL;
-	}
-	if (curl->evbase) {
-		event_base_free(curl->evbase);
-		curl->evbase = NULL;
+	if (curl->ev_ops) {
+		curl->ev_ops->dtor(&curl->ev_ctx);
 	}
-#endif
 	curl->unfinished = 0;
 
 	php_resource_factory_handle_dtor(h->rf, curl->handle TSRMLS_CC);
@@ -2287,17 +2143,6 @@ static void php_http_client_curl_reset(php_http_client_t *h)
 	}
 }
 
-static inline void php_http_client_curl_get_timeout(php_http_client_curl_t *curl, long max_tout, struct timeval *timeout)
-{
-	if ((CURLM_OK == curl_multi_timeout(curl->handle->multi, &max_tout)) && (max_tout > 0)) {
-		timeout->tv_sec = max_tout / 1000;
-		timeout->tv_usec = (max_tout % 1000) * 1000;
-	} else {
-		timeout->tv_sec = 0;
-		timeout->tv_usec = 1000;
-	}
-}
-
 #ifdef PHP_WIN32
 #	define SELECT_ERROR SOCKET_ERROR
 #else
@@ -2311,22 +2156,9 @@ static ZEND_RESULT_CODE php_http_client_curl_wait(php_http_client_t *h, struct t
 	struct timeval timeout;
 	php_http_client_curl_t *curl = h->ctx;
 
-#if PHP_HTTP_HAVE_EVENT
-	if (curl->useevents) {
-		if (!event_initialized(curl->timeout)) {
-			event_assign(curl->timeout, curl->evbase, CURL_SOCKET_TIMEOUT, 0, php_http_curlm_timeout_callback, h);
-		} else if (custom_timeout && timerisset(custom_timeout)) {
-			event_add(curl->timeout, custom_timeout);
-		} else if (!event_pending(curl->timeout, EV_TIMEOUT, NULL)) {
-			php_http_client_curl_get_timeout(curl, 1000, &timeout);
-			event_add(curl->timeout, &timeout);
-		}
-
-		event_base_loop(curl->evbase, EVLOOP_ONCE);
-
-		return SUCCESS;
+	if (curl->ev_ops) {
+		return curl->ev_ops->wait(curl->ev_ctx, custom_timeout);
 	}
-#endif
 
 	FD_ZERO(&R);
 	FD_ZERO(&W);
@@ -2353,14 +2185,13 @@ static int php_http_client_curl_once(php_http_client_t *h)
 {
 	php_http_client_curl_t *curl = h->ctx;
 
-#if PHP_HTTP_HAVE_EVENT
-	if (curl->useevents) {
-		event_base_loop(curl->evbase, EVLOOP_NONBLOCK);
-	} else
-#endif
-	while (CURLM_CALL_MULTI_PERFORM == curl_multi_perform(curl->handle->multi, &curl->unfinished));
+	if (curl->ev_ops) {
+		curl->ev_ops->once(curl->ev_ctx);
+	} else {
+		while (CURLM_CALL_MULTI_PERFORM == curl_multi_perform(curl->handle->multi, &curl->unfinished));
+	}
 
-	php_http_curlm_responsehandler(h);
+	php_http_client_curl_responsehandler(h);
 
 	return curl->unfinished;
 
@@ -2368,39 +2199,22 @@ static int php_http_client_curl_once(php_http_client_t *h)
 
 static ZEND_RESULT_CODE php_http_client_curl_exec(php_http_client_t *h)
 {
-#if PHP_HTTP_HAVE_EVENT
 	php_http_client_curl_t *curl = h->ctx;
-#endif
 	TSRMLS_FETCH_FROM_CTX(h->ts);
 
-#if PHP_HTTP_HAVE_EVENT
-	if (curl->useevents) {
-		php_http_curlm_timeout_callback(CURL_SOCKET_TIMEOUT, /*EV_READ|EV_WRITE*/0, h);
-		do {
-			int ev_rc = event_base_dispatch(curl->evbase);
-
-#if DBG_EVENTS
-			fprintf(stderr, "%c", "X.0"[ev_rc+1]);
-#endif
+	if (curl->ev_ops) {
+		return curl->ev_ops->exec(curl->ev_ctx);
+	}
 
-			if (ev_rc < 0) {
-				php_error_docref(NULL TSRMLS_CC, E_ERROR, "Error in event_base_dispatch()");
-				return FAILURE;
-			}
-		} while (curl->unfinished && !EG(exception));
-	} else
-#endif
-	{
-		while (php_http_client_curl_once(h) && !EG(exception)) {
-			if (SUCCESS != php_http_client_curl_wait(h, NULL)) {
+	while (php_http_client_curl_once(h) && !EG(exception)) {
+		if (SUCCESS != php_http_client_curl_wait(h, NULL)) {
 #ifdef PHP_WIN32
-				/* see http://msdn.microsoft.com/library/en-us/winsock/winsock/windows_sockets_error_codes_2.asp */
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "WinSock error: %d", WSAGetLastError());
+			/* see http://msdn.microsoft.com/library/en-us/winsock/winsock/windows_sockets_error_codes_2.asp */
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "WinSock error: %d", WSAGetLastError());
 #else
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", strerror(errno));
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", strerror(errno));
 #endif
-				return FAILURE;
-			}
+			return FAILURE;
 		}
 	}
 
@@ -2526,6 +2340,7 @@ php_http_client_ops_t *php_http_client_curl_get_ops(void)
 	return &php_http_client_curl_ops;
 }
 
+
 PHP_MINIT_FUNCTION(http_client_curl)
 {
 	curl_version_info_data *info;