add recent curl options
[m6w6/ext-http] / php_http_client_curl.c
index e878e1ea4ca5029bd41bf43bfb67e148480f80df..5443e666b4a592dd437f1499bea78a85ffbfcb85 100644 (file)
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2014, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
 #include "php_http_api.h"
+#include "php_http_client.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
 
-#define PHP_HTTP_CURL_OPT_STRING(OPTION, ldiff, obdc) \
-       { \
-               char *K = #OPTION; \
-               PHP_HTTP_CURL_OPT_STRING_EX(K+lenof("CURLOPT_KEY")+ldiff, OPTION, obdc); \
-       }
-#define PHP_HTTP_CURL_OPT_STRING_EX(keyname, optname, obdc) \
-       if (!strcasecmp(key.str, keyname)) { \
-               zval *copy = cache_option(&curl->options.cache, keyname, strlen(keyname)+1, 0, php_http_ztyp(IS_STRING, *param)); \
-               if (obdc) { \
-                       if (SUCCESS != php_check_open_basedir(Z_STRVAL_P(copy) TSRMLS_CC)) { \
-                               return FAILURE; \
-                       } \
-               } \
-               curl_easy_setopt(ch, optname, Z_STRVAL_P(copy)); \
-               zval_ptr_dtor(&copy); \
-               continue; \
-       }
-#define PHP_HTTP_CURL_OPT_LONG(OPTION, ldiff) \
-       { \
-               char *K = #OPTION; \
-               PHP_HTTP_CURL_OPT_LONG_EX(K+lenof("CURLOPT_KEY")+ldiff, OPTION); \
-       }
-#define PHP_HTTP_CURL_OPT_LONG_EX(keyname, optname) \
-       if (!strcasecmp(key.str, keyname)) { \
-               zval *copy = php_http_ztyp(IS_LONG, *param); \
-               curl_easy_setopt(ch, optname, Z_LVAL_P(copy)); \
-               zval_ptr_dtor(&copy); \
-               continue; \
-       }
+#ifdef PHP_HTTP_HAVE_OPENSSL
+#      include <openssl/ssl.h>
+#endif
+#ifdef PHP_HTTP_HAVE_GNUTLS
+#      include <gnutls.h>
+#endif
+
+typedef struct php_http_client_curl {
+       CURLM *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;
+       php_http_client_t *client;
+       php_http_client_progress_state_t progress;
+       php_http_client_enqueue_t queue;
+
+       struct {
+               php_http_buffer_t headers;
+               php_http_message_body_t *body;
+       } response;
+
+       struct {
+               HashTable cache;
 
+               struct curl_slist *proxyheaders;
+               struct curl_slist *headers;
+               struct curl_slist *resolve;
+               php_http_buffer_t cookies;
+               php_http_buffer_t ranges;
 
-/* resource_factory ops */
+               long redirects;
+               unsigned range_request:1;
+               unsigned encode_cookies:1;
 
-static void *php_http_curl_ctor(void *opaque TSRMLS_DC)
+               struct {
+                       uint count;
+                       double delay;
+               } retry;
+
+       } options;
+
+} php_http_client_curl_handler_t;
+
+typedef struct php_http_curle_storage {
+       char *url;
+       char *cookiestore;
+       CURLcode errorcode;
+       char errorbuffer[0x100];
+} php_http_curle_storage_t;
+
+static inline php_http_curle_storage_t *php_http_curle_get_storage(CURL *ch) {
+       php_http_curle_storage_t *st = NULL;
+
+       curl_easy_getinfo(ch, CURLINFO_PRIVATE, &st);
+
+       if (!st) {
+               st = pecalloc(1, sizeof(*st), 1);
+               curl_easy_setopt(ch, CURLOPT_PRIVATE, st);
+               curl_easy_setopt(ch, CURLOPT_ERRORBUFFER, st->errorbuffer);
+       }
+
+       return st;
+}
+
+static void *php_http_curle_ctor(void *opaque, void *init_arg TSRMLS_DC)
 {
        void *ch;
 
        if ((ch = curl_easy_init())) {
-               get_storage(ch);
+               php_http_curle_get_storage(ch);
                return ch;
        }
        return NULL;
 }
 
-static void *php_http_curl_copy(void *opaque, void *handle TSRMLS_DC)
+static void *php_http_curle_copy(void *opaque, void *handle TSRMLS_DC)
 {
        void *ch;
 
        if ((ch = curl_easy_duphandle(handle))) {
                curl_easy_reset(ch);
-               get_storage(ch);
+               php_http_curle_get_storage(ch);
                return ch;
        }
        return NULL;
 }
 
-static void php_http_curl_dtor(void *opaque, void *handle TSRMLS_DC)
+static void php_http_curle_dtor(void *opaque, void *handle TSRMLS_DC)
 {
-       php_http_client_curl_storage_t *st = get_storage(handle);
+       php_http_curle_storage_t *st = php_http_curle_get_storage(handle);
 
        curl_easy_cleanup(handle);
 
@@ -85,107 +150,143 @@ static void php_http_curl_dtor(void *opaque, void *handle TSRMLS_DC)
        }
 }
 
-/* callbacks */
+static php_resource_factory_ops_t php_http_curle_resource_factory_ops = {
+       php_http_curle_ctor,
+       php_http_curle_copy,
+       php_http_curle_dtor
+};
+
+static void *php_http_curlm_ctor(void *opaque, void *init_arg TSRMLS_DC)
+{
+       return curl_multi_init();
+}
+
+static void php_http_curlm_dtor(void *opaque, void *handle TSRMLS_DC)
+{
+       curl_multi_cleanup(handle);
+}
+
+static php_resource_factory_ops_t php_http_curlm_resource_factory_ops = {
+       php_http_curlm_ctor,
+       NULL,
+       php_http_curlm_dtor
+};
+
+/* curl callbacks */
 
