X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_curl.c;h=65b1746b8f7b38ac7a71f71c584d49fe108c3b44;hp=0c30f87e158f335d6de4698de8aabd32f320f1fe;hb=517336efe27e1f8e58e36352478a6d9ffdcdf378;hpb=8d05291f42b3b42159b3fe91492aa4862f3d4405 diff --git a/php_http_curl.c b/php_http_curl.c index 0c30f87..65b1746 100644 --- a/php_http_curl.c +++ b/php_http_curl.c @@ -10,13 +10,10 @@ +--------------------------------------------------------------------+ */ -#include "php_http.h" +#include "php_http_api.h" #if PHP_HTTP_HAVE_CURL -#include "php_http_request.h" -#include "php_http_request_pool.h" - #include #define PHP_HTTP_CURL_VERSION(x, y, z) (LIBCURL_VERSION_NUM >= (((x)<<16) + ((y)<<8) + (z))) @@ -24,10 +21,6 @@ # include #endif -#include -#include - - typedef struct php_http_curl_request { CURL *handle; @@ -68,19 +61,8 @@ typedef struct php_http_curl_request_pool { #endif } php_http_curl_request_pool_t; -#ifdef ZTS -typedef struct php_http_curl_request_datashare_lock { - CURL *ch; - MUTEX_T mx; -} php_http_curl_request_datashare_lock_t; -#endif - typedef struct php_http_curl_request_datashare { CURLSH *handle; - -#ifdef ZTS - php_http_curl_request_datashare_lock_t *locks; -#endif } php_http_curl_request_datashare_t; #define PHP_HTTP_CURL_OPT_STRING(OPTION, ldiff, obdc) \ @@ -145,6 +127,7 @@ static void *php_http_curl_copy(void *opaque, void *handle TSRMLS_DC) void *ch; if ((ch = curl_easy_duphandle(handle))) { + curl_easy_reset(ch); get_storage(ch); return ch; } @@ -498,7 +481,7 @@ static int php_http_curl_request_pool_socket_callback(CURL *easy, curl_socket_t ev = ecalloc(1, sizeof(php_http_request_pool_event_t)); ev->pool = pool; curl_multi_assign(curl->handle, sock, ev); - event_base_set(PHP_HTTP_G->request_pool.event_base, &ev->evnt); + event_base_set(PHP_HTTP_G->curl.event_base, &ev->evnt); } else { event_del(&ev->evnt); } @@ -516,6 +499,7 @@ static int php_http_curl_request_pool_socket_callback(CURL *easy, curl_socket_t case CURL_POLL_REMOVE: efree(ev); + /* no break */ case CURL_POLL_NONE: return 0; @@ -549,7 +533,7 @@ static void php_http_curl_request_pool_timer_callback(CURLM *multi, long timeout if (!event_initialized(curl->timeout)) { event_set(curl->timeout, -1, 0, php_http_curl_request_pool_timeout_callback, pool); - event_base_set(PHP_HTTP_G->request_pool.event_base, curl->timeout); + event_base_set(PHP_HTTP_G->curl.event_base, curl->timeout); } else if (event_pending(curl->timeout, EV_TIMEOUT, NULL)) { event_del(curl->timeout); } @@ -1154,53 +1138,6 @@ static STATUS get_info(CURL *ch, HashTable *info) } -#ifdef ZTS -static void *php_http_curl_request_datashare_locks_init(void) -{ - int i; - php_http_curl_request_datashare_lock_t *locks = pecalloc(CURL_LOCK_DATA_LAST, sizeof(*locks), 1); - - if (locks) { - for (i = 0; i < CURL_LOCK_DATA_LAST; ++i) { - locks[i].mx = tsrm_mutex_alloc(); - } - } - - return locks; -} - -static void php_http_curl_request_datashare_locks_dtor(void *l) -{ - int i; - php_http_curl_request_datashare_lock_t *locks = l; - - for (i = 0; i < CURL_LOCK_DATA_LAST; ++i) { - tsrm_mutex_free(locks[i].mx); - } - pefree(locks, 1); -} - -static void php_http_curl_request_datashare_lock_func(CURL *handle, curl_lock_data data, curl_lock_access locktype, void *userptr) -{ - php_http_curl_request_datashare_lock_t *locks = userptr; - - /* TSRM can't distinguish shared/exclusive locks */ - tsrm_mutex_lock(locks[data].mx); - locks[data].ch = handle; -} - -static void php_http_curl_request_datashare_unlock_func(CURL *handle, curl_lock_data data, void *userptr) -{ - php_http_curl_request_datashare_lock_t *locks = userptr; - - if (locks[data].ch == handle) { - tsrm_mutex_unlock(locks[data].mx); - } -} -#endif - - - /* request datashare handler ops */ static php_http_request_datashare_t *php_http_curl_request_datashare_init(php_http_request_datashare_t *h, void *handle) @@ -1213,18 +1150,8 @@ static php_http_request_datashare_t *php_http_curl_request_datashare_init(php_ht return NULL; } - curl = pecalloc(1, sizeof(*curl), h->persistent); + curl = ecalloc(1, sizeof(*curl)); curl->handle = handle; -#ifdef ZTS - if (h->persistent) { - curl->locks = php_http_curl_request_datashare_locks_init(); - if (curl->locks) { - curl_share_setopt(curl->handle, CURLSHOPT_LOCKFUNC, php_http_curl_request_datashare_lock_func); - curl_share_setopt(curl->handle, CURLSHOPT_UNLOCKFUNC, php_http_curl_request_datashare_unlock_func); - curl_share_setopt(curl->handle, CURLSHOPT_USERDATA, curl->locks); - } - } -#endif h->ctx = curl; return h; @@ -1237,13 +1164,7 @@ static void php_http_curl_request_datashare_dtor(php_http_request_datashare_t *h php_http_resource_factory_handle_dtor(h->rf, curl->handle TSRMLS_CC); -#ifdef ZTS - if (h->persistent) { - php_http_curl_request_datashare_locks_dtor(curl->locks); - } -#endif - - pefree(curl, h->persistent); + efree(curl); h->ctx = NULL; } @@ -1291,7 +1212,7 @@ static STATUS php_http_curl_request_datashare_setopt(php_http_request_datashare_ break; case PHP_HTTP_REQUEST_DATASHARE_OPT_RESOLVER: - if (CURLSHE_OK != (rc = curl_share_setopt(curl->handle, *((zend_bool *) arg) ? CURLSHOPT_SHARE : CURLSHOPT_UNSHARE, CURL_LOCK_DATA_COOKIE))) { + if (CURLSHE_OK != (rc = curl_share_setopt(curl->handle, *((zend_bool *) arg) ? CURLSHOPT_SHARE : CURLSHOPT_UNSHARE, CURL_LOCK_DATA_DNS))) { TSRMLS_FETCH_FROM_CTX(h->ts); php_http_error(HE_WARNING, PHP_HTTP_E_REQUEST_DATASHARE, "Could not %s sharing of resolver data: %s", *((zend_bool *) arg) ? "enable" : "disable", curl_share_strerror(rc)); @@ -1492,7 +1413,7 @@ static STATUS php_http_curl_request_pool_exec(php_http_request_pool_t *h) #if DBG_EVENTS fprintf(stderr, "X"); #endif - event_base_dispatch(PHP_HTTP_G->request_pool.event_base); + event_base_dispatch(PHP_HTTP_G->curl.event_base); } while (curl->unfinished); } else #endif