-static size_t php_http_client_curl_read_callback(void *data, size_t len, size_t n, void *ctx)
+static size_t php_http_curle_read_callback(void *data, size_t len, size_t n, void *ctx)
 {
        php_http_message_body_t *body = ctx;
 
-       if (body) {
-               TSRMLS_FETCH_FROM_CTX(body->ts);
-               return php_stream_read(php_http_message_body_stream(body), data, len * n);
+       if (body && body->stream_id) {
+               php_stream *s = php_http_message_body_stream(body);
+
+               if (s) {
+                       TSRMLS_FETCH_FROM_CTX(body->ts);
+                       return php_stream_read(s, data, len * n);
+               } else abort();
        }
        return 0;
 }
 
-static int php_http_client_curl_progress_callback(void *ctx, double dltotal, double dlnow, double ultotal, double ulnow)
+#if PHP_HTTP_CURL_VERSION(7,32,0)
+static int php_http_curle_xferinfo_callback(void *ctx, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow)
+#else
+static int php_http_curle_progress_callback(void *ctx, double dltotal, double dlnow, double ultotal, double ulnow)
+#endif
 {
-       php_http_client_t *h = ctx;
-       php_http_client_curl_t *curl = h->ctx;
-       TSRMLS_FETCH_FROM_CTX(h->ts);
+       php_http_client_curl_handler_t *h = ctx;
+       zend_bool update = 0;
+
+       if (h->progress.dl.total != dltotal
+       ||      h->progress.dl.now != dlnow
+       ||      h->progress.ul.total != ultotal
+       ||      h->progress.ul.now != ulnow
+       ) {
+               update = 1;
 
-       curl->progress.state.dl.total = dltotal;
-       curl->progress.state.dl.now = dlnow;
-       curl->progress.state.ul.total = ultotal;
-       curl->progress.state.ul.now = ulnow;
+               h->progress.dl.total = dltotal;
+               h->progress.dl.now = dlnow;
+               h->progress.ul.total = ultotal;
+               h->progress.ul.now = ulnow;
+       }
 
-       php_http_client_progress_notify(&curl->progress TSRMLS_CC);
+       if (update && h->client->callback.progress.func) {
+               h->client->callback.progress.func(h->client->callback.progress.arg, h->client, &h->queue, &h->progress);
+       }
 
        return 0;
 }
 
-static curlioerr php_http_client_curl_ioctl_callback(CURL *ch, curliocmd cmd, void *ctx)
+static int php_http_curle_seek_callback(void *userdata, curl_off_t offset, int origin)
 {
-       php_http_message_body_t *body = ctx;
+       php_http_message_body_t *body = userdata;
+       TSRMLS_FETCH_FROM_CTX(body->ts);
 
-       if (cmd != CURLIOCMD_RESTARTREAD) {
-               return CURLIOE_UNKNOWNCMD;
+       if (!body) {
+               return 1;
        }
-
-       if (body) {
-               TSRMLS_FETCH_FROM_CTX(body->ts);
-
-               if (SUCCESS == php_stream_rewind(php_http_message_body_stream(body))) {
-                       return CURLIOE_OK;
-               }
+       if (0 == php_stream_seek(php_http_message_body_stream(body), offset, origin)) {
+               return 0;
        }
-
-       return CURLIOE_FAILRESTART;
+       return 2;
 }
 
-static int php_http_client_curl_raw_callback(CURL *ch, curl_infotype type, char *data, size_t length, void *ctx)
+static int php_http_curle_raw_callback(CURL *ch, curl_infotype type, char *data, size_t length, void *ctx)
 {
-       php_http_client_t *h = ctx;
-       php_http_client_curl_t *curl = h->ctx;
-       unsigned flags = 0;
-       TSRMLS_FETCH_FROM_CTX(h->ts);
+       php_http_client_curl_handler_t *h = ctx;
 
        /* catch progress */
        switch (type) {
                case CURLINFO_TEXT:
-                       if (php_memnstr(data, ZEND_STRL("About to connect"), data + length)) {
-                               curl->progress.state.info = "resolve";
+                       if (data[0] == '-') {
+                       } else if (php_memnstr(data, ZEND_STRL("Adding handle:"), data + length)) {
+                               h->progress.info = "setup";
+                       } else if (php_memnstr(data, ZEND_STRL("addHandle"), data + length)) {
+                               h->progress.info = "setup";
+                       } else if (php_memnstr(data, ZEND_STRL("About to connect"), data + length)) {
+                               h->progress.info = "resolve";
                        } else if (php_memnstr(data, ZEND_STRL("Trying"), data + length)) {
-                               curl->progress.state.info = "connect";
+                               h->progress.info = "connect";
+                       } else if (php_memnstr(data, ZEND_STRL("Found bundle for host"), data + length)) {
+                               h->progress.info = "connect";
                        } else if (php_memnstr(data, ZEND_STRL("Connected"), data + length)) {
-                               curl->progress.state.info = "connected";
+                               h->progress.info = "connected";
+                       } else if (php_memnstr(data, ZEND_STRL("Re-using existing connection!"), data + length)) {
+                               h->progress.info = "connected";
+                       } else if (php_memnstr(data, ZEND_STRL("blacklisted"), data + length)) {
+                               h->progress.info = "blacklist check";
+                       } else if (php_memnstr(data, ZEND_STRL("SSL"), data + length)) {
+                               h->progress.info = "ssl negotiation";
+                       } else if (php_memnstr(data, ZEND_STRL("upload"), data + length)) {
+                               h->progress.info = "uploaded";
                        } else if (php_memnstr(data, ZEND_STRL("left intact"), data + length)) {
-                               curl->progress.state.info = "not disconnected";
+                               h->progress.info = "not disconnected";
                        } else if (php_memnstr(data, ZEND_STRL("closed"), data + length)) {
-                               curl->progress.state.info = "disconnected";
+                               h->progress.info = "disconnected";
                        } else if (php_memnstr(data, ZEND_STRL("Issue another request"), data + length)) {
-                               curl->progress.state.info = "redirect";
+                               h->progress.info = "redirect";
+                       } else if (php_memnstr(data, ZEND_STRL("Operation timed out"), data + length)) {
+                               h->progress.info = "timeout";
+                       } else {
+#if 0
+                               h->progress.info = data;
+                               data[length - 1] = '\0';
+#endif
+                       }
+                       if (h->client->callback.progress.func) {
+                               h->client->callback.progress.func(h->client->callback.progress.arg, h->client, &h->queue, &h->progress);
                        }
-                       php_http_client_progress_notify(&curl->progress TSRMLS_CC);
                        break;
                case CURLINFO_HEADER_OUT:
                case CURLINFO_DATA_OUT:
                case CURLINFO_SSL_DATA_OUT:
-                       curl->progress.state.info = "send";
+                       h->progress.info = "send";
                        break;
                case CURLINFO_HEADER_IN:
                case CURLINFO_DATA_IN:
                case CURLINFO_SSL_DATA_IN:
-                       curl->progress.state.info = "receive";
-                       break;
-               default:
-                       break;
-       }
-       /* process data */
-       switch (type) {
-               case CURLINFO_HEADER_IN:
-               case CURLINFO_DATA_IN:
-               case CURLINFO_HEADER_OUT:
-               case CURLINFO_DATA_OUT:
-                       php_http_buffer_append(h->buffer, data, length);
-
-                       if (curl->options.redirects) {
-                               flags |= PHP_HTTP_MESSAGE_PARSER_EMPTY_REDIRECTS;
-                       }
-
-                       if (PHP_HTTP_MESSAGE_PARSER_STATE_FAILURE == php_http_message_parser_parse(h->parser, h->buffer, flags, &h->message)) {
-                               return -1;
-                       }
+                       h->progress.info = "receive";
                        break;
                default:
                        break;
@@ -199,432 +300,21 @@ static int php_http_client_curl_raw_callback(CURL *ch, curl_infotype type, char
        return 0;
 }
 
-static int php_http_client_curl_dummy_callback(char *data, size_t n, size_t l, void *s)
-{
-       return n*l;
-}
-
-static inline zval *cache_option(HashTable *cache, char *key, size_t keylen, ulong h, zval *opt)
+static int php_http_curle_header_callback(char *data, size_t n, size_t l, void *arg)
 {
-       Z_ADDREF_P(opt);
-
-       if (h) {
-               zend_hash_quick_update(cache, key, keylen, h, &opt, sizeof(zval *), NULL);
-       } else {
-               zend_hash_update(cache, key, keylen, &opt, sizeof(zval *), NULL);
-       }
-
-       return opt;
-}
-
-static inline zval *get_option(HashTable *cache, HashTable *options, char *key, size_t keylen, int type)
-{
-       if (options) {
-               zval **zoption;
-               ulong h = zend_hash_func(key, keylen);
-
-               if (SUCCESS == zend_hash_quick_find(options, key, keylen, h, (void *) &zoption)) {
-                       zval *option = php_http_ztyp(type, *zoption);
+       php_http_client_curl_handler_t *h = arg;
 
-                       if (cache) {
-                               zval *cached = cache_option(cache, key, keylen, h, option);
-
-                               zval_ptr_dtor(&option);
-                               return cached;
-                       }
-                       return option;
-               }
-       }
-
-       return NULL;
+       return php_http_buffer_append(&h->response.headers, data, n * l);
 }
 
-static STATUS set_options(php_http_client_t *h, HashTable *options)
+static int php_http_curle_body_callback(char *data, size_t n, size_t l, void *arg)
 {
-       zval *zoption;
-       int range_req = 0;
-       php_http_client_curl_t *curl = h->ctx;
-       CURL *ch = curl->handle;
-       TSRMLS_FETCH_FROM_CTX(h->ts);
-
-       /* proxy */
-       if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("proxyhost"), IS_STRING))) {
-               curl_easy_setopt(ch, CURLOPT_PROXY, Z_STRVAL_P(zoption));
-               /* type */
-               if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("proxytype"), IS_LONG))) {
-                       curl_easy_setopt(ch, CURLOPT_PROXYTYPE, Z_LVAL_P(zoption));
-               }
-               /* port */
-               if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("proxyport"), IS_LONG))) {
-                       curl_easy_setopt(ch, CURLOPT_PROXYPORT, Z_LVAL_P(zoption));
-               }
-               /* user:pass */
-               if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("proxyauth"), IS_STRING)) && Z_STRLEN_P(zoption)) {
-                       curl_easy_setopt(ch, CURLOPT_PROXYUSERPWD, Z_STRVAL_P(zoption));
-               }
-               /* auth method */
-               if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("proxyauthtype"), IS_LONG))) {
-                       curl_easy_setopt(ch, CURLOPT_PROXYAUTH, Z_LVAL_P(zoption));
-               }
-               /* tunnel */
-               if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("proxytunnel"), IS_BOOL)) && Z_BVAL_P(zoption)) {
-                       curl_easy_setopt(ch, CURLOPT_HTTPPROXYTUNNEL, 1L);
-               }
-       }
-#if PHP_HTTP_CURL_VERSION(7,19,4)
-       if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("noproxy"), IS_STRING))) {
-               curl_easy_setopt(ch, CURLOPT_NOPROXY, Z_STRVAL_P(zoption));
-       }
-#endif
-
-       /* dns */
-       if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("dns_cache_timeout"), IS_LONG))) {
-               curl_easy_setopt(ch, CURLOPT_DNS_CACHE_TIMEOUT, Z_LVAL_P(zoption));
-       }
-       if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("ipresolve"), IS_LONG)) && Z_LVAL_P(zoption)) {
-               curl_easy_setopt(ch, CURLOPT_IPRESOLVE, Z_LVAL_P(zoption));
-       }
-#if PHP_HTTP_CURL_VERSION(7,21,3)
-       if (curl->options.resolve) {
-               curl_slist_free_all(curl->options.resolve);
-               curl->options.resolve = NULL;
-       }
-       if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("resolve"), IS_ARRAY))) {
-               php_http_array_hashkey_t key = php_http_array_hashkey_init(0);
-               HashPosition pos;
-               zval **data;
-
-               FOREACH_KEYVAL(pos, zoption, key, data) {
-                       zval *cpy = php_http_ztyp(IS_STRING, *data);
-
-                       curl->options.resolve = curl_slist_append(curl->options.resolve, Z_STRVAL_P(cpy));
-
-                       zval_ptr_dtor(&cpy);
-               }
-       }
-#endif
-#if PHP_HTTP_CURL_VERSION(7,24,0)
-       if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("dns_servers"), IS_STRING)) && Z_STRLEN_P(zoption)) {
-               curl_easy_setopt(ch, CURLOPT_DNS_SERVERS, Z_STRVAL_P(zoption));
-       }
-#endif
-
-       /* limits */
-       if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("low_speed_limit"), IS_LONG))) {
-               curl_easy_setopt(ch, CURLOPT_LOW_SPEED_LIMIT, Z_LVAL_P(zoption));
-       }
-       if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("low_speed_time"), IS_LONG))) {
-               curl_easy_setopt(ch, CURLOPT_LOW_SPEED_TIME, Z_LVAL_P(zoption));
-       }
-       /* LSF weirdance
-       if ((zoption = get_option(&curl->cache.options, options, ZEND_STRS("max_send_speed"), IS_LONG))) {
-               curl_easy_setopt(ch, CURLOPT_MAX_SEND_SPEED_LARGE, (curl_off_t) Z_LVAL_P(zoption));
-       }
-       if ((zoption = get_option(&curl->cache.options, options, ZEND_STRS("max_recv_speed"), IS_LONG))) {
-               curl_easy_setopt(ch, CURLOPT_MAX_RECV_SPEED_LARGE, (curl_off_t) Z_LVAL_P(zoption));
-       }
-       */
-       /* crashes
-       if ((zoption = get_option(&curl->cache.options, options, ZEND_STRS("maxconnects"), IS_LONG))) {
-               curl_easy_setopt(ch, CURLOPT_MAXCONNECTS, Z_LVAL_P(zoption));
-       } */
-       if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("fresh_connect"), IS_BOOL)) && Z_BVAL_P(zoption)) {
-               curl_easy_setopt(ch, CURLOPT_FRESH_CONNECT, 1L);
-       }
-       if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("forbid_reuse"), IS_BOOL)) && Z_BVAL_P(zoption)) {
-               curl_easy_setopt(ch, CURLOPT_FORBID_REUSE, 1L);
-       }
-
-       /* outgoing interface */
-       if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("interface"), IS_STRING))) {
-               curl_easy_setopt(ch, CURLOPT_INTERFACE, Z_STRVAL_P(zoption));
-
-               if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("portrange"), IS_ARRAY))) {
-                       zval **prs, **pre;
-
-                       zend_hash_internal_pointer_reset(Z_ARRVAL_P(zoption));
-                       if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void *) &prs)) {
-                               zend_hash_move_forward(Z_ARRVAL_P(zoption));
-                               if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void *) &pre)) {
-                                       zval *prs_cpy = php_http_ztyp(IS_LONG, *prs);
-                                       zval *pre_cpy = php_http_ztyp(IS_LONG, *pre);
-
-                                       if (Z_LVAL_P(prs_cpy) && Z_LVAL_P(pre_cpy)) {
-                                               curl_easy_setopt(ch, CURLOPT_LOCALPORT, MIN(Z_LVAL_P(prs_cpy), Z_LVAL_P(pre_cpy)));
-                                               curl_easy_setopt(ch, CURLOPT_LOCALPORTRANGE, labs(Z_LVAL_P(prs_cpy)-Z_LVAL_P(pre_cpy))+1L);
-                                       }
-                                       zval_ptr_dtor(&prs_cpy);
-                                       zval_ptr_dtor(&pre_cpy);
-                               }
-                       }
-               }
-       }
-
-       /* another port */
-       if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("port"), IS_LONG))) {
-               curl_easy_setopt(ch, CURLOPT_PORT, Z_LVAL_P(zoption));
-       }
-
-       /* RFC4007 zone_id */
-#if PHP_HTTP_CURL_VERSION(7,19,0)
-       if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("address_scope"), IS_LONG))) {
-               curl_easy_setopt(ch, CURLOPT_ADDRESS_SCOPE, Z_LVAL_P(zoption));
-       }
-#endif
-
-       /* auth */
-       if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("httpauth"), IS_STRING)) && Z_STRLEN_P(zoption)) {
-               curl_easy_setopt(ch, CURLOPT_USERPWD, Z_STRVAL_P(zoption));
-       }
-       if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("httpauthtype"), IS_LONG))) {
-               curl_easy_setopt(ch, CURLOPT_HTTPAUTH, Z_LVAL_P(zoption));
-       }
-
-       /* redirects, defaults to 0 */
-       if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("redirect"), IS_LONG))) {
-               curl_easy_setopt(ch, CURLOPT_FOLLOWLOCATION, Z_LVAL_P(zoption) ? 1L : 0L);
-               curl_easy_setopt(ch, CURLOPT_MAXREDIRS, curl->options.redirects = Z_LVAL_P(zoption));
-               if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("unrestrictedauth"), IS_BOOL))) {
-                       curl_easy_setopt(ch, CURLOPT_UNRESTRICTED_AUTH, Z_LVAL_P(zoption));
-               }
-               if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("postredir"), IS_BOOL))) {
-#if PHP_HTTP_CURL_VERSION(7,19,1)
-                       curl_easy_setopt(ch, CURLOPT_POSTREDIR, Z_BVAL_P(zoption) ? 1L : 0L);
-#else
-                       curl_easy_setopt(ch, CURLOPT_POST301, Z_BVAL_P(zoption) ? 1L : 0L);
-#endif
-               }
-       } else {
-               curl->options.redirects = 0;
-       }
-
-       /* retries, defaults to 0 */
-       if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("retrycount"), IS_LONG))) {
-               curl->options.retry.count = Z_LVAL_P(zoption);
-               if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("retrydelay"), IS_DOUBLE))) {
-                       curl->options.retry.delay = Z_DVAL_P(zoption);
-               } else {
-                       curl->options.retry.delay = 0;
-               }
-       } else {
-               curl->options.retry.count = 0;
-       }
-
-       /* referer */
-       if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("referer"), IS_STRING)) && Z_STRLEN_P(zoption)) {
-               curl_easy_setopt(ch, CURLOPT_REFERER, Z_STRVAL_P(zoption));
-       }
-
-       /* useragent, default "PECL::HTTP/version (PHP/version)" */
-       if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("useragent"), IS_STRING))) {
-               /* allow to send no user agent, not even default one */
-               if (Z_STRLEN_P(zoption)) {
-                       curl_easy_setopt(ch, CURLOPT_USERAGENT, Z_STRVAL_P(zoption));
-               } else {
-                       curl_easy_setopt(ch, CURLOPT_USERAGENT, NULL);
-               }
-       }
-
-       /* resume */
-       if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("resume"), IS_LONG)) && (Z_LVAL_P(zoption) > 0)) {
-               range_req = 1;
-               curl_easy_setopt(ch, CURLOPT_RESUME_FROM, Z_LVAL_P(zoption));
-       }
-       /* or range of kind array(array(0,499), array(100,1499)) */
-       else if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("range"), IS_ARRAY)) && zend_hash_num_elements(Z_ARRVAL_P(zoption))) {
-               HashPosition pos1, pos2;
-               zval **rr, **rb, **re;
-               php_http_buffer_t rs;
-
-               php_http_buffer_init(&rs);
-               FOREACH_VAL(pos1, zoption, rr) {
-                       if (Z_TYPE_PP(rr) == IS_ARRAY) {
-                               zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(rr), &pos2);
-                               if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_PP(rr), (void *) &rb, &pos2)) {
-                                       zend_hash_move_forward_ex(Z_ARRVAL_PP(rr), &pos2);
-                                       if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_PP(rr), (void *) &re, &pos2)) {
-                                               if (    ((Z_TYPE_PP(rb) == IS_LONG) || ((Z_TYPE_PP(rb) == IS_STRING) && is_numeric_string(Z_STRVAL_PP(rb), Z_STRLEN_PP(rb), NULL, NULL, 1))) &&
-                                                               ((Z_TYPE_PP(re) == IS_LONG) || ((Z_TYPE_PP(re) == IS_STRING) && is_numeric_string(Z_STRVAL_PP(re), Z_STRLEN_PP(re), NULL, NULL, 1)))) {
-                                                       zval *rbl = php_http_ztyp(IS_LONG, *rb);
-                                                       zval *rel = php_http_ztyp(IS_LONG, *re);
-
-                                                       if ((Z_LVAL_P(rbl) >= 0) && (Z_LVAL_P(rel) >= 0)) {
-                                                               php_http_buffer_appendf(&rs, "%ld-%ld,", Z_LVAL_P(rbl), Z_LVAL_P(rel));
-                                                       }
-                                                       zval_ptr_dtor(&rbl);
-                                                       zval_ptr_dtor(&rel);
-                                               }
-                                       }
-                               }
-                       }
-               }
-
-               if (PHP_HTTP_BUFFER_LEN(&rs)) {
-                       zval *cached_range;
-
-                       range_req = 1;
-                       /* ditch last comma */
-                       PHP_HTTP_BUFFER_VAL(&rs)[PHP_HTTP_BUFFER_LEN(&rs)-- -1] = '\0';
-                       /* cache string */
-                       MAKE_STD_ZVAL(cached_range);
-                       ZVAL_STRINGL(cached_range, PHP_HTTP_BUFFER_VAL(&rs), PHP_HTTP_BUFFER_LEN(&rs), 0);
-                       curl_easy_setopt(ch, CURLOPT_RANGE, Z_STRVAL_P(cache_option(&curl->options.cache, ZEND_STRS("range"), 0, cached_range)));
-                       zval_ptr_dtor(&cached_range);
-               }
-       }
-
-       /* initialize headers */
-       if (curl->options.headers) {
-               curl_slist_free_all(curl->options.headers);
-               curl->options.headers = NULL;
-       }
-       /* etag */
-       if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("etag"), IS_STRING)) && Z_STRLEN_P(zoption)) {
-               zend_bool is_quoted = !((Z_STRVAL_P(zoption)[0] != '"') || (Z_STRVAL_P(zoption)[Z_STRLEN_P(zoption)-1] != '"'));
-               php_http_buffer_t header;
-
-               php_http_buffer_init(&header);
-               php_http_buffer_appendf(&header, is_quoted?"%s: %s":"%s: \"%s\"", range_req?"If-Match":"If-None-Match", Z_STRVAL_P(zoption));
-               php_http_buffer_fix(&header);
-               curl->options.headers = curl_slist_append(curl->options.headers, PHP_HTTP_BUFFER_VAL(&header));
-               php_http_buffer_dtor(&header);
-       }
-       /* compression */
-       if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("compress"), IS_BOOL)) && Z_LVAL_P(zoption)) {
-               curl->options.headers = curl_slist_append(curl->options.headers, "Accept-Encoding: gzip;q=1.0,deflate;q=0.5");
-       }
-       curl_easy_setopt(ch, CURLOPT_HTTPHEADER, curl->options.headers);
-
-       /* lastmodified */
-       if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("lastmodified"), IS_LONG))) {
-               if (Z_LVAL_P(zoption)) {
-                       if (Z_LVAL_P(zoption) > 0) {
-                               curl_easy_setopt(ch, CURLOPT_TIMEVALUE, Z_LVAL_P(zoption));
-                       } else {
-                               curl_easy_setopt(ch, CURLOPT_TIMEVALUE, (long) PHP_HTTP_G->env.request.time + Z_LVAL_P(zoption));
-                       }
-                       curl_easy_setopt(ch, CURLOPT_TIMECONDITION, (long) (range_req ? CURL_TIMECOND_IFUNMODSINCE : CURL_TIMECOND_IFMODSINCE));
-               } else {
-                       curl_easy_setopt(ch, CURLOPT_TIMECONDITION, CURL_TIMECOND_NONE);
-               }
-       }
-
-       /* cookies, array('name' => 'value') */
-       if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("cookies"), IS_ARRAY))) {
-               php_http_buffer_dtor(&curl->options.cookies);
-               if (zend_hash_num_elements(Z_ARRVAL_P(zoption))) {
-                       zval *urlenc_cookies = NULL;
-                       /* check whether cookies should not be urlencoded; default is to urlencode them */
-                       if ((!(urlenc_cookies = get_option(&curl->options.cache, options, ZEND_STRS("encodecookies"), IS_BOOL))) || Z_BVAL_P(urlenc_cookies)) {
-                               if (SUCCESS == php_http_url_encode_hash_ex(HASH_OF(zoption), &curl->options.cookies, ZEND_STRS(";"), ZEND_STRS("="), NULL, 0 TSRMLS_CC)) {
-                                       php_http_buffer_fix(&curl->options.cookies);
-                                       curl_easy_setopt(ch, CURLOPT_COOKIE, curl->options.cookies.data);
-                               }
-                       } else {
-                               HashPosition pos;
-                               php_http_array_hashkey_t cookie_key = php_http_array_hashkey_init(0);
-                               zval **cookie_val;
-
-                               FOREACH_KEYVAL(pos, zoption, cookie_key, cookie_val) {
-                                       if (cookie_key.type == HASH_KEY_IS_STRING) {
-                                               zval *val = php_http_ztyp(IS_STRING, *cookie_val);
-                                               php_http_buffer_appendf(&curl->options.cookies, "%s=%s; ", cookie_key.str, Z_STRVAL_P(val));
-                                               zval_ptr_dtor(&val);
-                                       }
-                               }
-
-                               php_http_buffer_fix(&curl->options.cookies);
-                               if (PHP_HTTP_BUFFER_LEN(&curl->options.cookies)) {
-                                       curl_easy_setopt(ch, CURLOPT_COOKIE, PHP_HTTP_BUFFER_VAL(&curl->options.cookies));
-                               }
-                       }
-               }
-       }
-
-       /* don't load session cookies from cookiestore */
-       if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("cookiesession"), IS_BOOL)) && Z_BVAL_P(zoption)) {
-               curl_easy_setopt(ch, CURLOPT_COOKIESESSION, 1L);
-       }
-
-       /* cookiestore, read initial cookies from that file and store cookies back into that file */
-       if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("cookiestore"), IS_STRING))) {
-               php_http_client_curl_storage_t *storage = get_storage(curl->handle);
+       php_http_client_curl_handler_t *h = arg;
 
-               if (Z_STRLEN_P(zoption)) {
-                       if (SUCCESS != php_check_open_basedir(Z_STRVAL_P(zoption) TSRMLS_CC)) {
-                               return FAILURE;
-                       }
-               }
-               if (storage->cookiestore) {
-                       pefree(storage->cookiestore, 1);
-               }
-               storage->cookiestore = pestrndup(Z_STRVAL_P(zoption), Z_STRLEN_P(zoption), 1);
-               curl_easy_setopt(ch, CURLOPT_COOKIEFILE, storage->cookiestore);
-               curl_easy_setopt(ch, CURLOPT_COOKIEJAR, storage->cookiestore);
-       }
-
-       /* maxfilesize */
-       if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("maxfilesize"), IS_LONG))) {
-               curl_easy_setopt(ch, CURLOPT_MAXFILESIZE, Z_LVAL_P(zoption));
-       }
-
-       /* http protocol */
-       if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("protocol"), IS_LONG))) {
-               curl_easy_setopt(ch, CURLOPT_HTTP_VERSION, Z_LVAL_P(zoption));
-       }
-
-       /* timeout, defaults to 0 */
-       if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("timeout"), IS_DOUBLE))) {
-               curl_easy_setopt(ch, CURLOPT_TIMEOUT_MS, (long)(Z_DVAL_P(zoption)*1000));
-       }
-       /* connecttimeout, defaults to 0 */
-       if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("connecttimeout"), IS_DOUBLE))) {
-               curl_easy_setopt(ch, CURLOPT_CONNECTTIMEOUT_MS, (long)(Z_DVAL_P(zoption)*1000));
-       }
-
-       /* ssl */
-       if ((zoption = get_option(&curl->options.cache, options, ZEND_STRS("ssl"), IS_ARRAY))) {
-               php_http_array_hashkey_t key = php_http_array_hashkey_init(0);
-               zval **param;
-               HashPosition pos;
-
-               FOREACH_KEYVAL(pos, zoption, key, param) {
-                       if (key.type == HASH_KEY_IS_STRING) {
-                               PHP_HTTP_CURL_OPT_STRING(CURLOPT_SSLCERT, 0, 1);
-                               PHP_HTTP_CURL_OPT_STRING(CURLOPT_SSLCERTTYPE, 0, 0);
-                               PHP_HTTP_CURL_OPT_STRING(CURLOPT_SSLCERTPASSWD, 0, 0);
-
-                               PHP_HTTP_CURL_OPT_STRING(CURLOPT_SSLKEY, 0, 0);
-                               PHP_HTTP_CURL_OPT_STRING(CURLOPT_SSLKEYTYPE, 0, 0);
-                               PHP_HTTP_CURL_OPT_STRING(CURLOPT_SSLKEYPASSWD, 0, 0);
-
-                               PHP_HTTP_CURL_OPT_STRING(CURLOPT_SSLENGINE, 0, 0);
-                               PHP_HTTP_CURL_OPT_LONG(CURLOPT_SSLVERSION, 0);
-
-                               PHP_HTTP_CURL_OPT_LONG(CURLOPT_SSL_VERIFYPEER, 1);
-                               PHP_HTTP_CURL_OPT_LONG(CURLOPT_SSL_VERIFYHOST, 1);
-                               PHP_HTTP_CURL_OPT_STRING(CURLOPT_SSL_CIPHER_LIST, 1, 0);
-
-                               PHP_HTTP_CURL_OPT_STRING(CURLOPT_CAINFO, -3, 1);
-                               PHP_HTTP_CURL_OPT_STRING(CURLOPT_CAPATH, -3, 1);
-                               PHP_HTTP_CURL_OPT_STRING(CURLOPT_RANDOM_FILE, -3, 1);
-                               PHP_HTTP_CURL_OPT_STRING(CURLOPT_EGDSOCKET, -3, 1);
-#if PHP_HTTP_CURL_VERSION(7,19,0)
-                               PHP_HTTP_CURL_OPT_STRING(CURLOPT_ISSUERCERT, -3, 1);
-       #if defined(PHP_HTTP_HAVE_OPENSSL)
-                               PHP_HTTP_CURL_OPT_STRING(CURLOPT_CRLFILE, -3, 1);
-       #endif
-#endif
-#if PHP_HTTP_CURL_VERSION(7,19,1) && defined(PHP_HTTP_HAVE_OPENSSL)
-                               PHP_HTTP_CURL_OPT_LONG(CURLOPT_CERTINFO, -3);
-#endif
-                       }
-               }
-       }
-       return SUCCESS;
+       return php_http_message_body_append(h->response.body, data, n*l);
 }
 
-static STATUS get_info(CURL *ch, HashTable *info)
+static ZEND_RESULT_CODE php_http_curle_get_info(CURL *ch, HashTable *info)
 {
        char *c;
        long l;
@@ -720,17 +410,6 @@ static STATUS get_info(CURL *ch, HashTable *info)
                add_assoc_zval_ex(&array, "ssl_engines", sizeof("ssl_engines"), subarray);
                curl_slist_free_all(s);
        }
-       if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_COOKIELIST, &s)) {
-               MAKE_STD_ZVAL(subarray);
-               array_init(subarray);
-               for (p = s; p; p = p->next) {
-                       if (p->data) {
-                               add_next_index_string(subarray, p->data, 1);
-                       }
-               }
-               add_assoc_zval_ex(&array, "cookies", sizeof("cookies"), subarray);
-               curl_slist_free_all(s);
-       }
        if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_REDIRECT_URL, &c)) {
                add_assoc_string_ex(&array, "redirect_url", sizeof("redirect_url"), c ? c : "", 1);
        }
@@ -767,7 +446,89 @@ static STATUS get_info(CURL *ch, HashTable *info)
 
        /* END::CURLINFO */
 
-#if PHP_HTTP_CURL_VERSION(7,19,1) && defined(PHP_HTTP_HAVE_OPENSSL)
+#if PHP_HTTP_CURL_VERSION(7,34,0)
+       {
+               zval *ti_array;
+               struct curl_tlssessioninfo *ti;
+
+               if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_TLS_SESSION, &ti)) {
+                       const char *backend;
+
+                       MAKE_STD_ZVAL(subarray);
+                       ZVAL_NULL(subarray);
+                       MAKE_STD_ZVAL(ti_array);
+                       array_init(ti_array);
+
+                       switch (ti->backend) {
+                       case CURLSSLBACKEND_NONE:
+                               backend = "none";
+                               break;
+                       case CURLSSLBACKEND_OPENSSL:
+                               backend = "openssl";
+#ifdef PHP_HTTP_HAVE_OPENSSL
+                               {
+                                       SSL_CTX *ctx = ti->internals;
+
+                                       array_init(subarray);
+                                       add_assoc_long_ex(subarray, ZEND_STRS("number"), SSL_CTX_sess_number(ctx));
+                                       add_assoc_long_ex(subarray, ZEND_STRS("connect"), SSL_CTX_sess_connect(ctx));
+                                       add_assoc_long_ex(subarray, ZEND_STRS("connect_good"), SSL_CTX_sess_connect_good(ctx));
+                                       add_assoc_long_ex(subarray, ZEND_STRS("connect_renegotiate"), SSL_CTX_sess_connect_renegotiate(ctx));
+                                       add_assoc_long_ex(subarray, ZEND_STRS("hits"), SSL_CTX_sess_hits(ctx));
+                                       add_assoc_long_ex(subarray, ZEND_STRS("cache_full"), SSL_CTX_sess_cache_full(ctx));
+                               }
+#endif
+                               break;
+                       case CURLSSLBACKEND_GNUTLS:
+                               backend = "gnutls";
+#ifdef PHP_HTTP_HAVE_GNUTLS
+                               {
+                                       gnutls_session_t sess = ti->internals;
+                                       char *desc;
+
+                                       array_init(subarray);
+                                       if ((desc = gnutls_session_get_desc(sess))) {
+                                               add_assoc_string_ex(subarray, ZEND_STRS("desc"), desc, 1);
+                                               gnutls_free(desc);
+                                       }
+                                       add_assoc_bool_ex(subarray, ZEND_STRS("resumed"), gnutls_session_is_resumed(sess));
+                               }
+#endif
+                               break;
+                       case CURLSSLBACKEND_NSS:
+                               backend = "nss";
+                               break;
+#if !PHP_HTTP_CURL_VERSION(7,39,0)
+                       case CURLSSLBACKEND_QSOSSL:
+                               backend = "qsossl";
+                               break;
+#endif
+                       case CURLSSLBACKEND_GSKIT:
+                               backend = "gskit";
+                               break;
+                       case CURLSSLBACKEND_POLARSSL:
+                               backend = "polarssl";
+                               break;
+                       case CURLSSLBACKEND_CYASSL:
+                               backend = "cyassl";
+                               break;
+                       case CURLSSLBACKEND_SCHANNEL:
+                               backend = "schannel";
+                               break;
+                       case CURLSSLBACKEND_DARWINSSL:
+                               backend = "darwinssl";
+                               break;
+                       default:
+                               backend = "unknown";
+                       }
+                       add_assoc_string_ex(ti_array, ZEND_STRS("backend"), estrdup(backend), 0);
+                       add_assoc_zval_ex(ti_array, ZEND_STRS("internals"), subarray);
+                       add_assoc_zval_ex(&array, "tls_session", sizeof("tls_session"), ti_array);
+               }
+       }
+#endif
+
+#if (PHP_HTTP_CURL_VERSION(7,19,1) && defined(PHP_HTTP_HAVE_OPENSSL)) || (PHP_HTTP_CURL_VERSION(7,42,0) && defined(PHP_HTTP_HAVE_GNUTLS))
        {
                int i;
                zval *ci_array;
@@ -800,585 +561,2022 @@ static STATUS get_info(CURL *ch, HashTable *info)
                }
        }
 #endif
-       add_assoc_string_ex(&array, "error", sizeof("error"), get_storage(ch)->errorbuffer, 1);
+       {
+               php_http_curle_storage_t *st = php_http_curle_get_storage(ch);
+
+               add_assoc_long_ex(&array, "curlcode", sizeof("curlcode"), st->errorcode);
+               add_assoc_string_ex(&array, "error", sizeof("error"), st->errorbuffer, 1);
+       }
 
        return SUCCESS;
 }
 
-
-/* request handler ops */
-
-static STATUS php_http_client_curl_reset(php_http_client_t *h);
-
-static php_http_client_t *php_http_client_curl_init(php_http_client_t *h, void *handle)
+static int compare_queue(php_http_client_enqueue_t *e, void *handle)
 {
-       php_http_client_curl_t *ctx;
-       TSRMLS_FETCH_FROM_CTX(h->ts);
+       return handle == ((php_http_client_curl_handler_t *) e->opaque)->handle;
+}
 
-       if (!handle && !(handle = php_http_resource_factory_handle_ctor(h->rf TSRMLS_CC))) {
-               php_http_error(HE_WARNING, PHP_HTTP_E_CLIENT, "could not initialize curl handle");
-               return NULL;
+static php_http_message_t *php_http_curlm_responseparser(php_http_client_curl_handler_t *h TSRMLS_DC)
+{
+       php_http_message_t *response;
+       php_http_header_parser_t parser;
+       zval *zh;
+
+       response = php_http_message_init(NULL, 0, h->response.body TSRMLS_CC);
+       php_http_header_parser_init(&parser TSRMLS_CC);
+       while (h->response.headers.used) {
+               php_http_header_parser_state_t st = php_http_header_parser_parse(&parser,
+                               &h->response.headers, PHP_HTTP_HEADER_PARSER_CLEANUP, &response->hdrs,
+                               (php_http_info_callback_t) php_http_message_info_callback, (void *) &response);
+               if (PHP_HTTP_HEADER_PARSER_STATE_FAILURE == st) {
+                       break;
+               }
        }
+       php_http_header_parser_dtor(&parser);
 
-       ctx = ecalloc(1, sizeof(*ctx));
-       ctx->handle = handle;
-       php_http_buffer_init(&ctx->options.cookies);
-       zend_hash_init(&ctx->options.cache, 0, NULL, ZVAL_PTR_DTOR, 0);
-       h->ctx = ctx;
+       /* move body to right message */
+       if (response->body != h->response.body) {
+               php_http_message_t *ptr = response;
 
-#if defined(ZTS)
-       curl_easy_setopt(handle, CURLOPT_NOSIGNAL, 1L);
-#endif
-       curl_easy_setopt(handle, CURLOPT_HEADER, 0L);
-       curl_easy_setopt(handle, CURLOPT_FILETIME, 1L);
-       curl_easy_setopt(handle, CURLOPT_AUTOREFERER, 1L);
-       curl_easy_setopt(handle, CURLOPT_VERBOSE, 1L);
-       curl_easy_setopt(handle, CURLOPT_NOPROGRESS, 0L);
-       curl_easy_setopt(handle, CURLOPT_HEADERFUNCTION, NULL);
-       curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, php_http_client_curl_dummy_callback);
-       curl_easy_setopt(handle, CURLOPT_DEBUGFUNCTION, php_http_client_curl_raw_callback);
-       curl_easy_setopt(handle, CURLOPT_READFUNCTION, php_http_client_curl_read_callback);
-       curl_easy_setopt(handle, CURLOPT_IOCTLFUNCTION, php_http_client_curl_ioctl_callback);
-       curl_easy_setopt(handle, CURLOPT_PROGRESSFUNCTION, php_http_client_curl_progress_callback);
-       curl_easy_setopt(handle, CURLOPT_DEBUGDATA, h);
-       curl_easy_setopt(handle, CURLOPT_PROGRESSDATA, h);
+               while (ptr->parent) {
+                       ptr = ptr->parent;
+               }
+               php_http_message_body_free(&response->body);
+               response->body = ptr->body;
+               ptr->body = NULL;
+       }
+       php_http_message_body_addref(h->response.body);
 
-       php_http_client_curl_reset(h);
+       /* let's update the response headers */
+       if ((zh = php_http_message_header(response, ZEND_STRL("Content-Length"), 1))) {
+               zend_hash_update(&response->hdrs, "X-Original-Content-Length", sizeof("X-Original-Content-Length"), &zh, sizeof(zval *), NULL);
+       }
+       if ((zh = php_http_message_header(response, ZEND_STRL("Transfer-Encoding"), 0))) {
+               zend_hash_update(&response->hdrs, "X-Original-Transfer-Encoding", sizeof("X-Original-Transfer-Encoding"), (void *) &zh, sizeof(zval *), NULL);
+               zend_hash_del(&response->hdrs, "Transfer-Encoding", sizeof("Transfer-Encoding"));
+       }
+       if ((zh = php_http_message_header(response, ZEND_STRL("Content-Range"), 0))) {
+               zend_hash_update(&response->hdrs, "X-Original-Content-Range", sizeof("X-Original-Content-Range"), &zh, sizeof(zval *), NULL);
+               zend_hash_del(&response->hdrs, "Content-Range", sizeof("Content-Range"));
+       }
+       if ((zh = php_http_message_header(response, ZEND_STRL("Content-Encoding"), 0))) {
+               zend_hash_update(&response->hdrs, "X-Original-Content-Encoding", sizeof("X-Original-Content-Encoding"), &zh, sizeof(zval *), NULL);
+               zend_hash_del(&response->hdrs, "Content-Encoding", sizeof("Content-Encoding"));
+       }
+       php_http_message_update_headers(response);
 
-       return h;
+       return response;
 }
 
-static php_http_client_t *php_http_client_curl_copy(php_http_client_t *from, php_http_client_t *to)
+static void php_http_curlm_responsehandler(php_http_client_t *context)
 {
-       php_http_client_curl_t *ctx = from->ctx;
-       void *copy;
-       TSRMLS_FETCH_FROM_CTX(from->ts);
+       int err_count = 0, remaining = 0;
+       php_http_curle_storage_t *st, *err = NULL;
+       php_http_client_enqueue_t *enqueue;
+       php_http_client_curl_t *curl = context->ctx;
+       TSRMLS_FETCH_FROM_CTX(context->ts);
+
+       do {
+               CURLMsg *msg = curl_multi_info_read(curl->handle, &remaining);
+
+               if (msg && CURLMSG_DONE == msg->msg) {
+                       if (CURLE_OK != msg->data.result) {
+                               st = php_http_curle_get_storage(msg->easy_handle);
+                               st->errorcode = msg->data.result;
+
+                               /* defer the warnings/exceptions, so the callback is still called for this request */
+                               if (!err) {
+                                       err = ecalloc(remaining + 1, sizeof(*err));
+                               }
+                               memcpy(&err[err_count], st, sizeof(*st));
+                               if (st->url) {
+                                       err[err_count].url = estrdup(st->url);
+                               }
+                               err_count++;
+                       }
 
-       if (!(copy = php_http_resource_factory_handle_copy(from->rf, ctx->handle TSRMLS_CC))) {
-               return NULL;
+                       if ((enqueue = php_http_client_enqueued(context, msg->easy_handle, compare_queue))) {
+                               php_http_client_curl_handler_t *handler = enqueue->opaque;
+                               php_http_message_t *response = php_http_curlm_responseparser(handler TSRMLS_CC);
+
+                               if (response) {
+                                       context->callback.response.func(context->callback.response.arg, context, &handler->queue, &response);
+                                       php_http_message_free(&response);
+                               }
+                       }
+               }
+       } while (remaining);
+
+       if (err_count) {
+               int i = 0;
+
+               do {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s; %s (%s)", curl_easy_strerror(err[i].errorcode), err[i].errorbuffer, STR_PTR(err[i].url));
+                       if (err[i].url) {
+                               efree(err[i].url);
+                       }
+               } while (++i < err_count);
+
+               efree(err);
        }
+}
 
-       if (to) {
-               return php_http_client_curl_init(to, copy);
-       } else {
-               return php_http_client_init(NULL, from->ops, from->rf, copy TSRMLS_CC);
+#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_client_curl_dtor(php_http_client_t *h)
+static void php_http_curlm_timeout_callback(int socket, short action, void *event_data)
 {
-       php_http_client_curl_t *ctx = h->ctx;
-       TSRMLS_FETCH_FROM_CTX(h->ts);
+       php_http_client_t *context = event_data;
+       php_http_client_curl_t *curl = context->ctx;
 
-       curl_easy_setopt(ctx->handle, CURLOPT_NOPROGRESS, 1L);
-       curl_easy_setopt(ctx->handle, CURLOPT_PROGRESSFUNCTION, NULL);
-       curl_easy_setopt(ctx->handle, CURLOPT_VERBOSE, 0L);
-       curl_easy_setopt(ctx->handle, CURLOPT_DEBUGFUNCTION, NULL);
+#if DBG_EVENTS
+       fprintf(stderr, "T");
+#endif
+       if (curl->useevents) {
+               CURLMcode rc;
+               TSRMLS_FETCH_FROM_CTX(context->ts);
 
-       php_http_resource_factory_handle_dtor(h->rf, ctx->handle TSRMLS_CC);
+               /* ignore and use -1,0 on timeout */
+               (void) socket;
+               (void) action;
 
-       php_http_buffer_dtor(&ctx->options.cookies);
-       zend_hash_destroy(&ctx->options.cache);
+               while (CURLM_CALL_MULTI_PERFORM == (rc = curl_multi_socket_action(curl->handle, CURL_SOCKET_TIMEOUT, 0, &curl->unfinished)));
 
-       if (ctx->options.headers) {
-               curl_slist_free_all(ctx->options.headers);
-               ctx->options.headers = NULL;
-       }
-       php_http_client_progress_dtor(&ctx->progress TSRMLS_CC);
+               if (CURLM_OK != rc) {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s",  curl_multi_strerror(rc));
+               }
 
-       efree(ctx);
-       h->ctx = NULL;
+               php_http_curlm_responsehandler(context);
+       }
 }
-static STATUS php_http_client_curl_reset(php_http_client_t *h)
+
+static void php_http_curlm_event_callback(int socket, short action, void *event_data)
 {
-       CURL *ch = ((php_http_client_curl_t *) h->ctx)->handle;
-       php_http_client_curl_storage_t *st;
+       php_http_client_t *context = event_data;
+       php_http_client_curl_t *curl = context->ctx;
 
-       if ((st = get_storage(ch))) {
-               if (st->url) {
-                       pefree(st->url, 1);
-                       st->url = NULL;
-               }
-               if (st->cookiestore) {
-                       pefree(st->cookiestore, 1);
-                       st->cookiestore = NULL;
+#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, socket, etoca(action), &curl->unfinished)));
+
+               if (CURLM_OK != rc) {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", curl_multi_strerror(rc));
                }
-               st->errorbuffer[0] = '\0';
-       }
 
-       curl_easy_setopt(ch, CURLOPT_URL, NULL);
-#if PHP_HTTP_CURL_VERSION(7,19,4)
-       curl_easy_setopt(ch, CURLOPT_NOPROXY, NULL);
-#endif
-       curl_easy_setopt(ch, CURLOPT_PROXY, NULL);
-       curl_easy_setopt(ch, CURLOPT_PROXYPORT, 0L);
-       curl_easy_setopt(ch, CURLOPT_PROXYTYPE, 0L);
-       /* libcurl < 7.19.6 does not clear auth info with USERPWD set to NULL */
-#if PHP_HTTP_CURL_VERSION(7,19,1)
-       curl_easy_setopt(ch, CURLOPT_PROXYUSERNAME, NULL);
-       curl_easy_setopt(ch, CURLOPT_PROXYPASSWORD, NULL);
-#endif
-       curl_easy_setopt(ch, CURLOPT_PROXYAUTH, 0L);
-       curl_easy_setopt(ch, CURLOPT_HTTPPROXYTUNNEL, 0L);
-       curl_easy_setopt(ch, CURLOPT_DNS_CACHE_TIMEOUT, 60L);
-       curl_easy_setopt(ch, CURLOPT_IPRESOLVE, 0);
-#if PHP_HTTP_CURL_VERSION(7,21,3)
-       curl_easy_setopt(ch, CURLOPT_RESOLVE, NULL);
-#endif
-#if PHP_HTTP_CURL_VERSION(7,24,0)
-       curl_easy_setopt(ch, CURLOPT_DNS_SERVERS, NULL);
-#endif
-       curl_easy_setopt(ch, CURLOPT_LOW_SPEED_LIMIT, 0L);
-       curl_easy_setopt(ch, CURLOPT_LOW_SPEED_TIME, 0L);
-       /* LFS weirdance
-       curl_easy_setopt(ch, CURLOPT_MAX_SEND_SPEED_LARGE, (curl_off_t) 0);
-       curl_easy_setopt(ch, CURLOPT_MAX_RECV_SPEED_LARGE, (curl_off_t) 0);
-       */
-       /* crashes
-       curl_easy_setopt(ch, CURLOPT_MAXCONNECTS, 5L); */
-       curl_easy_setopt(ch, CURLOPT_FRESH_CONNECT, 0L);
-       curl_easy_setopt(ch, CURLOPT_FORBID_REUSE, 0L);
-       curl_easy_setopt(ch, CURLOPT_INTERFACE, NULL);
-       curl_easy_setopt(ch, CURLOPT_PORT, 0L);
-#if PHP_HTTP_CURL_VERSION(7,19,0)
-       curl_easy_setopt(ch, CURLOPT_ADDRESS_SCOPE, 0L);
-#endif
-       curl_easy_setopt(ch, CURLOPT_LOCALPORT, 0L);
-       curl_easy_setopt(ch, CURLOPT_LOCALPORTRANGE, 0L);
-       /* libcurl < 7.19.6 does not clear auth info with USERPWD set to NULL */
-#if PHP_HTTP_CURL_VERSION(7,19,1)
-       curl_easy_setopt(ch, CURLOPT_USERNAME, NULL);
-       curl_easy_setopt(ch, CURLOPT_PASSWORD, NULL);
-#endif
-       curl_easy_setopt(ch, CURLOPT_HTTPAUTH, 0L);
-       curl_easy_setopt(ch, CURLOPT_ENCODING, NULL);
-       /* we do this ourself anyway */
-       curl_easy_setopt(ch, CURLOPT_HTTP_CONTENT_DECODING, 0L);
-       curl_easy_setopt(ch, CURLOPT_HTTP_TRANSFER_DECODING, 0L);
-       curl_easy_setopt(ch, CURLOPT_FOLLOWLOCATION, 0L);
-#if PHP_HTTP_CURL_VERSION(7,19,1)
-       curl_easy_setopt(ch, CURLOPT_POSTREDIR, 0L);
-#else
-       curl_easy_setopt(ch, CURLOPT_POST301, 0L);
-#endif
-       curl_easy_setopt(ch, CURLOPT_UNRESTRICTED_AUTH, 0L);
-       curl_easy_setopt(ch, CURLOPT_REFERER, NULL);
-       curl_easy_setopt(ch, CURLOPT_USERAGENT, "PECL::HTTP/" PHP_HTTP_EXT_VERSION " (PHP/" PHP_VERSION ")");
-       curl_easy_setopt(ch, CURLOPT_HTTPHEADER, NULL);
-       curl_easy_setopt(ch, CURLOPT_COOKIE, NULL);
-       curl_easy_setopt(ch, CURLOPT_COOKIESESSION, 0L);
-       /* these options would enable curl's cookie engine by default which we don't want
-       curl_easy_setopt(ch, CURLOPT_COOKIEFILE, NULL);
-       curl_easy_setopt(ch, CURLOPT_COOKIEJAR, NULL); */
-       curl_easy_setopt(ch, CURLOPT_COOKIELIST, NULL);
-       curl_easy_setopt(ch, CURLOPT_RANGE, NULL);
-       curl_easy_setopt(ch, CURLOPT_RESUME_FROM, 0L);
-       curl_easy_setopt(ch, CURLOPT_MAXFILESIZE, 0L);
-       curl_easy_setopt(ch, CURLOPT_TIMECONDITION, 0L);
-       curl_easy_setopt(ch, CURLOPT_TIMEVALUE, 0L);
-       curl_easy_setopt(ch, CURLOPT_TIMEOUT, 0L);
-       curl_easy_setopt(ch, CURLOPT_CONNECTTIMEOUT, 3);
-       curl_easy_setopt(ch, CURLOPT_SSLCERT, NULL);
-       curl_easy_setopt(ch, CURLOPT_SSLCERTTYPE, NULL);
-       curl_easy_setopt(ch, CURLOPT_SSLCERTPASSWD, NULL);
-       curl_easy_setopt(ch, CURLOPT_SSLKEY, NULL);
-       curl_easy_setopt(ch, CURLOPT_SSLKEYTYPE, NULL);
-       curl_easy_setopt(ch, CURLOPT_SSLKEYPASSWD, NULL);
-       curl_easy_setopt(ch, CURLOPT_SSLENGINE, NULL);
-       curl_easy_setopt(ch, CURLOPT_SSLVERSION, 0L);
-       curl_easy_setopt(ch, CURLOPT_SSL_VERIFYPEER, 0L);
-       curl_easy_setopt(ch, CURLOPT_SSL_VERIFYHOST, 0L);
-       curl_easy_setopt(ch, CURLOPT_SSL_CIPHER_LIST, NULL);
-#if PHP_HTTP_CURL_VERSION(7,19,0)
-       curl_easy_setopt(ch, CURLOPT_ISSUERCERT, NULL);
-#if defined(PHP_HTTP_HAVE_OPENSSL)
-       curl_easy_setopt(ch, CURLOPT_CRLFILE, NULL);
-#endif
-#endif
-#if PHP_HTTP_CURL_VERSION(7,19,1) && defined(PHP_HTTP_HAVE_OPENSSL)
-       curl_easy_setopt(ch, CURLOPT_CERTINFO, NULL);
-#endif
-#ifdef PHP_HTTP_CURL_CAINFO
-       curl_easy_setopt(ch, CURLOPT_CAINFO, PHP_HTTP_CURL_CAINFO);
-#else
-       curl_easy_setopt(ch, CURLOPT_CAINFO, NULL);
-#endif
-       curl_easy_setopt(ch, CURLOPT_CAPATH, NULL);
-       curl_easy_setopt(ch, CURLOPT_RANDOM_FILE, NULL);
-       curl_easy_setopt(ch, CURLOPT_EGDSOCKET, NULL);
-       curl_easy_setopt(ch, CURLOPT_POSTFIELDS, NULL);
-       curl_easy_setopt(ch, CURLOPT_POSTFIELDSIZE, 0L);
-       curl_easy_setopt(ch, CURLOPT_HTTPPOST, NULL);
-       curl_easy_setopt(ch, CURLOPT_IOCTLDATA, NULL);
-       curl_easy_setopt(ch, CURLOPT_READDATA, NULL);
-       curl_easy_setopt(ch, CURLOPT_INFILESIZE, 0L);
-       curl_easy_setopt(ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_NONE);
-       curl_easy_setopt(ch, CURLOPT_CUSTOMREQUEST, NULL);
-       curl_easy_setopt(ch, CURLOPT_NOBODY, 0L);
-       curl_easy_setopt(ch, CURLOPT_POST, 0L);
-       curl_easy_setopt(ch, CURLOPT_UPLOAD, 0L);
-       curl_easy_setopt(ch, CURLOPT_HTTPGET, 1L);
+               php_http_curlm_responsehandler(context);
 
-       return SUCCESS;
+               /* 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);
+               }
+       }
 }
 
-STATUS php_http_client_curl_prepare(php_http_client_t *h, php_http_message_t *msg)
+static int php_http_curlm_socket_callback(CURL *easy, curl_socket_t sock, int action, void *socket_data, void *assign_data)
 {
-       php_http_client_curl_t *curl = h->ctx;
-       php_http_client_curl_storage_t *storage = get_storage(curl->handle);
-       TSRMLS_FETCH_FROM_CTX(h->ts);
+       php_http_client_t *context = socket_data;
+       php_http_client_curl_t *curl = context->ctx;
 
-       /* request url */
-       if (!PHP_HTTP_INFO(msg).request.url) {
-               php_http_error(HE_WARNING, PHP_HTTP_E_CLIENT, "Cannot request empty URL");
-               return FAILURE;
-       }
-       storage->errorbuffer[0] = '\0';
-       if (storage->url) {
-               pefree(storage->url, 1);
+#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, 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);
        }
-       storage->url = pestrdup(PHP_HTTP_INFO(msg).request.url, 1);
-       curl_easy_setopt(curl->handle, CURLOPT_URL, storage->url);
 
-       /* request method */
-       switch (php_http_select_str(PHP_HTTP_INFO(msg).request.method, 4, "GET", "HEAD", "POST", "PUT")) {
-               case 0:
-                       curl_easy_setopt(curl->handle, CURLOPT_HTTPGET, 1L);
-                       break;
+       return 0;
+}
 
-               case 1:
-                       curl_easy_setopt(curl->handle, CURLOPT_NOBODY, 1L);
-                       break;
+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;
 
-               case 2:
-                       curl_easy_setopt(curl->handle, CURLOPT_POST, 1L);
-                       break;
+#if DBG_EVENTS
+       fprintf(stderr, "\ntimer <- timeout_ms: %ld\n", timeout_ms);
+#endif
+       if (curl->useevents) {
 
-               case 3:
-                       curl_easy_setopt(curl->handle, CURLOPT_UPLOAD, 1L);
-                       break;
+               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;
 
-               default: {
-                       if (PHP_HTTP_INFO(msg).request.method) {
-                               curl_easy_setopt(curl->handle, CURLOPT_CUSTOMREQUEST, PHP_HTTP_INFO(msg).request.method);
-                       } else {
-                               php_http_error(HE_WARNING, PHP_HTTP_E_REQUEST_METHOD, "Cannot use empty request method");
-                               return FAILURE;
+                       if (!event_initialized(curl->timeout)) {
+                               event_assign(curl->timeout, curl->evbase, CURL_SOCKET_TIMEOUT, 0, php_http_curlm_timeout_callback, context);
                        }
-                       break;
+
+                       timeout.tv_sec = timeout_ms / 1000;
+                       timeout.tv_usec = (timeout_ms % 1000) * 1000;
+
+                       event_add(curl->timeout, &timeout);
                }
        }
+}
 
-       /* request headers */
-       if (zend_hash_num_elements(&msg->hdrs)) {
-               php_http_array_hashkey_t header_key = php_http_array_hashkey_init(0);
-               zval **header_val;
-               HashPosition pos;
-               php_http_buffer_t header;
+#endif /* HAVE_EVENT */
 
-               php_http_buffer_init(&header);
-               FOREACH_HASH_KEYVAL(pos, &msg->hdrs, header_key, header_val) {
-                       if (header_key.type == HASH_KEY_IS_STRING) {
-                               zval *header_cpy = php_http_ztyp(IS_STRING, *header_val);
+/* curl options */
 
-                               php_http_buffer_appendf(&header, "%s: %s", header_key.str, Z_STRVAL_P(header_cpy));
-                               php_http_buffer_fix(&header);
-                               curl->options.headers = curl_slist_append(curl->options.headers, PHP_HTTP_BUFFER_VAL(&header));
-                               php_http_buffer_reset(&header);
+static php_http_options_t php_http_curle_options, php_http_curlm_options;
 
-                               zval_ptr_dtor(&header_cpy);
-                       }
-               }
-               php_http_buffer_dtor(&header);
-               curl_easy_setopt(curl->handle, CURLOPT_HTTPHEADER, curl->options.headers);
-       }
+#define PHP_HTTP_CURLE_OPTION_CHECK_STRLEN             0x0001
+#define PHP_HTTP_CURLE_OPTION_CHECK_BASEDIR            0x0002
+#define PHP_HTTP_CURLE_OPTION_TRANSFORM_MS             0x0004
 
-       /* attach request body */
-       {
-               /* RFC2616, section 4.3 (para. 4) states that Â»a message-body MUST NOT be included in a request if the
-                * specification of the request method (section 5.1.1) does not allow sending an entity-body in request.«
-                * Following the clause in section 5.1.1 (para. 2) that request methods Â»MUST be implemented with the
-                * same semantics as those specified in section 9« reveal that not any single defined HTTP/1.1 method
-                * does not allow a request body.
-                */
-               size_t body_size = php_http_message_body_size(&msg->body);
+static ZEND_RESULT_CODE php_http_curle_option_set_ssl_verifyhost(php_http_option_t *opt, zval *val, void *userdata)
+{
+       php_http_client_curl_handler_t *curl = userdata;
+       CURL *ch = curl->handle;
 
-               curl_easy_setopt(curl->handle, CURLOPT_IOCTLDATA, &msg->body);
-               curl_easy_setopt(curl->handle, CURLOPT_READDATA, &msg->body);
-               curl_easy_setopt(curl->handle, CURLOPT_INFILESIZE, body_size);
-               curl_easy_setopt(curl->handle, CURLOPT_POSTFIELDSIZE, body_size);
+       if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_SSL_VERIFYHOST, Z_BVAL_P(val) ? 2 : 0)) {
+               return FAILURE;
        }
-
        return SUCCESS;
 }
 
-static STATUS php_http_client_curl_exec(php_http_client_t *h, php_http_message_t *msg)
+static ZEND_RESULT_CODE php_http_curle_option_set_cookiestore(php_http_option_t *opt, zval *val, void *userdata)
 {
-       uint tries = 0;
-       CURLcode result;
-       php_http_client_curl_t *curl = h->ctx;
-       php_http_client_curl_storage_t *storage = get_storage(curl->handle);
-       TSRMLS_FETCH_FROM_CTX(h->ts);
+       php_http_client_curl_handler_t *curl = userdata;
+       CURL *ch = curl->handle;
+       php_http_curle_storage_t *storage = php_http_curle_get_storage(curl->handle);
 
-       if (SUCCESS != php_http_client_curl_prepare(h, msg)) {
-               return FAILURE;
+       if (storage->cookiestore) {
+               pefree(storage->cookiestore, 1);
        }
-
-retry:
-       if (CURLE_OK != (result = curl_easy_perform(curl->handle))) {
-               php_http_error(HE_WARNING, PHP_HTTP_E_CLIENT, "%s; %s (%s)", curl_easy_strerror(result), storage->errorbuffer, storage->url);
-
-               if (EG(exception)) {
-                       add_property_long(EG(exception), "curlCode", result);
-               }
-
-               if (curl->options.retry.count > tries++) {
-                       switch (result) {
-                               case CURLE_COULDNT_RESOLVE_PROXY:
-                               case CURLE_COULDNT_RESOLVE_HOST:
-                               case CURLE_COULDNT_CONNECT:
-                               case CURLE_WRITE_ERROR:
-                               case CURLE_READ_ERROR:
-                               case CURLE_OPERATION_TIMEDOUT:
-                               case CURLE_SSL_CONNECT_ERROR:
-                               case CURLE_GOT_NOTHING:
-                               case CURLE_SSL_ENGINE_SETFAILED:
-                               case CURLE_SEND_ERROR:
-                               case CURLE_RECV_ERROR:
-                               case CURLE_SSL_ENGINE_INITFAILED:
-                               case CURLE_LOGIN_DENIED:
-                                       if (curl->options.retry.delay >= PHP_HTTP_DIFFSEC) {
-                                               php_http_sleep(curl->options.retry.delay);
-                                       }
-                                       goto retry;
-                               default:
-                                       break;
-                       }
-               } else {
-                       return FAILURE;
-               }
+       if (val && Z_STRLEN_P(val)) {
+               storage->cookiestore = pestrndup(Z_STRVAL_P(val), Z_STRLEN_P(val), 1);
+       } else {
+               storage->cookiestore = NULL;
+       }
+       if (    CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIEFILE, storage->cookiestore)
+               ||      CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIEJAR, storage->cookiestore)
+       ) {
+               return FAILURE;
        }
-
        return SUCCESS;
 }
 
-static STATUS php_http_client_curl_setopt(php_http_client_t *h, php_http_client_setopt_opt_t opt, void *arg)
+static ZEND_RESULT_CODE php_http_curle_option_set_cookies(php_http_option_t *opt, zval *val, void *userdata)
 {
-       php_http_client_curl_t *curl = h->ctx;
-       TSRMLS_FETCH_FROM_CTX(h->ts);
-
-       switch (opt) {
-               case PHP_HTTP_CLIENT_OPT_SETTINGS:
-                       return set_options(h, arg);
-                       break;
-
-               case PHP_HTTP_CLIENT_OPT_PROGRESS_CALLBACK:
-                       if (curl->progress.in_cb) {
-                               php_http_error(HE_WARNING, PHP_HTTP_E_CLIENT, "Cannot change progress callback while executing it");
-                               return FAILURE;
-                       }
-                       if (curl->progress.callback) {
-                               php_http_client_progress_dtor(&curl->progress TSRMLS_CC);
-                       }
-                       curl->progress.callback = arg;
-                       break;
+       php_http_client_curl_handler_t *curl = userdata;
+       CURL *ch = curl->handle;
+       TSRMLS_FETCH_FROM_CTX(curl->client->ts);
 
-               case PHP_HTTP_CLIENT_OPT_COOKIES_ENABLE:
-                       /* are cookies already enabled anyway? */
-                       if (!get_storage(curl->handle)->cookiestore) {
-                               if (CURLE_OK != curl_easy_setopt(curl->handle, CURLOPT_COOKIEFILE, "")) {
+       if (val && Z_TYPE_P(val) != IS_NULL) {
+               if (curl->options.encode_cookies) {
+                       if (SUCCESS == php_http_url_encode_hash_ex(HASH_OF(val), &curl->options.cookies, ZEND_STRL(";"), ZEND_STRL("="), NULL, 0 TSRMLS_CC)) {
+                               php_http_buffer_fix(&curl->options.cookies);
+                               if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIE, curl->options.cookies.data)) {
                                        return FAILURE;
                                }
-                       }
-                       break;
-
-               case PHP_HTTP_CLIENT_OPT_COOKIES_RESET:
-                       if (CURLE_OK != curl_easy_setopt(curl->handle, CURLOPT_COOKIELIST, "ALL")) {
+                       } else {
                                return FAILURE;
                        }
-                       break;
+               } else {
+                       HashPosition pos;
+                       php_http_array_hashkey_t cookie_key = php_http_array_hashkey_init(0);
+                       zval **cookie_val;
 
-               case PHP_HTTP_CLIENT_OPT_COOKIES_RESET_SESSION:
-                       if (CURLE_OK != curl_easy_setopt(curl->handle, CURLOPT_COOKIELIST, "SESS")) {
-                               return FAILURE;
-                       }
-                       break;
+                       FOREACH_KEYVAL(pos, val, cookie_key, cookie_val) {
+                               zval *zv = php_http_ztyp(IS_STRING, *cookie_val);
 
-               case PHP_HTTP_CLIENT_OPT_COOKIES_FLUSH:
-                       if (CURLE_OK != curl_easy_setopt(curl->handle, CURLOPT_COOKIELIST, "FLUSH")) {
-                               return FAILURE;
+                               php_http_array_hashkey_stringify(&cookie_key);
+                               php_http_buffer_appendf(&curl->options.cookies, "%s=%s; ", cookie_key.str, Z_STRVAL_P(zv));
+                               php_http_array_hashkey_stringfree(&cookie_key);
+
+                               zval_ptr_dtor(&zv);
                        }
-                       break;
 
-               default:
+                       php_http_buffer_fix(&curl->options.cookies);
+                       if (curl->options.cookies.used) {
+                               if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIE, curl->options.cookies.data)) {
+                                       return FAILURE;
+                               }
+                       }
+               }
+       } else {
+               php_http_buffer_reset(&curl->options.cookies);
+               if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIE, NULL)) {
                        return FAILURE;
+               }
        }
-
        return SUCCESS;
 }
 
-static STATUS php_http_client_curl_getopt(php_http_client_t *h, php_http_client_getopt_opt_t opt, void *arg)
+static ZEND_RESULT_CODE php_http_curle_option_set_encodecookies(php_http_option_t *opt, zval *val, void *userdata)
 {
-       php_http_client_curl_t *curl = h->ctx;
+       php_http_client_curl_handler_t *curl = userdata;
 
-       switch (opt) {
-               case PHP_HTTP_CLIENT_OPT_PROGRESS_INFO:
-                       *((php_http_client_progress_t **) arg) = &curl->progress;
-                       break;
+       curl->options.encode_cookies = Z_BVAL_P(val);
+       return SUCCESS;
+}
 
-               case PHP_HTTP_CLIENT_OPT_TRANSFER_INFO:
-                       get_info(curl->handle, arg);
-                       break;
+static ZEND_RESULT_CODE php_http_curle_option_set_lastmodified(php_http_option_t *opt, zval *val, void *userdata)
+{
+       php_http_client_curl_handler_t *curl = userdata;
+       CURL *ch = curl->handle;
+       TSRMLS_FETCH_FROM_CTX(curl->client->ts);
 
-               default:
+       if (Z_LVAL_P(val)) {
+               if (Z_LVAL_P(val) > 0) {
+                       if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_TIMEVALUE, Z_LVAL_P(val))) {
+                               return FAILURE;
+                       }
+               } else {
+                       if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_TIMEVALUE, (long) sapi_get_request_time(TSRMLS_C) + Z_LVAL_P(val))) {
+                               return FAILURE;
+                       }
+               }
+               if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_TIMECONDITION, (long) (curl->options.range_request ? CURL_TIMECOND_IFUNMODSINCE : CURL_TIMECOND_IFMODSINCE))) {
                        return FAILURE;
+               }
+       } else {
+               if (    CURLE_OK != curl_easy_setopt(ch, CURLOPT_TIMEVALUE, 0)
+                       ||      CURLE_OK != curl_easy_setopt(ch, CURLOPT_TIMECONDITION, 0)
+               ) {
+                       return FAILURE;
+               }
        }
-
        return SUCCESS;
 }
 
-static php_http_resource_factory_ops_t php_http_client_curl_resource_factory_ops = {
-       php_http_curl_ctor,
-       php_http_curl_copy,
-       php_http_curl_dtor
-};
-
-static zend_class_entry *get_class_entry(void)
+static ZEND_RESULT_CODE php_http_curle_option_set_compress(php_http_option_t *opt, zval *val, void *userdata)
 {
-       return php_http_client_curl_class_entry;
-}
+       php_http_client_curl_handler_t *curl = userdata;
+       CURL *ch = curl->handle;
+
+#if !PHP_HTTP_CURL_VERSION(7,21,6)
+#      define CURLOPT_ACCEPT_ENCODING CURLOPT_ENCODING
+#endif
+       if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_ACCEPT_ENCODING, Z_BVAL_P(val) ? "" : NULL)) {
+               return FAILURE;
+       }
+       return SUCCESS;
+}
+
+static ZEND_RESULT_CODE php_http_curle_option_set_etag(php_http_option_t *opt, zval *val, void *userdata)
+{
+       php_http_client_curl_handler_t *curl = userdata;
+       php_http_buffer_t header;
+
+       if (Z_STRLEN_P(val)) {
+               zend_bool is_quoted = !((Z_STRVAL_P(val)[0] != '"') || (Z_STRVAL_P(val)[Z_STRLEN_P(val)-1] != '"'));
+               php_http_buffer_init(&header);
+               php_http_buffer_appendf(&header, is_quoted?"%s: %s":"%s: \"%s\"", curl->options.range_request?"If-Match":"If-None-Match", Z_STRVAL_P(val));
+               php_http_buffer_fix(&header);
+               curl->options.headers = curl_slist_append(curl->options.headers, header.data);
+               php_http_buffer_dtor(&header);
+       }
+       return SUCCESS;
+}
+
+static ZEND_RESULT_CODE php_http_curle_option_set_range(php_http_option_t *opt, zval *val, void *userdata)
+{
+       php_http_client_curl_handler_t *curl = userdata;
+       CURL *ch = curl->handle;
+       TSRMLS_FETCH_FROM_CTX(curl->client->ts);
+
+       php_http_buffer_reset(&curl->options.ranges);
+
+       if (val && Z_TYPE_P(val) != IS_NULL) {
+               HashPosition pos;
+               zval **rr, **rb, **re;
+
+               FOREACH_VAL(pos, val, rr) {
+                       if (Z_TYPE_PP(rr) == IS_ARRAY) {
+                               if (2 == php_http_array_list(Z_ARRVAL_PP(rr) TSRMLS_CC, 2, &rb, &re)) {
+                                       if (    ((Z_TYPE_PP(rb) == IS_LONG) || ((Z_TYPE_PP(rb) == IS_STRING) && is_numeric_string(Z_STRVAL_PP(rb), Z_STRLEN_PP(rb), NULL, NULL, 1))) &&
+                                                       ((Z_TYPE_PP(re) == IS_LONG) || ((Z_TYPE_PP(re) == IS_STRING) && is_numeric_string(Z_STRVAL_PP(re), Z_STRLEN_PP(re), NULL, NULL, 1)))) {
+                                               zval *rbl = php_http_ztyp(IS_LONG, *rb);
+                                               zval *rel = php_http_ztyp(IS_LONG, *re);
+
+                                               if ((Z_LVAL_P(rbl) >= 0) && (Z_LVAL_P(rel) >= 0)) {
+                                                       php_http_buffer_appendf(&curl->options.ranges, "%ld-%ld,", Z_LVAL_P(rbl), Z_LVAL_P(rel));
+                                               }
+                                               zval_ptr_dtor(&rbl);
+                                               zval_ptr_dtor(&rel);
+                                       }
+
+                               }
+                       }
+               }
+
+               if (curl->options.ranges.used) {
+                       curl->options.range_request = 1;
+                       /* ditch last comma */
+                       curl->options.ranges.data[curl->options.ranges.used - 1] = '\0';
+               }
+       }
+
+       if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_RANGE, curl->options.ranges.data)) {
+               return FAILURE;
+       }
+       return SUCCESS;
+}
+
+static ZEND_RESULT_CODE php_http_curle_option_set_resume(php_http_option_t *opt, zval *val, void *userdata)
+{
+       php_http_client_curl_handler_t *curl = userdata;
+       CURL *ch = curl->handle;
+
+       if (Z_LVAL_P(val) > 0) {
+               curl->options.range_request = 1;
+       }
+       if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_RESUME_FROM, Z_LVAL_P(val))) {
+               return FAILURE;
+       }
+       return SUCCESS;
+}
+
+static ZEND_RESULT_CODE php_http_curle_option_set_retrydelay(php_http_option_t *opt, zval *val, void *userdata)
+{
+       php_http_client_curl_handler_t *curl = userdata;
+
+       curl->options.retry.delay = Z_DVAL_P(val);
+       return SUCCESS;
+}
+
+static ZEND_RESULT_CODE php_http_curle_option_set_retrycount(php_http_option_t *opt, zval *val, void *userdata)
+{
+       php_http_client_curl_handler_t *curl = userdata;
+
+       curl->options.retry.count = Z_LVAL_P(val);
+       return SUCCESS;
+}
+
+static ZEND_RESULT_CODE php_http_curle_option_set_redirect(php_http_option_t *opt, zval *val, void *userdata)
+{
+       php_http_client_curl_handler_t *curl = userdata;
+       CURL *ch = curl->handle;
+
+       if (    CURLE_OK != curl_easy_setopt(ch, CURLOPT_FOLLOWLOCATION, Z_LVAL_P(val) ? 1L : 0L)
+               ||      CURLE_OK != curl_easy_setopt(ch, CURLOPT_MAXREDIRS, curl->options.redirects = Z_LVAL_P(val))
+       ) {
+               return FAILURE;
+       }
+       return SUCCESS;
+}
+
+static ZEND_RESULT_CODE php_http_curle_option_set_portrange(php_http_option_t *opt, zval *val, void *userdata)
+{
+       php_http_client_curl_handler_t *curl = userdata;
+       CURL *ch = curl->handle;
+       long localport = 0, localportrange = 0;
+       TSRMLS_FETCH_FROM_CTX(curl->client->ts);
+
+       if (val && Z_TYPE_P(val) != IS_NULL) {
+               zval **z_port_start, *zps_copy = NULL, **z_port_end, *zpe_copy = NULL;
+
+               switch (php_http_array_list(Z_ARRVAL_P(val) TSRMLS_CC, 2, &z_port_start, &z_port_end)) {
+               case 2:
+                       zps_copy = php_http_ztyp(IS_LONG, *z_port_start);
+                       zpe_copy = php_http_ztyp(IS_LONG, *z_port_end);
+                       localportrange = labs(Z_LVAL_P(zps_copy)-Z_LVAL_P(zpe_copy))+1L;
+                       /* no break */
+               case 1:
+                       if (!zps_copy) {
+                               zps_copy = php_http_ztyp(IS_LONG, *z_port_start);
+                       }
+                       localport = (zpe_copy && Z_LVAL_P(zpe_copy) > 0) ? MIN(Z_LVAL_P(zps_copy), Z_LVAL_P(zpe_copy)) : Z_LVAL_P(zps_copy);
+                       zval_ptr_dtor(&zps_copy);
+                       if (zpe_copy) {
+                               zval_ptr_dtor(&zpe_copy);
+                       }
+                       break;
+               default:
+                       break;
+               }
+       }
+       if (    CURLE_OK != curl_easy_setopt(ch, CURLOPT_LOCALPORT, localport)
+               ||      CURLE_OK != curl_easy_setopt(ch, CURLOPT_LOCALPORTRANGE, localportrange)
+       ) {
+               return FAILURE;
+       }
+       return SUCCESS;
+}
+
+#if PHP_HTTP_CURL_VERSION(7,37,0)
+static ZEND_RESULT_CODE php_http_curle_option_set_proxyheader(php_http_option_t *opt, zval *val, void *userdata)
+{
+       php_http_client_curl_handler_t *curl = userdata;
+       TSRMLS_FETCH_FROM_CTX(curl->client->ts);
+
+       if (val && Z_TYPE_P(val) != IS_NULL) {
+               php_http_array_hashkey_t header_key = php_http_array_hashkey_init(0);
+               zval **header_val, *header_cpy;
+               HashPosition pos;
+               php_http_buffer_t header;
+
+               php_http_buffer_init(&header);
+               FOREACH_KEYVAL(pos, val, header_key, header_val) {
+                       if (header_key.type == HASH_KEY_IS_STRING) {
+                               header_cpy = php_http_ztyp(IS_STRING, *header_val);
+                               php_http_buffer_appendf(&header, "%s: %s", header_key.str, Z_STRVAL_P(header_cpy));
+                               php_http_buffer_fix(&header);
+                               curl->options.proxyheaders = curl_slist_append(curl->options.proxyheaders, header.data);
+                               php_http_buffer_reset(&header);
+
+                               zval_ptr_dtor(&header_cpy);
+                       }
+               }
+               php_http_buffer_dtor(&header);
+       }
+       if (CURLE_OK != curl_easy_setopt(curl->handle, CURLOPT_PROXYHEADER, curl->options.proxyheaders)) {
+               return FAILURE;
+       }
+       if (CURLE_OK != curl_easy_setopt(curl->handle, CURLOPT_HEADEROPT, CURLHEADER_SEPARATE)) {
+               curl_easy_setopt(curl->handle, CURLOPT_PROXYHEADER, NULL);
+               return FAILURE;
+       }
+       return SUCCESS;
+}
+#endif
+
+#if PHP_HTTP_CURL_VERSION(7,21,3)
+static ZEND_RESULT_CODE php_http_curle_option_set_resolve(php_http_option_t *opt, zval *val, void *userdata)
+{
+       php_http_client_curl_handler_t *curl = userdata;
+       CURL *ch = curl->handle;
+       TSRMLS_FETCH_FROM_CTX(curl->client->ts);
+
+       if (val && Z_TYPE_P(val) != IS_NULL) {
+               php_http_array_hashkey_t key = php_http_array_hashkey_init(0);
+               HashPosition pos;
+               zval **data;
+
+               FOREACH_KEYVAL(pos, val, key, data) {
+                       zval *cpy = php_http_ztyp(IS_STRING, *data);
+                       curl->options.resolve = curl_slist_append(curl->options.resolve, Z_STRVAL_P(cpy));
+                       zval_ptr_dtor(&cpy);
+               }
+
+               if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_RESOLVE, curl->options.resolve)) {
+                       return FAILURE;
+               }
+       } else {
+               if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_RESOLVE, NULL)) {
+                       return FAILURE;
+               }
+       }
+       return SUCCESS;
+}
+#endif
+
+#if PHP_HTTP_CURL_VERSION(7,21,4) && defined(PHP_HTTP_CURL_TLSAUTH_SRP)
+static ZEND_RESULT_CODE php_http_curle_option_set_ssl_tlsauthtype(php_http_option_t *opt, zval *val, void *userdata)
+{
+       php_http_client_curl_handler_t *curl = userdata;
+       CURL *ch = curl->handle;
+
+       if (val && Z_LVAL_P(val)) {
+               switch (Z_LVAL_P(val)) {
+               case CURL_TLSAUTH_SRP:
+                       if (CURLE_OK == curl_easy_setopt(ch, CURLOPT_TLSAUTH_TYPE, PHP_HTTP_CURL_TLSAUTH_SRP)) {
+                               return SUCCESS;
+                       }
+                       /* no break */
+               default:
+                       return FAILURE;
+               }
+       }
+       if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_TLSAUTH_TYPE, PHP_HTTP_CURL_TLSAUTH_DEF)) {
+               return FAILURE;
+       }
+       return SUCCESS;
+}
+#endif
+
+static void php_http_curle_options_init(php_http_options_t *registry TSRMLS_DC)
+{
+       php_http_option_t *opt;
+
+       /* proxy */
+       if ((opt = php_http_option_register(registry, ZEND_STRL("proxyhost"), CURLOPT_PROXY, IS_STRING))) {
+               opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
+       }
+       php_http_option_register(registry, ZEND_STRL("proxytype"), CURLOPT_PROXYTYPE, IS_LONG);
+       php_http_option_register(registry, ZEND_STRL("proxyport"), CURLOPT_PROXYPORT, IS_LONG);
+       if ((opt = php_http_option_register(registry, ZEND_STRL("proxyauth"), CURLOPT_PROXYUSERPWD, IS_STRING))) {
+               opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
+       }
+       if ((opt = php_http_option_register(registry, ZEND_STRL("proxyauthtype"), CURLOPT_PROXYAUTH, IS_LONG))) {
+               Z_LVAL(opt->defval) = CURLAUTH_ANYSAFE;
+       }
+       php_http_option_register(registry, ZEND_STRL("proxytunnel"), CURLOPT_HTTPPROXYTUNNEL, IS_BOOL);
+#if PHP_HTTP_CURL_VERSION(7,19,4)
+       php_http_option_register(registry, ZEND_STRL("noproxy"), CURLOPT_NOPROXY, IS_STRING);
+#endif
+
+#if PHP_HTTP_CURL_VERSION(7,37,0)
+       if ((opt = php_http_option_register(registry, ZEND_STRL("proxyheader"), CURLOPT_PROXYHEADER, IS_ARRAY))) {
+               opt->setter = php_http_curle_option_set_proxyheader;
+       }
+#endif
+#if PHP_HTTP_CURL_VERSION(7,43,0)
+       if ((opt = php_http_option_register(registry, ZEND_STRL("proxy_service_name"), CURLOPT_PROXY_SERVICE_NAME, IS_STRING))) {
+               opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
+       }
+#endif
+
+#if PHP_HTTP_CURL_VERSION(7,40,0)
+       if ((opt = php_http_option_register(registry, ZEND_STRL("unix_socket_path"), CURLOPT_UNIX_SOCKET_PATH, IS_STRING))) {
+               opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
+               opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_BASEDIR;
+       }
+#endif
+
+       /* dns */
+       if ((opt = php_http_option_register(registry, ZEND_STRL("dns_cache_timeout"), CURLOPT_DNS_CACHE_TIMEOUT, IS_LONG))) {
+               Z_LVAL(opt->defval) = 60;
+       }
+       php_http_option_register(registry, ZEND_STRL("ipresolve"), CURLOPT_IPRESOLVE, IS_LONG);
+#if PHP_HTTP_CURL_VERSION(7,21,3)
+       if ((opt = php_http_option_register(registry, ZEND_STRL("resolve"), CURLOPT_RESOLVE, IS_ARRAY))) {
+               opt->setter = php_http_curle_option_set_resolve;
+       }
+#endif
+#if PHP_HTTP_HAVE_ARES
+# if PHP_HTTP_CURL_VERSION(7,24,0)
+       if ((opt = php_http_option_register(registry, ZEND_STRL("dns_servers"), CURLOPT_DNS_SERVERS, IS_STRING))) {
+               opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
+       }
+# endif
+# if PHP_HTTP_CURL_VERSION(7,33,0)
+       if ((opt = php_http_option_register(registry, ZEND_STRL("dns_interface"), CURLOPT_DNS_INTERFACE, IS_STRING))) {
+               opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
+       }
+       if ((opt = php_http_option_register(registry, ZEND_STRL("dns_local_ip4"), CURLOPT_DNS_LOCAL_IP4, IS_STRING))) {
+               opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
+       }
+       if ((opt = php_http_option_register(registry, ZEND_STRL("dns_local_ip6"), CURLOPT_DNS_LOCAL_IP6, IS_STRING))) {
+               opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
+       }
+# endif
+#endif
+
+       /* limits */
+       php_http_option_register(registry, ZEND_STRL("low_speed_limit"), CURLOPT_LOW_SPEED_LIMIT, IS_LONG);
+       php_http_option_register(registry, ZEND_STRL("low_speed_time"), CURLOPT_LOW_SPEED_TIME, IS_LONG);
+
+       /* LSF weirdance
+       php_http_option_register(registry, ZEND_STRL("max_send_speed"), CURLOPT_MAX_SEND_SPEED_LARGE, IS_LONG);
+       php_http_option_register(registry, ZEND_STRL("max_recv_speed"), CURLOPT_MAX_RECV_SPEED_LARGE, IS_LONG);
+       */
+
+       /* connection handling */
+       /* crashes
+       if ((opt = php_http_option_register(registry, ZEND_STRL("maxconnects"), CURLOPT_MAXCONNECTS, IS_LONG))) {
+               Z_LVAL(opt->defval) = 5;
+       }
+       */
+       php_http_option_register(registry, ZEND_STRL("fresh_connect"), CURLOPT_FRESH_CONNECT, IS_BOOL);
+       php_http_option_register(registry, ZEND_STRL("forbid_reuse"), CURLOPT_FORBID_REUSE, IS_BOOL);
+
+       /* outgoing interface */
+       php_http_option_register(registry, ZEND_STRL("interface"), CURLOPT_INTERFACE, IS_STRING);
+       if ((opt = php_http_option_register(registry, ZEND_STRL("portrange"), CURLOPT_LOCALPORT, IS_ARRAY))) {
+               opt->setter = php_http_curle_option_set_portrange;
+       }
+
+       /* another endpoint port */
+       php_http_option_register(registry, ZEND_STRL("port"), CURLOPT_PORT, IS_LONG);
+
+       /* RFC4007 zone_id */
+#if PHP_HTTP_CURL_VERSION(7,19,0)
+       php_http_option_register(registry, ZEND_STRL("address_scope"), CURLOPT_ADDRESS_SCOPE, IS_LONG);
+#endif
+
+       /* auth */
+       if ((opt = php_http_option_register(registry, ZEND_STRL("httpauth"), CURLOPT_USERPWD, IS_STRING))) {
+               opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
+       }
+       if ((opt = php_http_option_register(registry, ZEND_STRL("httpauthtype"), CURLOPT_HTTPAUTH, IS_LONG))) {
+               Z_LVAL(opt->defval) = CURLAUTH_ANYSAFE;
+       }
+#if PHP_HTTP_CURL_VERSION(7,43,0)
+       if ((opt = php_http_option_register(registry, ZEND_STRL("service_name"), CURLOPT_SERVICE_NAME, IS_STRING))) {
+               opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
+       }
+#endif
+
+       /* redirects */
+       if ((opt = php_http_option_register(registry, ZEND_STRL("redirect"), CURLOPT_FOLLOWLOCATION, IS_LONG))) {
+               opt->setter = php_http_curle_option_set_redirect;
+       }
+       php_http_option_register(registry, ZEND_STRL("unrestricted_auth"), CURLOPT_UNRESTRICTED_AUTH, IS_BOOL);
+#if PHP_HTTP_CURL_VERSION(7,19,1)
+       php_http_option_register(registry, ZEND_STRL("postredir"), CURLOPT_POSTREDIR, IS_LONG);
+#endif
+
+       /* retries */
+       if ((opt = php_http_option_register(registry, ZEND_STRL("retrycount"), 0, IS_LONG))) {
+               opt->setter = php_http_curle_option_set_retrycount;
+       }
+       if ((opt = php_http_option_register(registry, ZEND_STRL("retrydelay"), 0, IS_DOUBLE))) {
+               opt->setter = php_http_curle_option_set_retrydelay;
+       }
+
+       /* referer */
+       if ((opt = php_http_option_register(registry, ZEND_STRL("referer"), CURLOPT_REFERER, IS_STRING))) {
+               opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
+       }
+       if ((opt = php_http_option_register(registry, ZEND_STRL("autoreferer"), CURLOPT_AUTOREFERER, IS_BOOL))) {
+               ZVAL_BOOL(&opt->defval, 1);
+       }
+
+       /* useragent */
+       if ((opt = php_http_option_register(registry, ZEND_STRL("useragent"), CURLOPT_USERAGENT, IS_STRING))) {
+               /* don't check strlen, to allow sending no useragent at all */
+               ZVAL_STRING(&opt->defval,
+                               "PECL_HTTP/" PHP_PECL_HTTP_VERSION " "
+                               "PHP/" PHP_VERSION " "
+                               "libcurl/" LIBCURL_VERSION
+                       , 0);
+       }
+
+       /* resume */
+       if ((opt = php_http_option_register(registry, ZEND_STRL("resume"), CURLOPT_RESUME_FROM, IS_LONG))) {
+               opt->setter = php_http_curle_option_set_resume;
+       }
+       /* ranges */
+       if ((opt = php_http_option_register(registry, ZEND_STRL("range"), CURLOPT_RANGE, IS_ARRAY))) {
+               opt->setter = php_http_curle_option_set_range;
+       }
+
+       /* etag */
+       if ((opt = php_http_option_register(registry, ZEND_STRL("etag"), 0, IS_STRING))) {
+               opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
+               opt->setter = php_http_curle_option_set_etag;
+       }
+
+       /* compression */
+       if ((opt = php_http_option_register(registry, ZEND_STRL("compress"), 0, IS_BOOL))) {
+               opt->setter = php_http_curle_option_set_compress;
+       }
+
+       /* lastmodified */
+       if ((opt = php_http_option_register(registry, ZEND_STRL("lastmodified"), 0, IS_LONG))) {
+               opt->setter = php_http_curle_option_set_lastmodified;
+       }
+
+       /* cookies */
+       if ((opt = php_http_option_register(registry, ZEND_STRL("encodecookies"), 0, IS_BOOL))) {
+               opt->setter = php_http_curle_option_set_encodecookies;
+               ZVAL_BOOL(&opt->defval, 1);
+       }
+       if ((opt = php_http_option_register(registry, ZEND_STRL("cookies"), 0, IS_ARRAY))) {
+               opt->setter = php_http_curle_option_set_cookies;
+       }
+
+       /* cookiesession, don't load session cookies from cookiestore */
+       php_http_option_register(registry, ZEND_STRL("cookiesession"), CURLOPT_COOKIESESSION, IS_BOOL);
+       /* cookiestore, read initial cookies from that file and store cookies back into that file */
+       if ((opt = php_http_option_register(registry, ZEND_STRL("cookiestore"), 0, IS_STRING))) {
+               opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
+               opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_BASEDIR;
+               opt->setter = php_http_curle_option_set_cookiestore;
+       }
+
+       /* maxfilesize */
+       php_http_option_register(registry, ZEND_STRL("maxfilesize"), CURLOPT_MAXFILESIZE, IS_LONG);
+
+       /* http protocol version */
+       php_http_option_register(registry, ZEND_STRL("protocol"), CURLOPT_HTTP_VERSION, IS_LONG);
+
+       /* timeouts */
+       if ((opt = php_http_option_register(registry, ZEND_STRL("timeout"), CURLOPT_TIMEOUT_MS, IS_DOUBLE))) {
+               opt->flags |= PHP_HTTP_CURLE_OPTION_TRANSFORM_MS;
+       }
+       if ((opt = php_http_option_register(registry, ZEND_STRL("connecttimeout"), CURLOPT_CONNECTTIMEOUT_MS, IS_DOUBLE))) {
+               opt->flags |= PHP_HTTP_CURLE_OPTION_TRANSFORM_MS;
+               Z_DVAL(opt->defval) = 3;
+       }
+#if PHP_HTTP_CURL_VERSION(7,36,0)
+       if ((opt = php_http_option_register(registry, ZEND_STRL("expect_100_timeout"), CURLOPT_EXPECT_100_TIMEOUT_MS, IS_DOUBLE))) {
+               opt->flags |= PHP_HTTP_CURLE_OPTION_TRANSFORM_MS;
+               Z_DVAL(opt->defval) = 1;
+       }
+#endif
+
+       /* tcp */
+       php_http_option_register(registry, ZEND_STRL("tcp_nodelay"), CURLOPT_TCP_NODELAY, IS_BOOL);
+#if PHP_HTTP_CURL_VERSION(7,25,0)
+       php_http_option_register(registry, ZEND_STRL("tcp_keepalive"), CURLOPT_TCP_KEEPALIVE, IS_BOOL);
+       if ((opt = php_http_option_register(registry, ZEND_STRL("tcp_keepidle"), CURLOPT_TCP_KEEPIDLE, IS_LONG))) {
+               Z_LVAL(opt->defval) = 60;
+       }
+       if ((opt = php_http_option_register(registry, ZEND_STRL("tcp_keepintvl"), CURLOPT_TCP_KEEPINTVL, IS_LONG))) {
+               Z_LVAL(opt->defval) = 60;
+       }
+#endif
+
+       /* ssl */
+       if ((opt = php_http_option_register(registry, ZEND_STRL("ssl"), 0, IS_ARRAY))) {
+               registry = &opt->suboptions;
+
+               if ((opt = php_http_option_register(registry, ZEND_STRL("cert"), CURLOPT_SSLCERT, IS_STRING))) {
+                       opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
+                       opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_BASEDIR;
+               }
+               if ((opt = php_http_option_register(registry, ZEND_STRL("certtype"), CURLOPT_SSLCERTTYPE, IS_STRING))) {
+                       opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
+                       ZVAL_STRING(&opt->defval, "PEM", 0);
+               }
+               if ((opt = php_http_option_register(registry, ZEND_STRL("key"), CURLOPT_SSLKEY, IS_STRING))) {
+                       opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
+                       opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_BASEDIR;
+               }
+               if ((opt = php_http_option_register(registry, ZEND_STRL("keytype"), CURLOPT_SSLKEYTYPE, IS_STRING))) {
+                       opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
+                       ZVAL_STRING(&opt->defval, "PEM", 0);
+               }
+               if ((opt = php_http_option_register(registry, ZEND_STRL("keypasswd"), CURLOPT_SSLKEYPASSWD, IS_STRING))) {
+                       opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
+               }
+               php_http_option_register(registry, ZEND_STRL("engine"), CURLOPT_SSLENGINE, IS_STRING);
+               php_http_option_register(registry, ZEND_STRL("version"), CURLOPT_SSLVERSION, IS_LONG);
+               if ((opt = php_http_option_register(registry, ZEND_STRL("verifypeer"), CURLOPT_SSL_VERIFYPEER, IS_BOOL))) {
+                       ZVAL_BOOL(&opt->defval, 1);
+               }
+               if ((opt = php_http_option_register(registry, ZEND_STRL("verifyhost"), CURLOPT_SSL_VERIFYHOST, IS_BOOL))) {
+                       ZVAL_BOOL(&opt->defval, 1);
+                       opt->setter = php_http_curle_option_set_ssl_verifyhost;
+               }
+#if PHP_HTTP_CURL_VERSION(7,41,0)
+               php_http_option_register(registry, ZEND_STRL("verifystatus"), CURLOPT_SSL_VERIFYSTATUS, IS_BOOL);
+#endif
+               php_http_option_register(registry, ZEND_STRL("cipher_list"), CURLOPT_SSL_CIPHER_LIST, IS_STRING);
+               if ((opt = php_http_option_register(registry, ZEND_STRL("cainfo"), CURLOPT_CAINFO, IS_STRING))) {
+                       opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
+                       opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_BASEDIR;
+#ifdef PHP_HTTP_CURL_CAINFO
+                       ZVAL_STRING(&opt->defval, PHP_HTTP_CURL_CAINFO, 0);
+#endif
+               }
+               if ((opt = php_http_option_register(registry, ZEND_STRL("capath"), CURLOPT_CAPATH, IS_STRING))) {
+                       opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
+                       opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_BASEDIR;
+               }
+               if ((opt = php_http_option_register(registry, ZEND_STRL("random_file"), CURLOPT_RANDOM_FILE, IS_STRING))) {
+                       opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
+                       opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_BASEDIR;
+               }
+               if ((opt = php_http_option_register(registry, ZEND_STRL("egdsocket"), CURLOPT_EGDSOCKET, IS_STRING))) {
+                       opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
+                       opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_BASEDIR;
+               }
+#if PHP_HTTP_CURL_VERSION(7,19,0)
+               if ((opt = php_http_option_register(registry, ZEND_STRL("issuercert"), CURLOPT_ISSUERCERT, IS_STRING))) {
+                       opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
+                       opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_BASEDIR;
+               }
+#      ifdef PHP_HTTP_HAVE_OPENSSL
+               if ((opt = php_http_option_register(registry, ZEND_STRL("crlfile"), CURLOPT_CRLFILE, IS_STRING))) {
+                       opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
+                       opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_BASEDIR;
+               }
+#      endif
+#endif
+#if PHP_HTTP_CURL_VERSION(7,19,1) && defined(PHP_HTTP_HAVE_OPENSSL)
+               php_http_option_register(registry, ZEND_STRL("certinfo"), CURLOPT_CERTINFO, IS_BOOL);
+#endif
+#if PHP_HTTP_CURL_VERSION(7,36,0)
+               if ((opt = php_http_option_register(registry, ZEND_STRL("enable_npn"), CURLOPT_SSL_ENABLE_NPN, IS_BOOL))) {
+                       ZVAL_BOOL(&opt->defval, 1);
+               }
+               if ((opt = php_http_option_register(registry, ZEND_STRL("enable_alpn"), CURLOPT_SSL_ENABLE_ALPN, IS_BOOL))) {
+                       ZVAL_BOOL(&opt->defval, 1);
+               }
+#endif
+#if PHP_HTTP_CURL_VERSION(7,39,0)
+               if ((opt = php_http_option_register(registry, ZEND_STRL("pinned_publickey"), CURLOPT_PINNEDPUBLICKEY, IS_STRING))) {
+                       opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
+                       opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_BASEDIR;
+               }
+#endif
+#if PHP_HTTP_CURL_VERSION(7,21,4) && defined(PHP_HTTP_CURL_TLSAUTH_SRP)
+               if ((opt = php_http_option_register(registry, ZEND_STRL("tlsauthtype"), CURLOPT_TLSAUTH_TYPE, IS_LONG))) {
+                       opt->setter = php_http_curle_option_set_ssl_tlsauthtype;
+               }
+               if ((opt = php_http_option_register(registry, ZEND_STRL("tlsauthuser"), CURLOPT_TLSAUTH_USERNAME, IS_STRING))) {
+                       opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
+               }
+               if ((opt = php_http_option_register(registry, ZEND_STRL("tlsauthpass"), CURLOPT_TLSAUTH_PASSWORD, IS_STRING))) {
+                       opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
+               }
+#endif
+#if PHP_HTTP_CURL_VERSION(7,42,0) && (defined(PHP_HTTP_HAVE_NSS) || defined(PHP_HTTP_HAVE_DARWINSSL))
+               php_http_option_register(registry, ZEND_STRL("falsestart"), CURLOPT_SSL_FALSESTART, IS_BOOL);
+#endif
+       }
+}
+
+static zval *php_http_curle_get_option(php_http_option_t *opt, HashTable *options, void *userdata)
+{
+       php_http_client_curl_handler_t *curl = userdata;
+       zval *option;
+
+       if ((option = php_http_option_get(opt, options, NULL))) {
+               option = php_http_ztyp(opt->type, option);
+               zend_hash_quick_update(&curl->options.cache, opt->name.s, opt->name.l, opt->name.h, &option, sizeof(zval *), NULL);
+       }
+       return option;
+}
+
+static ZEND_RESULT_CODE php_http_curle_set_option(php_http_option_t *opt, zval *val, void *userdata)
+{
+       php_http_client_curl_handler_t *curl = userdata;
+       CURL *ch = curl->handle;
+       zval tmp;
+       CURLcode rc = CURLE_OK;
+       ZEND_RESULT_CODE rv = SUCCESS;
+       TSRMLS_FETCH_FROM_CTX(curl->client->ts);
+
+       if (!val) {
+               val = &opt->defval;
+       }
+
+       switch (opt->type) {
+       case IS_BOOL:
+               if (opt->setter) {
+                       rv = opt->setter(opt, val, curl);
+               } else if (CURLE_OK != curl_easy_setopt(ch, opt->option, (long) Z_BVAL_P(val))) {
+                       rv = FAILURE;
+               }
+               break;
+
+       case IS_LONG:
+               if (opt->setter) {
+                       rv = opt->setter(opt, val, curl);
+               } else if (CURLE_OK != curl_easy_setopt(ch, opt->option, Z_LVAL_P(val))) {
+                       rv = FAILURE;
+               }
+               break;
+
+       case IS_STRING:
+               if (opt->setter) {
+                       rv = opt->setter(opt, val, curl);
+               } else if ((opt->flags & PHP_HTTP_CURLE_OPTION_CHECK_STRLEN) && !Z_STRLEN_P(val)) {
+                       if (CURLE_OK != (rc = curl_easy_setopt(ch, opt->option, NULL))) {
+                               rv = FAILURE;
+                       }
+               } else if ((opt->flags & PHP_HTTP_CURLE_OPTION_CHECK_BASEDIR) && Z_STRVAL_P(val) && SUCCESS != php_check_open_basedir(Z_STRVAL_P(val) TSRMLS_CC)) {
+                       if (CURLE_OK != (rc = curl_easy_setopt(ch, opt->option, NULL))) {
+                               rv = FAILURE;
+                       }
+               } else if (CURLE_OK != (rc = curl_easy_setopt(ch, opt->option, Z_STRVAL_P(val)))) {
+                       rv = FAILURE;
+               }
+               break;
+
+       case IS_DOUBLE:
+               if (opt->flags & PHP_HTTP_CURLE_OPTION_TRANSFORM_MS) {
+                       tmp = *val;
+                       Z_DVAL(tmp) *= 1000;
+                       val = &tmp;
+               }
+               if (opt->setter) {
+                       rv = opt->setter(opt, val, curl);
+               } else if (CURLE_OK != curl_easy_setopt(ch, opt->option, (long) Z_DVAL_P(val))) {
+                       rv = FAILURE;
+               }
+               break;
+
+       case IS_ARRAY:
+               if (opt->setter) {
+                       rv = opt->setter(opt, val, curl);
+               } else if (Z_TYPE_P(val) != IS_NULL) {
+                       rv = php_http_options_apply(&opt->suboptions, Z_ARRVAL_P(val), curl);
+               }
+               break;
+
+       default:
+               if (opt->setter) {
+                       rv = opt->setter(opt, val, curl);
+               } else {
+                       rv = FAILURE;
+               }
+               break;
+       }
+       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;
+}
+
+#if PHP_HTTP_CURL_VERSION(7,30,0)
+static ZEND_RESULT_CODE php_http_curlm_option_set_pipelining_bl(php_http_option_t *opt, zval *value, void *userdata)
+{
+       php_http_client_t *client = userdata;
+       php_http_client_curl_t *curl = client->ctx;
+       CURLM *ch = curl->handle;
+       HashTable tmp_ht;
+       char **bl = NULL;
+       TSRMLS_FETCH_FROM_CTX(client->ts);
+
+       /* array of char *, ending with a NULL */
+       if (value && Z_TYPE_P(value) != IS_NULL) {
+               zval **entry;
+               HashPosition pos;
+               HashTable *ht = HASH_OF(value);
+               int c = zend_hash_num_elements(ht);
+               char **ptr = ecalloc(c + 1, sizeof(char *));
+
+               bl = ptr;
+
+               zend_hash_init(&tmp_ht, c, NULL, ZVAL_PTR_DTOR, 0);
+               array_join(ht, &tmp_ht, 0, ARRAY_JOIN_STRINGIFY);
+
+               FOREACH_HASH_VAL(pos, &tmp_ht, entry) {
+                       *ptr++ = Z_STRVAL_PP(entry);
+               }
+       }
+
+       if (CURLM_OK != curl_multi_setopt(ch, opt->option, bl)) {
+               if (bl) {
+                       efree(bl);
+                       zend_hash_destroy(&tmp_ht);
+               }
+               return FAILURE;
+       }
+
+       if (bl) {
+               efree(bl);
+               zend_hash_destroy(&tmp_ht);
+       }
+       return SUCCESS;
+}
+#endif
+
+#if PHP_HTTP_HAVE_EVENT
+static inline ZEND_RESULT_CODE php_http_curlm_use_eventloop(php_http_client_t *h, zend_bool enable)
+{
+       php_http_client_curl_t *curl = h->ctx;
+
+       if ((curl->useevents = enable)) {
+               if (!curl->evbase) {
+                       curl->evbase = event_base_new();
+               }
+               if (!curl->timeout) {
+                       curl->timeout = ecalloc(1, sizeof(struct event));
+               }
+               curl_multi_setopt(curl->handle, CURLMOPT_SOCKETDATA, h);
+               curl_multi_setopt(curl->handle, CURLMOPT_SOCKETFUNCTION, php_http_curlm_socket_callback);
+               curl_multi_setopt(curl->handle, CURLMOPT_TIMERDATA, h);
+               curl_multi_setopt(curl->handle, CURLMOPT_TIMERFUNCTION, php_http_curlm_timer_callback);
+       } else {
+               curl_multi_setopt(curl->handle, CURLMOPT_SOCKETDATA, NULL);
+               curl_multi_setopt(curl->handle, CURLMOPT_SOCKETFUNCTION, NULL);
+               curl_multi_setopt(curl->handle, CURLMOPT_TIMERDATA, NULL);
+               curl_multi_setopt(curl->handle, CURLMOPT_TIMERFUNCTION, NULL);
+       }
+
+       return SUCCESS;
+}
+
+static ZEND_RESULT_CODE php_http_curlm_option_set_use_eventloop(php_http_option_t *opt, zval *value, void *userdata)
+{
+       php_http_client_t *client = userdata;
+
+       return php_http_curlm_use_eventloop(client, value && Z_BVAL_P(value));
+}
+#endif
+
+static void php_http_curlm_options_init(php_http_options_t *registry TSRMLS_DC)
+{
+       php_http_option_t *opt;
+
+       /* set size of connection cache */
+       if ((opt = php_http_option_register(registry, ZEND_STRL("maxconnects"), CURLMOPT_MAXCONNECTS, IS_LONG))) {
+               /* -1 == default, 0 == unlimited */
+               ZVAL_LONG(&opt->defval, -1);
+       }
+       /* set max number of connections to a single host */
+#if PHP_HTTP_CURL_VERSION(7,30,0)
+       php_http_option_register(registry, ZEND_STRL("max_host_connections"), CURLMOPT_MAX_HOST_CONNECTIONS, IS_LONG);
+#endif
+       /* maximum number of requests in a pipeline */
+#if PHP_HTTP_CURL_VERSION(7,30,0)
+       if ((opt = php_http_option_register(registry, ZEND_STRL("max_pipeline_length"), CURLMOPT_MAX_PIPELINE_LENGTH, IS_LONG))) {
+               ZVAL_LONG(&opt->defval, 5);
+       }
+#endif
+       /* max simultaneously open connections */
+#if PHP_HTTP_CURL_VERSION(7,30,0)
+       php_http_option_register(registry, ZEND_STRL("max_total_connections"), CURLMOPT_MAX_TOTAL_CONNECTIONS, IS_LONG);
+#endif
+       /* enable/disable HTTP pipelining */
+       php_http_option_register(registry, ZEND_STRL("pipelining"), CURLMOPT_PIPELINING, IS_BOOL);
+       /* chunk length threshold for pipelining */
+#if PHP_HTTP_CURL_VERSION(7,30,0)
+       php_http_option_register(registry, ZEND_STRL("chunk_length_penalty_size"), CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE, IS_LONG);
+#endif
+       /* size threshold for pipelining penalty */
+#if PHP_HTTP_CURL_VERSION(7,30,0)
+       php_http_option_register(registry, ZEND_STRL("content_length_penalty_size"), CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE, IS_LONG);
+#endif
+       /* pipelining server blacklist */
+#if PHP_HTTP_CURL_VERSION(7,30,0)
+       if ((opt = php_http_option_register(registry, ZEND_STRL("pipelining_server_bl"), CURLMOPT_PIPELINING_SERVER_BL, IS_ARRAY))) {
+               opt->setter = php_http_curlm_option_set_pipelining_bl;
+       }
+#endif
+       /* pipelining host blacklist */
+#if PHP_HTTP_CURL_VERSION(7,30,0)
+       if ((opt = php_http_option_register(registry, ZEND_STRL("pipelining_site_bl"), CURLMOPT_PIPELINING_SITE_BL, IS_ARRAY))) {
+               opt->setter = php_http_curlm_option_set_pipelining_bl;
+       }
+#endif
+       /* events */
+#if PHP_HTTP_HAVE_EVENT
+       if ((opt = php_http_option_register(registry, ZEND_STRL("use_eventloop"), 0, IS_BOOL))) {
+               opt->setter = php_http_curlm_option_set_use_eventloop;
+       }
+#endif
+}
+
+static ZEND_RESULT_CODE php_http_curlm_set_option(php_http_option_t *opt, zval *val, void *userdata)
+{
+       php_http_client_t *client = userdata;
+       php_http_client_curl_t *curl = client->ctx;
+       CURLM *ch = curl->handle;
+       zval *orig = val;
+       CURLMcode rc = CURLM_UNKNOWN_OPTION;
+       ZEND_RESULT_CODE rv = SUCCESS;
+       TSRMLS_FETCH_FROM_CTX(client->ts);
+
+       if (!val) {
+               val = &opt->defval;
+       } else if (opt->type && Z_TYPE_P(val) != opt->type && !(Z_TYPE_P(val) == IS_NULL && opt->type == IS_ARRAY)) {
+               val = php_http_ztyp(opt->type, val);
+       }
+
+       if (opt->setter) {
+               rv = opt->setter(opt, val, client);
+       } else {
+               switch (opt->type) {
+               case IS_BOOL:
+                       if (CURLM_OK != (rc = curl_multi_setopt(ch, opt->option, (long) Z_BVAL_P(val)))) {
+                               rv = FAILURE;
+                       }
+                       break;
+               case IS_LONG:
+                       if (CURLM_OK != (rc = curl_multi_setopt(ch, opt->option, Z_LVAL_P(val)))) {
+                               rv = FAILURE;
+                       }
+                       break;
+               default:
+                       rv = FAILURE;
+                       break;
+               }
+       }
+
+       if (val && val != orig && val != &opt->defval) {
+               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;
+}
+
+/* client ops */
+
+static ZEND_RESULT_CODE php_http_client_curl_handler_reset(php_http_client_curl_handler_t *curl)
+{
+       CURL *ch = curl->handle;
+       php_http_curle_storage_t *st;
+
+       if ((st = php_http_curle_get_storage(ch))) {
+               if (st->url) {
+                       pefree(st->url, 1);
+                       st->url = NULL;
+               }
+               if (st->cookiestore) {
+                       pefree(st->cookiestore, 1);
+                       st->cookiestore = NULL;
+               }
+               st->errorbuffer[0] = '\0';
+       }
+
+       curl_easy_setopt(ch, CURLOPT_URL, NULL);
+       curl_easy_setopt(ch, CURLOPT_CUSTOMREQUEST, NULL);
+       curl_easy_setopt(ch, CURLOPT_HTTPGET, 1L);
+       curl_easy_setopt(ch, CURLOPT_NOBODY, 0L);
+       /* libcurl < 7.19.6 does not clear auth info with USERPWD set to NULL */
+#if PHP_HTTP_CURL_VERSION(7,19,1)
+       curl_easy_setopt(ch, CURLOPT_PROXYUSERNAME, NULL);
+       curl_easy_setopt(ch, CURLOPT_PROXYPASSWORD, NULL);
+       curl_easy_setopt(ch, CURLOPT_USERNAME, NULL);
+       curl_easy_setopt(ch, CURLOPT_PASSWORD, NULL);
+#endif
+
+#if PHP_HTTP_CURL_VERSION(7,21,3)
+       if (curl->options.resolve) {
+               curl_slist_free_all(curl->options.resolve);
+               curl->options.resolve = NULL;
+       }
+#endif
+       curl->options.retry.count = 0;
+       curl->options.retry.delay = 0;
+       curl->options.redirects = 0;
+       curl->options.encode_cookies = 1;
+
+       if (curl->options.headers) {
+               curl_slist_free_all(curl->options.headers);
+               curl->options.headers = NULL;
+       }
+       if (curl->options.proxyheaders) {
+               curl_slist_free_all(curl->options.proxyheaders);
+               curl->options.proxyheaders = NULL;
+       }
+
+       php_http_buffer_reset(&curl->options.cookies);
+       php_http_buffer_reset(&curl->options.ranges);
+
+       return SUCCESS;
+}
+
+static php_http_client_curl_handler_t *php_http_client_curl_handler_init(php_http_client_t *h, php_resource_factory_t *rf)
+{
+       void *handle;
+       php_http_client_curl_handler_t *handler;
+       TSRMLS_FETCH_FROM_CTX(h->ts);
+
+       if (!(handle = php_resource_factory_handle_ctor(rf, NULL TSRMLS_CC))) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to initialize curl handle");
+               return NULL;
+       }
+
+       handler = ecalloc(1, sizeof(*handler));
+       handler->rf = rf;
+       handler->client = h;
+       handler->handle = handle;
+       handler->response.body = php_http_message_body_init(NULL, NULL TSRMLS_CC);
+       php_http_buffer_init(&handler->response.headers);
+       php_http_buffer_init(&handler->options.cookies);
+       php_http_buffer_init(&handler->options.ranges);
+       zend_hash_init(&handler->options.cache, 0, NULL, ZVAL_PTR_DTOR, 0);
+
+#if defined(ZTS)
+       curl_easy_setopt(handle, CURLOPT_NOSIGNAL, 1L);
+#endif
+       curl_easy_setopt(handle, CURLOPT_HEADER, 0L);
+       curl_easy_setopt(handle, CURLOPT_FILETIME, 1L);
+       curl_easy_setopt(handle, CURLOPT_AUTOREFERER, 1L);
+       curl_easy_setopt(handle, CURLOPT_VERBOSE, 1L);
+       curl_easy_setopt(handle, CURLOPT_NOPROGRESS, 0L);
+       curl_easy_setopt(handle, CURLOPT_HEADERFUNCTION, php_http_curle_header_callback);
+       curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, php_http_curle_body_callback);
+       curl_easy_setopt(handle, CURLOPT_DEBUGFUNCTION, php_http_curle_raw_callback);
+       curl_easy_setopt(handle, CURLOPT_READFUNCTION, php_http_curle_read_callback);
+       curl_easy_setopt(handle, CURLOPT_SEEKFUNCTION, php_http_curle_seek_callback);
+#if PHP_HTTP_CURL_VERSION(7,32,0)
+       curl_easy_setopt(handle, CURLOPT_XFERINFOFUNCTION, php_http_curle_xferinfo_callback);
+       curl_easy_setopt(handle, CURLOPT_XFERINFODATA, handler);
+#else
+       curl_easy_setopt(handle, CURLOPT_PROGRESSFUNCTION, php_http_curle_progress_callback);
+       curl_easy_setopt(handle, CURLOPT_PROGRESSDATA, handler);
+#endif
+       curl_easy_setopt(handle, CURLOPT_DEBUGDATA, handler);
+       curl_easy_setopt(handle, CURLOPT_WRITEDATA, handler);
+       curl_easy_setopt(handle, CURLOPT_HEADERDATA, handler);
+
+       php_http_client_curl_handler_reset(handler);
+
+       return handler;
+}
+
+
+static ZEND_RESULT_CODE php_http_client_curl_handler_prepare(php_http_client_curl_handler_t *curl, php_http_client_enqueue_t *enqueue)
+{
+       size_t body_size;
+       php_http_message_t *msg = enqueue->request;
+       php_http_curle_storage_t *storage = php_http_curle_get_storage(curl->handle);
+       TSRMLS_FETCH_FROM_CTX(curl->client->ts);
+
+       /* request url */
+       if (!PHP_HTTP_INFO(msg).request.url) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot request empty URL");
+               return FAILURE;
+       }
+       storage->errorbuffer[0] = '\0';
+       if (storage->url) {
+               pefree(storage->url, 1);
+       }
+       php_http_url_to_string(PHP_HTTP_INFO(msg).request.url, &storage->url, NULL, 1);
+       curl_easy_setopt(curl->handle, CURLOPT_URL, storage->url);
+
+       /* apply options */
+       php_http_options_apply(&php_http_curle_options, enqueue->options, curl);
+
+       /* request headers */
+       php_http_message_update_headers(msg);
+       if (zend_hash_num_elements(&msg->hdrs)) {
+               php_http_array_hashkey_t header_key = php_http_array_hashkey_init(0);
+               zval **header_val, *header_cpy;
+               HashPosition pos;
+               php_http_buffer_t header;
+#if !PHP_HTTP_CURL_VERSION(7,23,0)
+               zval **ct = NULL;
+
+               zend_hash_find(&msg->hdrs, ZEND_STRS("Content-Length"), (void *) &ct);
+#endif
+
+               php_http_buffer_init(&header);
+               FOREACH_HASH_KEYVAL(pos, &msg->hdrs, header_key, header_val) {
+                       if (header_key.type == HASH_KEY_IS_STRING) {
+#if !PHP_HTTP_CURL_VERSION(7,23,0)
+                               /* avoid duplicate content-length header */
+                               if (ct && *ct == *header_val) {
+                                       continue;
+                               }
+#endif
+                               header_cpy = php_http_ztyp(IS_STRING, *header_val);
+                               php_http_buffer_appendf(&header, "%s: %s", header_key.str, Z_STRVAL_P(header_cpy));
+                               php_http_buffer_fix(&header);
+                               curl->options.headers = curl_slist_append(curl->options.headers, header.data);
+                               php_http_buffer_reset(&header);
 
-static php_http_client_ops_t php_http_client_curl_ops = {
-       &php_http_client_curl_resource_factory_ops,
-       php_http_client_curl_init,
-       php_http_client_curl_copy,
-       php_http_client_curl_dtor,
-       php_http_client_curl_reset,
-       php_http_client_curl_exec,
-       php_http_client_curl_setopt,
-       php_http_client_curl_getopt,
-       (php_http_new_t) php_http_client_curl_object_new_ex,
-       get_class_entry
-};
+                               zval_ptr_dtor(&header_cpy);
+                       }
+               }
+               php_http_buffer_dtor(&header);
+       }
+       curl_easy_setopt(curl->handle, CURLOPT_HTTPHEADER, curl->options.headers);
+
+       /* attach request body */
+       if ((body_size = php_http_message_body_size(msg->body))) {
+               /* RFC2616, section 4.3 (para. 4) states that Â»a message-body MUST NOT be included in a request if the
+                * specification of the request method (section 5.1.1) does not allow sending an entity-body in request.«
+                * Following the clause in section 5.1.1 (para. 2) that request methods Â»MUST be implemented with the
+                * same semantics as those specified in section 9« reveal that not any single defined HTTP/1.1 method
+                * does not allow a request body.
+                */
+               php_stream_rewind(php_http_message_body_stream(msg->body));
+               curl_easy_setopt(curl->handle, CURLOPT_SEEKDATA, msg->body);
+               curl_easy_setopt(curl->handle, CURLOPT_READDATA, msg->body);
+               curl_easy_setopt(curl->handle, CURLOPT_INFILESIZE, body_size);
+               curl_easy_setopt(curl->handle, CURLOPT_POSTFIELDSIZE, body_size);
+               curl_easy_setopt(curl->handle, CURLOPT_POST, 1L);
+       } else {
+               curl_easy_setopt(curl->handle, CURLOPT_SEEKDATA, NULL);
+               curl_easy_setopt(curl->handle, CURLOPT_READDATA, NULL);
+               curl_easy_setopt(curl->handle, CURLOPT_INFILESIZE, 0L);
+               curl_easy_setopt(curl->handle, CURLOPT_POSTFIELDSIZE, 0L);
+       }
+
+       /*
+        * Always use CUSTOMREQUEST, else curl won't send any request body for GET etc.
+        * See e.g. bug #69313.
+        *
+        * Here's what curl does:
+        * - CURLOPT_HTTPGET: ignore request body
+        * - CURLOPT_UPLOAD: set "Expect: 100-continue" header
+        * - CURLOPT_POST: set "Content-Type: application/x-www-form-urlencoded" header
+        * Now select the least bad.
+        *
+        * See also https://tools.ietf.org/html/rfc7231#section-5.1.1
+        */
+       if (PHP_HTTP_INFO(msg).request.method) {
+               if (!strcasecmp("PUT", PHP_HTTP_INFO(msg).request.method)) {
+                       curl_easy_setopt(curl->handle, CURLOPT_UPLOAD, 1L);
+               } else {
+                       curl_easy_setopt(curl->handle, CURLOPT_CUSTOMREQUEST, PHP_HTTP_INFO(msg).request.method);
+               }
+       } else {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot use empty request method");
+               return FAILURE;
+       }
+
+       return SUCCESS;
+}
 
-PHP_HTTP_API php_http_client_ops_t *php_http_client_curl_get_ops(void)
+static void php_http_client_curl_handler_clear(php_http_client_curl_handler_t *handler)
 {
-       return &php_http_client_curl_ops;
+       curl_easy_setopt(handler->handle, CURLOPT_NOPROGRESS, 1L);
+#if PHP_HTTP_CURL_VERSION(7,32,0)
+       curl_easy_setopt(handler->handle, CURLOPT_XFERINFOFUNCTION, NULL);
+#else
+       curl_easy_setopt(handler->handle, CURLOPT_PROGRESSFUNCTION, NULL);
+#endif
+       curl_easy_setopt(handler->handle, CURLOPT_VERBOSE, 0L);
+       curl_easy_setopt(handler->handle, CURLOPT_DEBUGFUNCTION, NULL);
 }
 
+static void php_http_client_curl_handler_dtor(php_http_client_curl_handler_t *handler)
+{
+       TSRMLS_FETCH_FROM_CTX(handler->client->ts);
+
+       php_http_client_curl_handler_clear(handler);
 
-#define PHP_HTTP_BEGIN_ARGS(method, req_args)          PHP_HTTP_BEGIN_ARGS_EX(HttpClientCURL, method, 0, req_args)
-#define PHP_HTTP_EMPTY_ARGS(method)                                    PHP_HTTP_EMPTY_ARGS_EX(HttpClientCURL, method, 0)
-#define PHP_HTTP_CLIENT_CURL_ME(method, visibility)    PHP_ME(HttpClientCURL, method, PHP_HTTP_ARGS(HttpClientCURL, method), visibility)
-#define PHP_HTTP_CLIENT_CURL_CLIENT_MALIAS(me, vis)    ZEND_FENTRY(me, ZEND_MN(HttpClient_##me), PHP_HTTP_ARGS(HttpClientCURL, me), vis)
+       php_resource_factory_handle_dtor(handler->rf, handler->handle TSRMLS_CC);
+       php_resource_factory_free(&handler->rf);
 
-PHP_HTTP_BEGIN_ARGS(send, 1)
-       PHP_HTTP_ARG_VAL(request, 0)
-PHP_HTTP_END_ARGS;
+       php_http_message_body_free(&handler->response.body);
+       php_http_buffer_dtor(&handler->response.headers);
+       php_http_buffer_dtor(&handler->options.ranges);
+       php_http_buffer_dtor(&handler->options.cookies);
+       zend_hash_destroy(&handler->options.cache);
 
-zend_class_entry *php_http_client_curl_class_entry;
-zend_function_entry php_http_client_curl_method_entry[] = {
-       PHP_HTTP_CLIENT_CURL_CLIENT_MALIAS(send, ZEND_ACC_PUBLIC)
-       EMPTY_FUNCTION_ENTRY
-};
+       if (handler->options.headers) {
+               curl_slist_free_all(handler->options.headers);
+               handler->options.headers = NULL;
+       }
+
+       efree(handler);
+}
+
+static php_http_client_t *php_http_client_curl_init(php_http_client_t *h, void *handle)
+{
+       php_http_client_curl_t *curl;
+       TSRMLS_FETCH_FROM_CTX(h->ts);
+
+       if (!handle && !(handle = php_resource_factory_handle_ctor(h->rf, NULL TSRMLS_CC))) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to initialize curl handle");
+               return NULL;
+       }
+
+       curl = ecalloc(1, sizeof(*curl));
+       curl->handle = handle;
+       curl->unfinished = 0;
+       h->ctx = curl;
+
+       return h;
+}
+
+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;
+       }
+#endif
+       curl->unfinished = 0;
+
+       php_resource_factory_handle_dtor(h->rf, curl->handle TSRMLS_CC);
+
+       efree(curl);
+       h->ctx = NULL;
+}
+
+static void queue_dtor(php_http_client_enqueue_t *e)
+{
+       php_http_client_curl_handler_t *handler = e->opaque;
+
+       if (handler->queue.dtor) {
+               e->opaque = handler->queue.opaque;
+               handler->queue.dtor(e);
+       }
+       php_http_client_curl_handler_dtor(handler);
+}
+
+static php_resource_factory_t *create_rf(php_http_client_t *h, php_http_client_enqueue_t *enqueue TSRMLS_DC)
+{
+       php_persistent_handle_factory_t *pf = NULL;
+       php_resource_factory_t *rf = NULL;
+       php_http_url_t *url = enqueue->request->http.info.request.url;
+
+       if (!url || (!url->host && !url->path)) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot request empty URL");
+               return NULL;
+       }
+
+       /* only if the client itself is setup for persistence */
+       if (h->rf->dtor == (void (*)(void*)) php_persistent_handle_abandon) {
+               char *id_str = NULL;
+               size_t id_len;
+               int port = url->port ? url->port : 80;
+               zval **zport;
+
+               if (SUCCESS == zend_hash_find(enqueue->options, ZEND_STRS("port"), (void *) &zport)) {
+                       zval *zcpy = php_http_ztyp(IS_LONG, *zport);
+
+                       if (Z_LVAL_P(zcpy)) {
+                               port = Z_LVAL_P(zcpy);
+                       }
+                       zval_ptr_dtor(&zcpy);
+               }
+
+               id_len = spprintf(&id_str, 0, "%s:%d", STR_PTR(url->host), port);
+               pf = php_persistent_handle_concede(NULL, ZEND_STRL("http\\Client\\Curl\\Request"), id_str, id_len, NULL, NULL TSRMLS_CC);
+               efree(id_str);
+       }
+
+       if (pf) {
+               rf = php_resource_factory_init(NULL, php_persistent_handle_get_resource_factory_ops(), pf, (void (*)(void*)) php_persistent_handle_abandon);
+       } else {
+               rf = php_resource_factory_init(NULL, &php_http_curle_resource_factory_ops, NULL, NULL);
+       }
+
+       return rf;
+}
+
+static ZEND_RESULT_CODE php_http_client_curl_enqueue(php_http_client_t *h, php_http_client_enqueue_t *enqueue)
+{
+       CURLMcode rs;
+       php_http_client_curl_t *curl = h->ctx;
+       php_http_client_curl_handler_t *handler;
+       php_http_client_progress_state_t *progress;
+       php_resource_factory_t *rf;
+       TSRMLS_FETCH_FROM_CTX(h->ts);
+
+       rf = create_rf(h, enqueue TSRMLS_CC);
+       if (!rf) {
+               return FAILURE;
+       }
+
+       handler = php_http_client_curl_handler_init(h, rf);
+       if (!handler) {
+               return FAILURE;
+       }
+
+       if (SUCCESS != php_http_client_curl_handler_prepare(handler, enqueue)) {
+               php_http_client_curl_handler_dtor(handler);
+               return FAILURE;
+       }
+
+       handler->queue = *enqueue;
+       enqueue->opaque = handler;
+       enqueue->dtor = queue_dtor;
+
+       if (CURLM_OK == (rs = curl_multi_add_handle(curl->handle, handler->handle))) {
+               zend_llist_add_element(&h->requests, enqueue);
+               ++curl->unfinished;
+
+               if (h->callback.progress.func && SUCCESS == php_http_client_getopt(h, PHP_HTTP_CLIENT_OPT_PROGRESS_INFO, enqueue->request, &progress)) {
+                       progress->info = "start";
+                       h->callback.progress.func(h->callback.progress.arg, h, &handler->queue, progress);
+                       progress->started = 1;
+               }
+
+               return SUCCESS;
+       } else {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not enqueue request: %s", curl_multi_strerror(rs));
+               return FAILURE;
+       }
+}
+
+static ZEND_RESULT_CODE php_http_client_curl_dequeue(php_http_client_t *h, php_http_client_enqueue_t *enqueue)
+{
+       CURLMcode rs;
+       php_http_client_curl_t *curl = h->ctx;
+       php_http_client_curl_handler_t *handler = enqueue->opaque;
+       TSRMLS_FETCH_FROM_CTX(h->ts);
+
+       php_http_client_curl_handler_clear(handler);
+       if (CURLM_OK == (rs = curl_multi_remove_handle(curl->handle, handler->handle))) {
+               zend_llist_del_element(&h->requests, handler->handle, (int (*)(void *, void *)) compare_queue);
+               return SUCCESS;
+       } else {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not dequeue request: %s", curl_multi_strerror(rs));
+       }
+
+       return FAILURE;
+}
+
+static void php_http_client_curl_reset(php_http_client_t *h)
+{
+       zend_llist_element *next_el, *this_el;
+
+       for (this_el = h->requests.head; this_el; this_el = next_el) {
+               next_el = this_el->next;
+               php_http_client_curl_dequeue(h, (void *) this_el->data);
+       }
+}
 
-zend_object_value php_http_client_curl_object_new(zend_class_entry *ce TSRMLS_DC)
+static inline void php_http_client_curl_get_timeout(php_http_client_curl_t *curl, long max_tout, struct timeval *timeout)
 {
-       return php_http_client_curl_object_new_ex(ce, NULL, NULL TSRMLS_CC);
+       if ((CURLM_OK == curl_multi_timeout(curl->handle, &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
+#      define SELECT_ERROR -1
+#endif
+
+static ZEND_RESULT_CODE php_http_client_curl_wait(php_http_client_t *h, struct timeval *custom_timeout)
+{
+       int MAX;
+       fd_set R, W, E;
+       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;
+       }
+#endif
+
+       FD_ZERO(&R);
+       FD_ZERO(&W);
+       FD_ZERO(&E);
+
+       if (CURLM_OK == curl_multi_fdset(curl->handle, &R, &W, &E, &MAX)) {
+               if (custom_timeout && timerisset(custom_timeout)) {
+                       timeout = *custom_timeout;
+               } else {
+                       php_http_client_curl_get_timeout(curl, 1000, &timeout);
+               }
+
+               if (MAX == -1) {
+                       php_http_sleep((double) timeout.tv_sec + (double) (timeout.tv_usec / PHP_HTTP_MCROSEC));
+                       return SUCCESS;
+               } else if (SELECT_ERROR != select(MAX + 1, &R, &W, &E, &timeout)) {
+                       return SUCCESS;
+               }
+       }
+       return FAILURE;
+}
+
+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, &curl->unfinished));
+
+       php_http_curlm_responsehandler(h);
+
+       return curl->unfinished;
+
+}
+
+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 (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)) {
+#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());
+#else
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", strerror(errno));
+#endif
+                               return FAILURE;
+                       }
+               }
+       }
+
+       return SUCCESS;
+}
+
+static ZEND_RESULT_CODE php_http_client_curl_setopt(php_http_client_t *h, php_http_client_setopt_opt_t opt, void *arg)
+{
+       php_http_client_curl_t *curl = h->ctx;
+
+       switch (opt) {
+               case PHP_HTTP_CLIENT_OPT_CONFIGURATION:
+                       return php_http_options_apply(&php_http_curlm_options, (HashTable *) arg,  h);
+                       break;
+
+               case PHP_HTTP_CLIENT_OPT_ENABLE_PIPELINING:
+                       if (CURLM_OK != curl_multi_setopt(curl->handle, CURLMOPT_PIPELINING, (long) *((zend_bool *) arg))) {
+                               return FAILURE;
+                       }
+                       break;
+
+               case PHP_HTTP_CLIENT_OPT_USE_EVENTS:
+#if PHP_HTTP_HAVE_EVENT
+                       return php_http_curlm_use_eventloop(h, *(zend_bool *) arg);
+                       break;
+#endif
+
+               default:
+                       return FAILURE;
+       }
+       return SUCCESS;
 }
 
-zend_object_value php_http_client_curl_object_new_ex(zend_class_entry *ce, php_http_client_t *r, php_http_client_object_t **ptr TSRMLS_DC)
+static int apply_available_options(void *pDest TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key)
 {
-       zend_object_value ov;
-       php_http_client_object_t *o;
+       php_http_option_t *opt = pDest;
+       HashTable *ht;
+       zval *entry;
+       int c;
 
-       o = ecalloc(1, sizeof(php_http_client_object_t));
-       zend_object_std_init((zend_object *) o, ce TSRMLS_CC);
-       object_properties_init((zend_object *) o, ce);
+       ht = va_arg(args, HashTable*);
 
-       if (!(o->client = r)) {
-               o->client = php_http_client_init(NULL, &php_http_client_curl_ops, NULL, NULL TSRMLS_CC);
+       MAKE_STD_ZVAL(entry);
+
+       if ((c = zend_hash_num_elements(&opt->suboptions.options))) {
+               array_init_size(entry, c);
+               zend_hash_apply_with_arguments(&opt->suboptions.options TSRMLS_CC, apply_available_options, 1, Z_ARRVAL_P(entry));
+       } else {
+               /* catch deliberate NULL options */
+               if (Z_TYPE(opt->defval) == IS_STRING && !Z_STRVAL(opt->defval)) {
+                       ZVAL_NULL(entry);
+               } else {
+                       ZVAL_COPY_VALUE(entry, &opt->defval);
+                       zval_copy_ctor(entry);
+               }
        }
 
-       if (ptr) {
-               *ptr = o;
+       if (hash_key->nKeyLength) {
+               zend_hash_quick_update(ht, hash_key->arKey, hash_key->nKeyLength, hash_key->h, (void *) &entry, sizeof(zval *), NULL);
+       } else {
+               zend_hash_index_update(ht, hash_key->h, (void *) &entry, sizeof(zval *), NULL);
        }
 
-       ov.handle = zend_objects_store_put(o, NULL, php_http_client_object_free, NULL TSRMLS_CC);
-       ov.handlers = php_http_client_get_object_handlers();
+       return ZEND_HASH_APPLY_KEEP;
+}
+
+static ZEND_RESULT_CODE php_http_client_curl_getopt(php_http_client_t *h, php_http_client_getopt_opt_t opt, void *arg, void **res)
+{
+       php_http_client_enqueue_t *enqueue;
+       TSRMLS_FETCH_FROM_CTX(h->ts);
+
+       switch (opt) {
+       case PHP_HTTP_CLIENT_OPT_PROGRESS_INFO:
+               if ((enqueue = php_http_client_enqueued(h, arg, NULL))) {
+                       php_http_client_curl_handler_t *handler = enqueue->opaque;
+
+                       *((php_http_client_progress_state_t **) res) = &handler->progress;
+                       return SUCCESS;
+               }
+               break;
+
+       case PHP_HTTP_CLIENT_OPT_TRANSFER_INFO:
+               if ((enqueue = php_http_client_enqueued(h, arg, NULL))) {
+                       php_http_client_curl_handler_t *handler = enqueue->opaque;
+
+                       php_http_curle_get_info(handler->handle, *(HashTable **) res);
+                       return SUCCESS;
+               }
+               break;
+
+       case PHP_HTTP_CLIENT_OPT_AVAILABLE_OPTIONS:
+               zend_hash_apply_with_arguments(&php_http_curle_options.options TSRMLS_CC, apply_available_options, 1, *(HashTable **) res);
+               break;
+
+       case PHP_HTTP_CLIENT_OPT_AVAILABLE_CONFIGURATION:
+               zend_hash_apply_with_arguments(&php_http_curlm_options.options TSRMLS_CC, apply_available_options, 1, *(HashTable **) res);
+               break;
+
+       default:
+               break;
+       }
 
-       return ov;
+       return FAILURE;
 }
 
+static php_http_client_ops_t php_http_client_curl_ops = {
+       &php_http_curlm_resource_factory_ops,
+       php_http_client_curl_init,
+       NULL /* copy */,
+       php_http_client_curl_dtor,
+       php_http_client_curl_reset,
+       php_http_client_curl_exec,
+       php_http_client_curl_wait,
+       php_http_client_curl_once,
+       php_http_client_curl_enqueue,
+       php_http_client_curl_dequeue,
+       php_http_client_curl_setopt,
+       php_http_client_curl_getopt
+};
+
+php_http_client_ops_t *php_http_client_curl_get_ops(void)
+{
+       return &php_http_client_curl_ops;
+}
 
 PHP_MINIT_FUNCTION(http_client_curl)
 {
-       if (SUCCESS != php_http_persistent_handle_provide(ZEND_STRL("http_client.curl"), &php_http_client_curl_resource_factory_ops, NULL, NULL)) {
+       php_http_options_t *options;
+       php_http_client_driver_t driver = {
+               ZEND_STRL("curl"),
+               &php_http_client_curl_ops
+       };
+
+       if (SUCCESS != php_http_client_driver_add(&driver)) {
                return FAILURE;
        }
 
-       PHP_HTTP_REGISTER_CLASS(http\\Client, CURL, http_client_curl, php_http_client_get_class_entry(), 0);
-       php_http_client_curl_class_entry->create_object = php_http_client_curl_object_new;
+       if (SUCCESS != php_persistent_handle_provide(ZEND_STRL("http\\Client\\Curl"), &php_http_curlm_resource_factory_ops, NULL, NULL TSRMLS_CC)) {
+               return FAILURE;
+       }
+       if (SUCCESS != php_persistent_handle_provide(ZEND_STRL("http\\Client\\Curl\\Request"), &php_http_curle_resource_factory_ops, NULL, NULL TSRMLS_CC)) {
+               return FAILURE;
+       }
+
+       if ((options = php_http_options_init(&php_http_curle_options, 1))) {
+               options->getter = php_http_curle_get_option;
+               options->setter = php_http_curle_set_option;
+
+               php_http_curle_options_init(options TSRMLS_CC);
+       }
+       if ((options = php_http_options_init(&php_http_curlm_options, 1))) {
+               options->getter = php_http_option_get;
+               options->setter = php_http_curlm_set_option;
+
+               php_http_curlm_options_init(options TSRMLS_CC);
+       }
 
        /*
        * HTTP Protocol Version Constants
        */
-       zend_declare_class_constant_long(php_http_client_curl_class_entry, ZEND_STRL("HTTP_VERSION_1_0"), CURL_HTTP_VERSION_1_0 TSRMLS_CC);
-       zend_declare_class_constant_long(php_http_client_curl_class_entry, ZEND_STRL("HTTP_VERSION_1_1"), CURL_HTTP_VERSION_1_1 TSRMLS_CC);
-       zend_declare_class_constant_long(php_http_client_curl_class_entry, ZEND_STRL("HTTP_VERSION_NONE"), CURL_HTTP_VERSION_NONE TSRMLS_CC); /* to be removed */
-       zend_declare_class_constant_long(php_http_client_curl_class_entry, ZEND_STRL("HTTP_VERSION_ANY"), CURL_HTTP_VERSION_NONE TSRMLS_CC);
+       REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "HTTP_VERSION_1_0", CURL_HTTP_VERSION_1_0, CONST_CS|CONST_PERSISTENT);
+       REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "HTTP_VERSION_1_1", CURL_HTTP_VERSION_1_1, CONST_CS|CONST_PERSISTENT);
+#if PHP_HTTP_CURL_VERSION(7,33,0)
+       REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "HTTP_VERSION_2_0", CURL_HTTP_VERSION_2_0, CONST_CS|CONST_PERSISTENT);
+#endif
+       REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "HTTP_VERSION_ANY", CURL_HTTP_VERSION_NONE, CONST_CS|CONST_PERSISTENT);
 
        /*
        * SSL Version Constants
        */
-       zend_declare_class_constant_long(php_http_client_curl_class_entry, ZEND_STRL("SSL_VERSION_TLSv1"), CURL_SSLVERSION_TLSv1 TSRMLS_CC);
-       zend_declare_class_constant_long(php_http_client_curl_class_entry, ZEND_STRL("SSL_VERSION_SSLv2"), CURL_SSLVERSION_SSLv2 TSRMLS_CC);
-       zend_declare_class_constant_long(php_http_client_curl_class_entry, ZEND_STRL("SSL_VERSION_SSLv3"), CURL_SSLVERSION_SSLv3 TSRMLS_CC);
-       zend_declare_class_constant_long(php_http_client_curl_class_entry, ZEND_STRL("SSL_VERSION_ANY"), CURL_SSLVERSION_DEFAULT TSRMLS_CC);
+       REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "SSL_VERSION_TLSv1", CURL_SSLVERSION_TLSv1, CONST_CS|CONST_PERSISTENT);
+#if PHP_HTTP_CURL_VERSION(7,34,0)
+       REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "SSL_VERSION_TLSv1_0", CURL_SSLVERSION_TLSv1_0, CONST_CS|CONST_PERSISTENT);
+       REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "SSL_VERSION_TLSv1_1", CURL_SSLVERSION_TLSv1_1, CONST_CS|CONST_PERSISTENT);
+       REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "SSL_VERSION_TLSv1_2", CURL_SSLVERSION_TLSv1_2, CONST_CS|CONST_PERSISTENT);
+#endif
+       REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "SSL_VERSION_SSLv2", CURL_SSLVERSION_SSLv2, CONST_CS|CONST_PERSISTENT);
+       REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "SSL_VERSION_SSLv3", CURL_SSLVERSION_SSLv3, CONST_CS|CONST_PERSISTENT);
+       REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "SSL_VERSION_ANY", CURL_SSLVERSION_DEFAULT, CONST_CS|CONST_PERSISTENT);
+#if PHP_HTTP_CURL_VERSION(7,21,4) && defined(PHP_HTTP_CURL_TLSAUTH_SRP)
+       REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "TLSAUTH_SRP", CURL_TLSAUTH_SRP, CONST_CS|CONST_PERSISTENT);
+#endif
 
        /*
        * DNS IPvX resolving
        */
-       zend_declare_class_constant_long(php_http_client_curl_class_entry, ZEND_STRL("IPRESOLVE_V4"), CURL_IPRESOLVE_V4 TSRMLS_CC);
-       zend_declare_class_constant_long(php_http_client_curl_class_entry, ZEND_STRL("IPRESOLVE_V6"), CURL_IPRESOLVE_V6 TSRMLS_CC);
-       zend_declare_class_constant_long(php_http_client_curl_class_entry, ZEND_STRL("IPRESOLVE_ANY"), CURL_IPRESOLVE_WHATEVER TSRMLS_CC);
+       REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "IPRESOLVE_V4", CURL_IPRESOLVE_V4, CONST_CS|CONST_PERSISTENT);
+       REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "IPRESOLVE_V6", CURL_IPRESOLVE_V6, CONST_CS|CONST_PERSISTENT);
+       REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "IPRESOLVE_ANY", CURL_IPRESOLVE_WHATEVER, CONST_CS|CONST_PERSISTENT);
 
        /*
        * Auth Constants
        */
-       zend_declare_class_constant_long(php_http_client_curl_class_entry, ZEND_STRL("AUTH_BASIC"), CURLAUTH_BASIC TSRMLS_CC);
-       zend_declare_class_constant_long(php_http_client_curl_class_entry, ZEND_STRL("AUTH_DIGEST"), CURLAUTH_DIGEST TSRMLS_CC);
+       REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "AUTH_BASIC", CURLAUTH_BASIC, CONST_CS|CONST_PERSISTENT);
+       REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "AUTH_DIGEST", CURLAUTH_DIGEST, CONST_CS|CONST_PERSISTENT);
 #if PHP_HTTP_CURL_VERSION(7,19,3)
-       zend_declare_class_constant_long(php_http_client_curl_class_entry, ZEND_STRL("AUTH_DIGEST_IE"), CURLAUTH_DIGEST_IE TSRMLS_CC);
+       REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "AUTH_DIGEST_IE", CURLAUTH_DIGEST_IE, CONST_CS|CONST_PERSISTENT);
 #endif
-       zend_declare_class_constant_long(php_http_client_curl_class_entry, ZEND_STRL("AUTH_NTLM"), CURLAUTH_NTLM TSRMLS_CC);
-       zend_declare_class_constant_long(php_http_client_curl_class_entry, ZEND_STRL("AUTH_GSSNEG"), CURLAUTH_GSSNEGOTIATE TSRMLS_CC);
-       zend_declare_class_constant_long(php_http_client_curl_class_entry, ZEND_STRL("AUTH_ANY"), CURLAUTH_ANY TSRMLS_CC);
+       REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "AUTH_NTLM", CURLAUTH_NTLM, CONST_CS|CONST_PERSISTENT);
+       REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "AUTH_GSSNEG", CURLAUTH_GSSNEGOTIATE, CONST_CS|CONST_PERSISTENT);
+#if PHP_HTTP_CURL_VERSION(7,38,0)
+       REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "AUTH_SPNEGO", CURLAUTH_NEGOTIATE, CONST_CS|CONST_PERSISTENT);
+#endif
+       REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "AUTH_ANY", CURLAUTH_ANY, CONST_CS|CONST_PERSISTENT);
 
        /*
        * Proxy Type Constants
        */
-       zend_declare_class_constant_long(php_http_client_curl_class_entry, ZEND_STRL("PROXY_SOCKS4"), CURLPROXY_SOCKS4 TSRMLS_CC);
-       zend_declare_class_constant_long(php_http_client_curl_class_entry, ZEND_STRL("PROXY_SOCKS4A"), CURLPROXY_SOCKS5 TSRMLS_CC);
-       zend_declare_class_constant_long(php_http_client_curl_class_entry, ZEND_STRL("PROXY_SOCKS5_HOSTNAME"), CURLPROXY_SOCKS5 TSRMLS_CC);
-       zend_declare_class_constant_long(php_http_client_curl_class_entry, ZEND_STRL("PROXY_SOCKS5"), CURLPROXY_SOCKS5 TSRMLS_CC);
-       zend_declare_class_constant_long(php_http_client_curl_class_entry, ZEND_STRL("PROXY_HTTP"), CURLPROXY_HTTP TSRMLS_CC);
-#      if PHP_HTTP_CURL_VERSION(7,19,4)
-       zend_declare_class_constant_long(php_http_client_curl_class_entry, ZEND_STRL("PROXY_HTTP_1_0"), CURLPROXY_HTTP_1_0 TSRMLS_CC);
-#      endif
+       REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "PROXY_SOCKS4", CURLPROXY_SOCKS4, CONST_CS|CONST_PERSISTENT);
+       REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "PROXY_SOCKS4A", CURLPROXY_SOCKS5, CONST_CS|CONST_PERSISTENT);
+       REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "PROXY_SOCKS5_HOSTNAME", CURLPROXY_SOCKS5, CONST_CS|CONST_PERSISTENT);
+       REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "PROXY_SOCKS5", CURLPROXY_SOCKS5, CONST_CS|CONST_PERSISTENT);
+       REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "PROXY_HTTP", CURLPROXY_HTTP, CONST_CS|CONST_PERSISTENT);
+#if PHP_HTTP_CURL_VERSION(7,19,4)
+       REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "PROXY_HTTP_1_0", CURLPROXY_HTTP_1_0, CONST_CS|CONST_PERSISTENT);
+#endif
 
        /*
        * Post Redirection Constants
        */
 #if PHP_HTTP_CURL_VERSION(7,19,1)
-       zend_declare_class_constant_long(php_http_client_curl_class_entry, ZEND_STRL("POSTREDIR_301"), CURL_REDIR_POST_301 TSRMLS_CC);
-       zend_declare_class_constant_long(php_http_client_curl_class_entry, ZEND_STRL("POSTREDIR_302"), CURL_REDIR_POST_302 TSRMLS_CC);
-       zend_declare_class_constant_long(php_http_client_curl_class_entry, ZEND_STRL("POSTREDIR_ALL"), CURL_REDIR_POST_ALL TSRMLS_CC);
+       REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "POSTREDIR_301", CURL_REDIR_POST_301, CONST_CS|CONST_PERSISTENT);
+       REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "POSTREDIR_302", CURL_REDIR_POST_302, CONST_CS|CONST_PERSISTENT);
+#if PHP_HTTP_CURL_VERSION(7,26,0)
+       REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "POSTREDIR_303", CURL_REDIR_POST_303, CONST_CS|CONST_PERSISTENT);
 #endif
+       REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "POSTREDIR_ALL", CURL_REDIR_POST_ALL, CONST_CS|CONST_PERSISTENT);
+#endif
+
+       return SUCCESS;
+}
+
+PHP_MSHUTDOWN_FUNCTION(http_client_curl)
+{
+       php_persistent_handle_cleanup(ZEND_STRL("http\\Client\\Curl"), NULL, 0 TSRMLS_CC);
+       php_persistent_handle_cleanup(ZEND_STRL("http\\Client\\Curl\\Request"), NULL, 0 TSRMLS_CC);
+
+       php_http_options_dtor(&php_http_curle_options);
+       php_http_options_dtor(&php_http_curlm_options);
 
        return SUCCESS;
 }
 
+#endif /* PHP_HTTP_HAVE_CURL */
+
 /*
  * Local variables:
  * tab-width: 4