From: Michael Wallner <mike@php.net>
Date: Tue, 24 May 2016 15:26:31 +0000 (+0200)
Subject: Merge branch 'v2.6.x'
X-Git-Tag: RELEASE_3_1_0_BETA1~18
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=ab1eba311be2f8aab98eed7a6164e79d69b402b2;hp=-c

Merge branch 'v2.6.x'
---

ab1eba311be2f8aab98eed7a6164e79d69b402b2
diff --combined README.md
index 6d4a56b,e0bc0ca..96a7b31
--- a/README.md
+++ b/README.md
@@@ -1,6 -1,6 +1,6 @@@
  # ext-http
  
 -[![Build Status](https://travis-ci.org/m6w6/ext-http.svg?branch=v2.5.x)](https://travis-ci.org/m6w6/ext-http)
 +[![Build Status](https://travis-ci.org/m6w6/ext-http.svg?branch=master)](https://travis-ci.org/m6w6/ext-http)
  [![Join the chat at https://gitter.im/m6w6/ext-http](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/m6w6/ext-http)
  
  Extended HTTP support. Again.
@@@ -20,7 -20,7 +20,7 @@@ Known issues are listed in [BUGS](./BUG
  ### PHARext
  
  Watch out for [PECL replicates](https://replicator.pharext.org?pecl_http)
- and pharext packages attached to [releases](./releases).
+ and pharext packages attached to [releases](https://github.com/m6w6/ext-http/releases).
  
  ### Checkout
  
diff --combined src/php_http_client_curl.c
index 5b6a628,8e53572..317edd3
--- a/src/php_http_client_curl.c
+++ b/src/php_http_client_curl.c
@@@ -81,15 -81,15 +81,15 @@@ typedef struct php_http_client_curl_han
  		php_http_buffer_t cookies;
  		php_http_buffer_t ranges;
  
 -		long redirects;
 -		unsigned range_request:1;
 -		unsigned encode_cookies:1;
 -
  		struct {
  			uint count;
  			double delay;
  		} retry;
  
 +		long redirects;
 +		unsigned range_request:1;
 +		unsigned encode_cookies:1;
 +
  	} options;
  
  } php_http_client_curl_handler_t;
@@@ -115,7 -115,7 +115,7 @@@ static inline php_http_curle_storage_t 
  	return st;
  }
  
 -static void *php_http_curle_ctor(void *opaque, void *init_arg TSRMLS_DC)
 +static void *php_http_curle_ctor(void *opaque, void *init_arg)
  {
  	void *ch;
  
@@@ -126,7 -126,7 +126,7 @@@
  	return NULL;
  }
  
 -static void *php_http_curle_copy(void *opaque, void *handle TSRMLS_DC)
 +static void *php_http_curle_copy(void *opaque, void *handle)
  {
  	void *ch;
  
@@@ -138,7 -138,7 +138,7 @@@
  	return NULL;
  }
  
 -static void php_http_curle_dtor(void *opaque, void *handle TSRMLS_DC)
 +static void php_http_curle_dtor(void *opaque, void *handle)
  {
  	php_http_curle_storage_t *st = php_http_curle_get_storage(handle);
  
@@@ -161,7 -161,7 +161,7 @@@ static php_resource_factory_ops_t php_h
  	php_http_curle_dtor
  };
  
 -static void *php_http_curlm_ctor(void *opaque, void *init_arg TSRMLS_DC)
 +static void *php_http_curlm_ctor(void *opaque, void *init_arg)
  {
  	php_http_client_curl_handle_t *curl = calloc(1, sizeof(*curl));
  
@@@ -179,7 -179,7 +179,7 @@@
  	return curl;
  }
  
 -static void php_http_curlm_dtor(void *opaque, void *handle TSRMLS_DC)
 +static void php_http_curlm_dtor(void *opaque, void *handle)
  {
  	php_http_client_curl_handle_t *curl = handle;
  
@@@ -200,10 -200,11 +200,10 @@@ static size_t php_http_curle_read_callb
  {
  	php_http_message_body_t *body = ctx;
  
 -	if (body && body->stream_id) {
 +	if (body && body->res) {
  		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();
  	}
@@@ -242,6 -243,7 +242,6 @@@ static int php_http_curle_progress_call
  static int php_http_curle_seek_callback(void *userdata, curl_off_t offset, int origin)
  {
  	php_http_message_body_t *body = userdata;
 -	TSRMLS_FETCH_FROM_CTX(body->ts);
  
  	if (!body) {
  		return 1;
@@@ -336,161 -338,131 +336,161 @@@ static int php_http_curle_body_callback
  
  static ZEND_RESULT_CODE php_http_curle_get_info(CURL *ch, HashTable *info)
  {
 -	char *c;
 -	long l;
 -	double d;
 -	struct curl_slist *s, *p;
 -	zval *subarray, array;
 -	INIT_PZVAL_ARRAY(&array, info);
 +	char *c = NULL;
 +	long l = 0;
 +	double d = 0;
 +	struct curl_slist *s = NULL, *p = NULL;
 +	zval tmp = {{0}};
  
  	/* BEGIN::CURLINFO */
  	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_EFFECTIVE_URL, &c)) {
 -		add_assoc_string_ex(&array, "effective_url", sizeof("effective_url"), c ? c : "", 1);
 +		ZVAL_STRING(&tmp, STR_PTR(c));
 +		zend_hash_str_update(info, "effective_url", lenof("effective_url"), &tmp);
  	}
  	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_RESPONSE_CODE, &l)) {
 -		add_assoc_long_ex(&array, "response_code", sizeof("response_code"), l);
 +		ZVAL_LONG(&tmp, l);
 +		zend_hash_str_update(info, "response_code", lenof("response_code"), &tmp);
  	}
  	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_TOTAL_TIME, &d)) {
 -		add_assoc_double_ex(&array, "total_time", sizeof("total_time"), d);
 +		ZVAL_DOUBLE(&tmp, d);
 +		zend_hash_str_update(info, "total_time", lenof("total_time"), &tmp);
  	}
  	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_NAMELOOKUP_TIME, &d)) {
 -		add_assoc_double_ex(&array, "namelookup_time", sizeof("namelookup_time"), d);
 +		ZVAL_DOUBLE(&tmp, d);
 +		zend_hash_str_update(info, "namelookup_time", lenof("namelookup_time"), &tmp);
  	}
  	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_CONNECT_TIME, &d)) {
 -		add_assoc_double_ex(&array, "connect_time", sizeof("connect_time"), d);
 +		ZVAL_DOUBLE(&tmp, d);
 +		zend_hash_str_update(info, "connect_time", lenof("connect_time"), &tmp);
  	}
  	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_PRETRANSFER_TIME, &d)) {
 -		add_assoc_double_ex(&array, "pretransfer_time", sizeof("pretransfer_time"), d);
 +		ZVAL_DOUBLE(&tmp, d);
 +		zend_hash_str_update(info, "pretransfer_time", lenof("pretransfer_time"), &tmp);
  	}
  	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_SIZE_UPLOAD, &d)) {
 -		add_assoc_double_ex(&array, "size_upload", sizeof("size_upload"), d);
 +		ZVAL_DOUBLE(&tmp, d);
 +		zend_hash_str_update(info, "size_upload", lenof("size_upload"), &tmp);
  	}
  	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_SIZE_DOWNLOAD, &d)) {
 -		add_assoc_double_ex(&array, "size_download", sizeof("size_download"), d);
 +		ZVAL_DOUBLE(&tmp, d);
 +		zend_hash_str_update(info, "size_download", lenof("size_download"), &tmp);
  	}
  	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_SPEED_DOWNLOAD, &d)) {
 -		add_assoc_double_ex(&array, "speed_download", sizeof("speed_download"), d);
 +		ZVAL_DOUBLE(&tmp, d);
 +		zend_hash_str_update(info, "speed_download", lenof("speed_download"), &tmp);
  	}
  	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_SPEED_UPLOAD, &d)) {
 -		add_assoc_double_ex(&array, "speed_upload", sizeof("speed_upload"), d);
 +		ZVAL_DOUBLE(&tmp, d);
 +		zend_hash_str_update(info, "speed_upload", lenof("speed_upload"), &tmp);
  	}
  	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_HEADER_SIZE, &l)) {
 -		add_assoc_long_ex(&array, "header_size", sizeof("header_size"), l);
 +		ZVAL_LONG(&tmp, l);
 +		zend_hash_str_update(info, "header_size", lenof("header_size"), &tmp);
  	}
  	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_REQUEST_SIZE, &l)) {
 -		add_assoc_long_ex(&array, "request_size", sizeof("request_size"), l);
 +		ZVAL_LONG(&tmp, l);
 +		zend_hash_str_update(info, "request_size", lenof("request_size"), &tmp);
  	}
  	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_SSL_VERIFYRESULT, &l)) {
 -		add_assoc_long_ex(&array, "ssl_verifyresult", sizeof("ssl_verifyresult"), l);
 +		ZVAL_LONG(&tmp, l);
 +		zend_hash_str_update(info, "ssl_verifyresult", lenof("ssl_verifyresult"), &tmp);
  	}
  	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_FILETIME, &l)) {
 -		add_assoc_long_ex(&array, "filetime", sizeof("filetime"), l);
 +		ZVAL_LONG(&tmp, l);
 +		zend_hash_str_update(info, "filetime", lenof("filetime"), &tmp);
  	}
  	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &d)) {
 -		add_assoc_double_ex(&array, "content_length_download", sizeof("content_length_download"), d);
 +		ZVAL_DOUBLE(&tmp, d);
 +		zend_hash_str_update(info, "content_length_download", lenof("content_length_download"), &tmp);
  	}
  	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_CONTENT_LENGTH_UPLOAD, &d)) {
 -		add_assoc_double_ex(&array, "content_length_upload", sizeof("content_length_upload"), d);
 +		ZVAL_DOUBLE(&tmp, d);
 +		zend_hash_str_update(info, "content_length_upload", lenof("content_length_upload"), &tmp);
  	}
  	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_STARTTRANSFER_TIME, &d)) {
 -		add_assoc_double_ex(&array, "starttransfer_time", sizeof("starttransfer_time"), d);
 +		ZVAL_DOUBLE(&tmp, d);
 +		zend_hash_str_update(info, "starttransfer_time", lenof("starttransfer_time"), &tmp);
  	}
  	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_CONTENT_TYPE, &c)) {
 -		add_assoc_string_ex(&array, "content_type", sizeof("content_type"), c ? c : "", 1);
 +		ZVAL_STRING(&tmp, STR_PTR(c));
 +		zend_hash_str_update(info, "content_type", lenof("content_type"), &tmp);
  	}
  	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_REDIRECT_TIME, &d)) {
 -		add_assoc_double_ex(&array, "redirect_time", sizeof("redirect_time"), d);
 +		ZVAL_DOUBLE(&tmp, d);
 +		zend_hash_str_update(info, "redirect_time", lenof("redirect_time"), &tmp);
  	}
  	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_REDIRECT_COUNT, &l)) {
 -		add_assoc_long_ex(&array, "redirect_count", sizeof("redirect_count"), l);
 +		ZVAL_LONG(&tmp, l);
 +		zend_hash_str_update(info, "redirect_count", lenof("redirect_count"), &tmp);
  	}
  	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_HTTP_CONNECTCODE, &l)) {
 -		add_assoc_long_ex(&array, "connect_code", sizeof("connect_code"), l);
 +		ZVAL_LONG(&tmp, l);
 +		zend_hash_str_update(info, "connect_code", lenof("connect_code"), &tmp);
  	}
  	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_HTTPAUTH_AVAIL, &l)) {
 -		add_assoc_long_ex(&array, "httpauth_avail", sizeof("httpauth_avail"), l);
 +		ZVAL_LONG(&tmp, l);
 +		zend_hash_str_update(info, "httpauth_avail", lenof("httpauth_avail"), &tmp);
  	}
  	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_PROXYAUTH_AVAIL, &l)) {
 -		add_assoc_long_ex(&array, "proxyauth_avail", sizeof("proxyauth_avail"), l);
 +		ZVAL_LONG(&tmp, l);
 +		zend_hash_str_update(info, "proxyauth_avail", lenof("proxyauth_avail"), &tmp);
  	}
  	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_OS_ERRNO, &l)) {
 -		add_assoc_long_ex(&array, "os_errno", sizeof("os_errno"), l);
 +		ZVAL_LONG(&tmp, l);
 +		zend_hash_str_update(info, "os_errno", lenof("os_errno"), &tmp);
  	}
  	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_NUM_CONNECTS, &l)) {
 -		add_assoc_long_ex(&array, "num_connects", sizeof("num_connects"), l);
 +		ZVAL_LONG(&tmp, l);
 +		zend_hash_str_update(info, "num_connects", lenof("num_connects"), &tmp);
  	}
  	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_SSL_ENGINES, &s)) {
 -		MAKE_STD_ZVAL(subarray);
 -		array_init(subarray);
 +		array_init(&tmp);
  		for (p = s; p; p = p->next) {
  			if (p->data) {
 -				add_next_index_string(subarray, p->data, 1);
 +				add_next_index_string(&tmp, p->data);
  			}
  		}
 -		add_assoc_zval_ex(&array, "ssl_engines", sizeof("ssl_engines"), subarray);
 +		zend_hash_str_update(info, "ssl_engines", lenof("ssl_engines"), &tmp);
  		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);
 +		ZVAL_STRING(&tmp, STR_PTR(c));
 +		zend_hash_str_update(info, "redirect_url", lenof("redirect_url"), &tmp);
  	}
  #if PHP_HTTP_CURL_VERSION(7,19,0)
  	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_PRIMARY_IP, &c)) {
 -		add_assoc_string_ex(&array, "primary_ip", sizeof("primary_ip"), c ? c : "", 1);
 +		ZVAL_STRING(&tmp, STR_PTR(c));
 +		zend_hash_str_update(info, "primary_ip", lenof("primary_ip"), &tmp);
  	}
  #endif
  #if PHP_HTTP_CURL_VERSION(7,19,0)
  	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_APPCONNECT_TIME, &d)) {
 -		add_assoc_double_ex(&array, "appconnect_time", sizeof("appconnect_time"), d);
 +		ZVAL_DOUBLE(&tmp, d);
 +		zend_hash_str_update(info, "appconnect_time", lenof("appconnect_time"), &tmp);
  	}
  #endif
  #if PHP_HTTP_CURL_VERSION(7,19,4)
  	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_CONDITION_UNMET, &l)) {
 -		add_assoc_long_ex(&array, "condition_unmet", sizeof("condition_unmet"), l);
 +		ZVAL_LONG(&tmp, l);
 +		zend_hash_str_update(info, "condition_unmet", lenof("condition_unmet"), &tmp);
  	}
  #endif
  #if PHP_HTTP_CURL_VERSION(7,21,0)
  	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_PRIMARY_PORT, &l)) {
 -		add_assoc_long_ex(&array, "primary_port", sizeof("primary_port"), l);
 +		ZVAL_LONG(&tmp, l);
 +		zend_hash_str_update(info, "primary_port", lenof("primary_port"), &tmp);
  	}
  #endif
  #if PHP_HTTP_CURL_VERSION(7,21,0)
  	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_LOCAL_IP, &c)) {
 -		add_assoc_string_ex(&array, "local_ip", sizeof("local_ip"), c ? c : "", 1);
 +		ZVAL_STRING(&tmp, STR_PTR(c));
 +		zend_hash_str_update(info, "local_ip", lenof("local_ip"), &tmp);
  	}
  #endif
  #if PHP_HTTP_CURL_VERSION(7,21,0)
  	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_LOCAL_PORT, &l)) {
 -		add_assoc_long_ex(&array, "local_port", sizeof("local_port"), l);
 +		ZVAL_LONG(&tmp, l);
 +		zend_hash_str_update(info, "local_port", lenof("local_port"), &tmp);
  	}
  #endif
  
@@@ -498,14 -470,16 +498,14 @@@
  
  #if PHP_HTTP_CURL_VERSION(7,34,0)
  	{
 -		zval *ti_array;
 +		zval ti_array, subarray;
  		struct curl_tlssessioninfo *ti;
  
  		if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_TLS_SESSION, &ti)) {
 -			const char *backend;
 +			char *backend;
  
 -			MAKE_STD_ZVAL(subarray);
 -			ZVAL_NULL(subarray);
 -			MAKE_STD_ZVAL(ti_array);
 -			array_init(ti_array);
 +			ZVAL_NULL(&subarray);
 +			array_init(&ti_array);
  
  			switch (ti->backend) {
  			case CURLSSLBACKEND_NONE:
@@@ -517,13 -491,13 +517,13 @@@
  				{
  					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));
 +					array_init(&subarray);
 +					add_assoc_long_ex(&subarray, ZEND_STRL("number"), SSL_CTX_sess_number(ctx));
 +					add_assoc_long_ex(&subarray, ZEND_STRL("connect"), SSL_CTX_sess_connect(ctx));
 +					add_assoc_long_ex(&subarray, ZEND_STRL("connect_good"), SSL_CTX_sess_connect_good(ctx));
 +					add_assoc_long_ex(&subarray, ZEND_STRL("connect_renegotiate"), SSL_CTX_sess_connect_renegotiate(ctx));
 +					add_assoc_long_ex(&subarray, ZEND_STRL("hits"), SSL_CTX_sess_hits(ctx));
 +					add_assoc_long_ex(&subarray, ZEND_STRL("cache_full"), SSL_CTX_sess_cache_full(ctx));
  				}
  #endif
  				break;
@@@ -534,12 -508,12 +534,12 @@@
  					gnutls_session_t sess = ti->internals;
  					char *desc;
  
 -					array_init(subarray);
 +					array_init(&subarray);
  					if ((desc = gnutls_session_get_desc(sess))) {
 -						add_assoc_string_ex(subarray, ZEND_STRS("desc"), desc, 1);
 +						add_assoc_string_ex(&subarray, ZEND_STRL("desc"), desc);
  						gnutls_free(desc);
  					}
 -					add_assoc_bool_ex(subarray, ZEND_STRS("resumed"), gnutls_session_is_resumed(sess));
 +					add_assoc_bool_ex(&subarray, ZEND_STRL("resumed"), gnutls_session_is_resumed(sess));
  				}
  #endif
  				break;
@@@ -570,9 -544,9 +570,9 @@@
  			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);
 +			add_assoc_string_ex(&ti_array, ZEND_STRL("backend"), backend);
 +			add_assoc_zval_ex(&ti_array, ZEND_STRL("internals"), &subarray);
 +			zend_hash_str_update(info, "tls_session", lenof("tls_session"), &ti_array);
  		}
  	}
  #endif
@@@ -580,41 -554,41 +580,41 @@@
  #if (PHP_HTTP_CURL_VERSION(7,19,1) && defined(PHP_HTTP_HAVE_OPENSSL)) || (PHP_HTTP_CURL_VERSION(7,34,0) && defined(PHP_HTTP_HAVE_NSS)) || (PHP_HTTP_CURL_VERSION(7,42,0) && defined(PHP_HTTP_HAVE_GNUTLS)) || (PHP_HTTP_CURL_VERSION(7,39,0) && defined(PHP_HTTP_HAVE_GSKIT))
  	{
  		int i;
 -		zval *ci_array;
 +		zval ci_array, subarray;
  		struct curl_certinfo *ci;
  		char *colon, *keyname;
  
  		if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_CERTINFO, &ci)) {
 -			MAKE_STD_ZVAL(ci_array);
 -			array_init(ci_array);
 +			array_init(&ci_array);
  
  			for (i = 0; i < ci->num_of_certs; ++i) {
  				s = ci->certinfo[i];
  
 -				MAKE_STD_ZVAL(subarray);
 -				array_init(subarray);
 +				array_init(&subarray);
  				for (p = s; p; p = p->next) {
  					if (p->data) {
  						if ((colon = strchr(p->data, ':'))) {
  							keyname = estrndup(p->data, colon - p->data);
 -							add_assoc_string_ex(subarray, keyname, colon - p->data + 1, colon + 1, 1);
 +							add_assoc_string_ex(&subarray, keyname, colon - p->data, colon + 1);
  							efree(keyname);
  						} else {
 -							add_next_index_string(subarray, p->data, 1);
 +							add_next_index_string(&subarray, p->data);
  						}
  					}
  				}
 -				add_next_index_zval(ci_array, subarray);
 +				add_next_index_zval(&ci_array, &subarray);
  			}
 -			add_assoc_zval_ex(&array, "certinfo", sizeof("certinfo"), ci_array);
 +			zend_hash_str_update(info, "certinfo", lenof("certinfo"), &ci_array);
  		}
  	}
  #endif
  	{
  		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);
 +		ZVAL_LONG(&tmp, st->errorcode);
 +		zend_hash_str_update(info, "curlcode", lenof("curlcode"), &tmp);
 +		ZVAL_STRING(&tmp, st->errorbuffer);
 +		zend_hash_str_update(info, "error", lenof("error"), &tmp);
  	}
  
  	return SUCCESS;
@@@ -625,14 -599,14 +625,14 @@@ static int compare_queue(php_http_clien
  	return handle == ((php_http_client_curl_handler_t *) e->opaque)->handle;
  }
  
 -static php_http_message_t *php_http_curlm_responseparser(php_http_client_curl_handler_t *h TSRMLS_DC)
 +static php_http_message_t *php_http_curlm_responseparser(php_http_client_curl_handler_t *h)
  {
  	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);
 +	response = php_http_message_init(NULL, 0, h->response.body);
 +	php_http_header_parser_init(&parser);
  	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,
@@@ -657,24 -631,20 +657,24 @@@
  	php_http_message_body_addref(h->response.body);
  
  	/* 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("Content-Length")))) {
 +		Z_TRY_ADDREF_P(zh);
 +		zend_hash_str_update(&response->hdrs, "X-Original-Content-Length", lenof("X-Original-Content-Length"), zh);
  	}
 -	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("Transfer-Encoding")))) {
 +		Z_TRY_ADDREF_P(zh);
 +		zend_hash_str_update(&response->hdrs, "X-Original-Transfer-Encoding", lenof("X-Original-Transfer-Encoding"), zh);
 +		zend_hash_str_del(&response->hdrs, "Transfer-Encoding", lenof("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-Range")))) {
 +		Z_TRY_ADDREF_P(zh);
 +		zend_hash_str_update(&response->hdrs, "X-Original-Content-Range", lenof("X-Original-Content-Range"), zh);
 +		zend_hash_str_del(&response->hdrs, "Content-Range", lenof("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"));
 +	if ((zh = php_http_message_header(response, ZEND_STRL("Content-Encoding")))) {
 +		Z_TRY_ADDREF_P(zh);
 +		zend_hash_str_update(&response->hdrs, "X-Original-Content-Encoding", lenof("X-Original-Content-Encoding"), zh);
 +		zend_hash_str_del(&response->hdrs, "Content-Encoding", lenof("Content-Encoding"));
  	}
  	php_http_message_update_headers(response);
  
@@@ -687,6 -657,7 +687,6 @@@ static void php_http_curlm_responsehand
  	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->multi, &remaining);
@@@ -709,7 -680,7 +709,7 @@@
  
  			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);
 +				php_http_message_t *response = php_http_curlm_responseparser(handler);
  
  				if (response) {
  					context->callback.response.func(context->callback.response.arg, context, &handler->queue, &response);
@@@ -723,7 -694,7 +723,7 @@@
  		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));
 +			php_error_docref(NULL, 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);
  			}
@@@ -766,6 -737,7 +766,6 @@@ static void php_http_curlm_timeout_call
  #endif
  	if (curl->useevents) {
  		CURLMcode rc;
 -		TSRMLS_FETCH_FROM_CTX(context->ts);
  
  		/* ignore and use -1,0 on timeout */
  		(void) socket;
@@@ -774,7 -746,7 +774,7 @@@
  		while (CURLM_CALL_MULTI_PERFORM == (rc = curl_multi_socket_action(curl->handle->multi, CURL_SOCKET_TIMEOUT, 0, &curl->unfinished)));
  
  		if (CURLM_OK != rc) {
 -			php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s",  curl_multi_strerror(rc));
 +			php_error_docref(NULL, E_WARNING, "%s",  curl_multi_strerror(rc));
  		}
  
  		php_http_curlm_responsehandler(context);
@@@ -791,11 -763,12 +791,11 @@@ static void php_http_curlm_event_callba
  #endif
  	if (curl->useevents) {
  		CURLMcode rc = CURLM_OK;
 -		TSRMLS_FETCH_FROM_CTX(context->ts);
  
  		while (CURLM_CALL_MULTI_PERFORM == (rc = curl_multi_socket_action(curl->handle->multi, socket, etoca(action), &curl->unfinished)));
  
  		if (CURLM_OK != rc) {
 -			php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", curl_multi_strerror(rc));
 +			php_error_docref(NULL, E_WARNING, "%s", curl_multi_strerror(rc));
  		}
  
  		php_http_curlm_responsehandler(context);
@@@ -818,6 -791,7 +818,6 @@@ static int php_http_curlm_socket_callba
  	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));
@@@ -845,7 -819,7 +845,7 @@@
  				return 0;
  
  			default:
 -				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown socket action %d", action);
 +				php_error_docref(NULL, E_WARNING, "Unknown socket action %d", action);
  				return -1;
  		}
  
@@@ -898,12 -872,29 +898,29 @@@ static ZEND_RESULT_CODE php_http_curle_
  	php_http_client_curl_handler_t *curl = userdata;
  	CURL *ch = curl->handle;
  
 -	if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_SSL_VERIFYHOST, Z_BVAL_P(val) ? 2 : 0)) {
 +	if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_SSL_VERIFYHOST, Z_TYPE_P(val) == IS_TRUE ? 2 : 0)) {
  		return FAILURE;
  	}
  	return SUCCESS;
  }
  
+ static ZEND_RESULT_CODE php_http_curle_option_set_cookiesession(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_COOKIESESSION, (long) Z_BVAL_P(val))) {
++	if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIESESSION, (long) (Z_TYPE_P(val) == IS_TRUE))) {
+ 		return FAILURE;
+ 	}
 -	if (Z_BVAL_P(val)) {
++	if (Z_TYPE_P(val) == IS_TRUE) {
+ 		if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIELIST, "SESS")) {
+ 			return FAILURE;
+ 		}
+ 	}
+ 
+ 	return SUCCESS;
+ }
+ 
  static ZEND_RESULT_CODE php_http_curle_option_set_cookiestore(php_http_option_t *opt, zval *val, void *userdata)
  {
  	php_http_client_curl_handler_t *curl = userdata;
@@@ -913,7 -904,7 +930,7 @@@
  	if (storage->cookiestore) {
  		pefree(storage->cookiestore, 1);
  	}
 -	if (val && Z_STRLEN_P(val)) {
 +	if (val && Z_TYPE_P(val) == IS_STRING && Z_STRLEN_P(val)) {
  		storage->cookiestore = pestrndup(Z_STRVAL_P(val), Z_STRLEN_P(val), 1);
  	} else {
  		storage->cookiestore = NULL;
@@@ -931,12 -922,11 +948,12 @@@ static ZEND_RESULT_CODE php_http_curle_
  {
  	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) {
 +		HashTable *ht = HASH_OF(val);
 +
  		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)) {
 +			if (SUCCESS == php_http_url_encode_hash_ex(ht, &curl->options.cookies, ZEND_STRL(";"), ZEND_STRL("="), NULL, 0)) {
  				php_http_buffer_fix(&curl->options.cookies);
  				if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIE, curl->options.cookies.data)) {
  					return FAILURE;
@@@ -945,20 -935,19 +962,20 @@@
  				return FAILURE;
  			}
  		} else {
 -			HashPosition pos;
 -			php_http_array_hashkey_t cookie_key = php_http_array_hashkey_init(0);
 -			zval **cookie_val;
 +			php_http_arrkey_t cookie_key;
 +			zval *cookie_val;
  
 -			FOREACH_KEYVAL(pos, val, cookie_key, cookie_val) {
 -				zval *zv = php_http_ztyp(IS_STRING, *cookie_val);
 +			ZEND_HASH_FOREACH_KEY_VAL(ht, cookie_key.h, cookie_key.key, cookie_val)
 +			{
 +				zend_string *zs = zval_get_string(cookie_val);
  
 -				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);
 +				php_http_arrkey_stringify(&cookie_key, NULL);
 +				php_http_buffer_appendf(&curl->options.cookies, "%s=%s; ", cookie_key.key->val, zs->val);
 +				php_http_arrkey_dtor(&cookie_key);
  
 -				zval_ptr_dtor(&zv);
 +				zend_string_release(zs);
  			}
 +			ZEND_HASH_FOREACH_END();
  
  			php_http_buffer_fix(&curl->options.cookies);
  			if (curl->options.cookies.used) {
@@@ -980,7 -969,7 +997,7 @@@ static ZEND_RESULT_CODE php_http_curle_
  {
  	php_http_client_curl_handler_t *curl = userdata;
  
 -	curl->options.encode_cookies = Z_BVAL_P(val);
 +	curl->options.encode_cookies = Z_TYPE_P(val) == IS_TRUE;
  	return SUCCESS;
  }
  
@@@ -988,6 -977,7 +1005,6 @@@ static ZEND_RESULT_CODE php_http_curle_
  {
  	php_http_client_curl_handler_t *curl = userdata;
  	CURL *ch = curl->handle;
 -	TSRMLS_FETCH_FROM_CTX(curl->client->ts);
  
  	if (Z_LVAL_P(val)) {
  		if (Z_LVAL_P(val) > 0) {
@@@ -995,7 -985,7 +1012,7 @@@
  				return FAILURE;
  			}
  		} else {
 -			if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_TIMEVALUE, (long) sapi_get_request_time(TSRMLS_C) + Z_LVAL_P(val))) {
 +			if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_TIMEVALUE, (long) sapi_get_request_time() + Z_LVAL_P(val))) {
  				return FAILURE;
  			}
  		}
@@@ -1020,7 -1010,7 +1037,7 @@@ static ZEND_RESULT_CODE php_http_curle_
  #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)) {
 +	if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_ACCEPT_ENCODING, Z_TYPE_P(val) == IS_TRUE ? "" : NULL)) {
  		return FAILURE;
  	}
  	return SUCCESS;
@@@ -1031,7 -1021,7 +1048,7 @@@ static ZEND_RESULT_CODE php_http_curle_
  	php_http_client_curl_handler_t *curl = userdata;
  	php_http_buffer_t header;
  
 -	if (Z_STRLEN_P(val)) {
 +	if (val && Z_TYPE_P(val) == IS_STRING && 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));
@@@ -1046,29 -1036,32 +1063,29 @@@ static ZEND_RESULT_CODE php_http_curle_
  {
  	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 *rr, *rb, *re;
 +		zend_long rbl, rel;
 +		HashTable *ht = HASH_OF(val);
 +
 +		ZEND_HASH_FOREACH_VAL(ht, rr)
 +		{
 +			if (Z_TYPE_P(rr) == IS_ARRAY) {
 +				if (2 == php_http_array_list(Z_ARRVAL_P(rr), 2, &rb, &re)) {
 +					if (	((Z_TYPE_P(rb) == IS_LONG) || ((Z_TYPE_P(rb) == IS_STRING) && is_numeric_string(Z_STRVAL_P(rb), Z_STRLEN_P(rb), &rbl, NULL, 1))) &&
 +							((Z_TYPE_P(re) == IS_LONG) || ((Z_TYPE_P(re) == IS_STRING) && is_numeric_string(Z_STRVAL_P(re), Z_STRLEN_P(re), &rel, NULL, 1)))) {
 +						if ((rbl >= 0) && (rel >= 0)) {
 +							php_http_buffer_appendf(&curl->options.ranges, "%ld-%ld,", rbl, rel);
  						}
 -						zval_ptr_dtor(&rbl);
 -						zval_ptr_dtor(&rel);
  					}
  
  				}
  			}
  		}
 +		ZEND_HASH_FOREACH_END();
  
  		if (curl->options.ranges.used) {
  			curl->options.range_request = 1;
@@@ -1131,16 -1124,26 +1148,16 @@@ static ZEND_RESULT_CODE php_http_curle_
  	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;
 +		zval *zps, *zpe;
  
 -		switch (php_http_array_list(Z_ARRVAL_P(val) TSRMLS_CC, 2, &z_port_start, &z_port_end)) {
 +		switch (php_http_array_list(Z_ARRVAL_P(val), 2, &zps, &zpe)) {
  		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;
 +			localportrange = labs(zval_get_long(zps)-zval_get_long(zpe))+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);
 -			}
 +			localport = (zval_get_long(zpe) > 0) ? MIN(zval_get_long(zps), zval_get_long(zpe)) : zval_get_long(zps);
  			break;
  		default:
  			break;
@@@ -1158,28 -1161,26 +1175,28 @@@
  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_arrkey_t header_key;
 +		zval *header_val;
  		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));
 +		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(val), header_key.h, header_key.key, header_val)
 +		{
 +			if (header_key.key) {
 +				zend_string *zs = zval_get_string(header_val);
 +
 +				php_http_buffer_appendf(&header, "%s: %s", header_key.key->val, zs->val);
 +				zend_string_release(zs);
 +
  				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);
  			}
  		}
 +		ZEND_HASH_FOREACH_END();
  		php_http_buffer_dtor(&header);
  	}
  	if (CURLE_OK != curl_easy_setopt(curl->handle, CURLOPT_PROXYHEADER, curl->options.proxyheaders)) {
@@@ -1198,18 -1199,18 +1215,18 @@@ static ZEND_RESULT_CODE php_http_curle_
  {
  	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);
 +		HashTable *ht = HASH_OF(val);
 +		zval *data;
 +
 +		ZEND_HASH_FOREACH_VAL(ht, data)
 +		{
 +			zend_string *zs = zval_get_string(data);
 +			curl->options.resolve = curl_slist_append(curl->options.resolve, zs->val);
 +			zend_string_release(zs);
  		}
 +		ZEND_HASH_FOREACH_END();
  
  		if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_RESOLVE, curl->options.resolve)) {
  			return FAILURE;
@@@ -1247,13 -1248,13 +1264,13 @@@ static ZEND_RESULT_CODE php_http_curle_
  }
  #endif
  
 -static void php_http_curle_options_init(php_http_options_t *registry TSRMLS_DC)
 +static void php_http_curle_options_init(php_http_options_t *registry)
  {
  	php_http_option_t *opt;
  
  	/* url options */
  #if PHP_HTTP_CURL_VERSION(7,42,0)
 -	php_http_option_register(registry, ZEND_STRL("path_as_is"), CURLOPT_PATH_AS_IS, IS_BOOL);
 +	php_http_option_register(registry, ZEND_STRL("path_as_is"), CURLOPT_PATH_AS_IS, _IS_BOOL);
  #endif
  
  	/* proxy */
@@@ -1266,7 -1267,7 +1283,7 @@@
  	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);
 +	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
@@@ -1285,9 -1286,11 +1302,11 @@@
  #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;
+ 	if (PHP_HTTP_CURL_FEATURE(CURL_VERSION_UNIX_SOCKETS)) {
+ 		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
  
@@@ -1335,8 -1338,8 +1354,8 @@@
  		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);
 +	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);
@@@ -1360,6 -1363,7 +1379,7 @@@
  		Z_LVAL(opt->defval) = CURLAUTH_ANYSAFE;
  	}
  #if PHP_HTTP_CURL_VERSION(7,43,0)
+ 	if (PHP_HTTP_CURL_FEATURE(CURL_VERSION_SSPI) || PHP_HTTP_CURL_FEATURE(CURL_VERSION_GSSAPI))
  	if ((opt = php_http_option_register(registry, ZEND_STRL("service_name"), CURLOPT_SERVICE_NAME, IS_STRING))) {
  		opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
  	}
@@@ -1369,7 -1373,7 +1389,7 @@@
  	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);
 +	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
@@@ -1386,17 -1390,18 +1406,17 @@@
  	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))) {
 +	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,
 +		ZVAL_PSTRING(&opt->defval,
  				"PECL_HTTP/" PHP_PECL_HTTP_VERSION " "
  				"PHP/" PHP_VERSION " "
 -				"libcurl/" LIBCURL_VERSION
 -			, 0);
 +				"libcurl/" LIBCURL_VERSION);
  	}
  
  	/* resume */
@@@ -1415,7 -1420,7 +1435,7 @@@
  	}
  
  	/* compression */
 -	if ((opt = php_http_option_register(registry, ZEND_STRL("compress"), 0, IS_BOOL))) {
 +	if ((opt = php_http_option_register(registry, ZEND_STRL("compress"), 0, _IS_BOOL))) {
  		opt->setter = php_http_curle_option_set_compress;
  	}
  
@@@ -1425,7 -1430,7 +1445,7 @@@
  	}
  
  	/* cookies */
 -	if ((opt = php_http_option_register(registry, ZEND_STRL("encodecookies"), 0, IS_BOOL))) {
 +	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);
  	}
@@@ -1434,7 -1439,9 +1454,9 @@@
  	}
  
  	/* cookiesession, don't load session cookies from cookiestore */
- 	php_http_option_register(registry, ZEND_STRL("cookiesession"), CURLOPT_COOKIESESSION, _IS_BOOL);
 -	if ((opt = php_http_option_register(registry, ZEND_STRL("cookiesession"), CURLOPT_COOKIESESSION, IS_BOOL))) {
++	if ((opt = php_http_option_register(registry, ZEND_STRL("cookiesession"), CURLOPT_COOKIESESSION, _IS_BOOL))) {
+ 		opt->setter = php_http_curle_option_set_cookiesession;
+ 	}
  	/* 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;
@@@ -1464,9 -1471,9 +1486,9 @@@
  #endif
  
  	/* tcp */
 -	php_http_option_register(registry, ZEND_STRL("tcp_nodelay"), CURLOPT_TCP_NODELAY, IS_BOOL);
 +	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);
 +	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;
  	}
@@@ -1476,109 -1483,109 +1498,111 @@@
  #endif
  
  	/* ssl */
- 	if ((opt = php_http_option_register(registry, ZEND_STRL("ssl"), 0, IS_ARRAY))) {
- 		registry = &opt->suboptions;
+ 	if (PHP_HTTP_CURL_FEATURE(CURL_VERSION_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_PSTRING(&opt->defval, "PEM");
- 		}
- 		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_PSTRING(&opt->defval, "PEM");
- 		}
- 		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 ((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);
++				ZVAL_PSTRING(&opt->defval, "PEM");
+ 			}
+ 			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);
++				ZVAL_PSTRING(&opt->defval, "PEM");
+ 			}
+ 			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))) {
++			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))) {
++			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) && (defined(PHP_HTTP_HAVE_OPENSSL) || defined(PHP_HTTP_HAVE_NSS) || defined(PHP_HTTP_HAVE_GNUTLS))
 -			php_http_option_register(registry, ZEND_STRL("verifystatus"), CURLOPT_SSL_VERIFYSTATUS, IS_BOOL);
 +		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;
+ 			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);
 +			ZVAL_PSTRING(&opt->defval, PHP_HTTP_CURL_CAINFO);
  #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("capath"), CURLOPT_CAPATH, IS_STRING))) {
+ 				opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
+ 				opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_BASEDIR;
  #ifdef PHP_HTTP_CURL_CAPATH
 -				ZVAL_STRING(&opt->defval, PHP_HTTP_CURL_CAPATH, 0);
 +			ZVAL_PSTRING(&opt->defval, PHP_HTTP_CURL_CAPATH);
  #endif
  		}
- 		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 ((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;
- 		}
+ 			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;
- 		}
+ 			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_CURL_VERSION(7,34,0) && defined(PHP_HTTP_HAVE_NSS)) || (PHP_HTTP_CURL_VERSION(7,42,0) && defined(PHP_HTTP_HAVE_GNUTLS)) || (PHP_HTTP_CURL_VERSION(7,39,0) && defined(PHP_HTTP_HAVE_GSKIT))
- 		if ((opt = php_http_option_register(registry, ZEND_STRL("certinfo"), CURLOPT_CERTINFO, _IS_BOOL))) {
- 			ZVAL_FALSE(&opt->defval);
- 		}
 -			php_http_option_register(registry, ZEND_STRL("certinfo"), CURLOPT_CERTINFO, IS_BOOL);
++			if ((opt = php_http_option_register(registry, ZEND_STRL("certinfo"), CURLOPT_CERTINFO, _IS_BOOL))) {
++				ZVAL_FALSE(&opt->defval);
++			}
  #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);
- 		}
 -			if ((opt = php_http_option_register(registry, ZEND_STRL("enable_npn"), CURLOPT_SSL_ENABLE_NPN, IS_BOOL))) {
++			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))) {
++			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)
- 		/* FIXME: see http://curl.haxx.se/libcurl/c/CURLOPT_PINNEDPUBLICKEY.html#AVAILABILITY */
- 		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;
- 		}
+ 			/* FIXME: see http://curl.haxx.se/libcurl/c/CURLOPT_PINNEDPUBLICKEY.html#AVAILABILITY */
+ 			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;
- 		}
+ 			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);
 +		php_http_option_register(registry, ZEND_STRL("falsestart"), CURLOPT_SSL_FALSESTART, _IS_BOOL);
  #endif
+ 		}
  	}
  }
  
@@@ -1588,12 -1595,8 +1612,12 @@@ static zval *php_http_curle_get_option(
  	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);
 +		zval zopt;
 +
 +		ZVAL_DUP(&zopt, option);
 +		convert_to_explicit_type(&zopt, opt->type);
 +		zend_hash_update(&curl->options.cache, opt->name, &zopt);
 +		return zend_hash_find(&curl->options.cache, opt->name);
  	}
  	return option;
  }
@@@ -1603,18 -1606,19 +1627,18 @@@ static ZEND_RESULT_CODE php_http_curle_
  	php_http_client_curl_handler_t *curl = userdata;
  	CURL *ch = curl->handle;
  	zval tmp;
- 	CURLcode rc = CURLE_OK;
+ 	CURLcode rc = CURLE_UNKNOWN_OPTION;
  	ZEND_RESULT_CODE rv = SUCCESS;
 -	TSRMLS_FETCH_FROM_CTX(curl->client->ts);
  
  	if (!val) {
  		val = &opt->defval;
  	}
  
  	switch (opt->type) {
 -	case IS_BOOL:
 +	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))) {
 +		} else if (CURLE_OK != curl_easy_setopt(ch, opt->option, (long) (Z_TYPE_P(val) == IS_TRUE))) {
  			rv = FAILURE;
  		}
  		break;
@@@ -1630,15 -1634,11 +1654,15 @@@
  	case IS_STRING:
  		if (opt->setter) {
  			rv = opt->setter(opt, val, curl);
 +		} else if (!val || Z_TYPE_P(val) == IS_NULL) {
 +			if (CURLE_OK != (rc = curl_easy_setopt(ch, opt->option, NULL))) {
 +				rv = FAILURE;
 +			}
  		} 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)) {
 +		} else if ((opt->flags & PHP_HTTP_CURLE_OPTION_CHECK_BASEDIR) && Z_STRVAL_P(val) && SUCCESS != php_check_open_basedir(Z_STRVAL_P(val))) {
  			if (CURLE_OK != (rc = curl_easy_setopt(ch, opt->option, NULL))) {
  				rv = FAILURE;
  			}
@@@ -1677,7 -1677,7 +1701,7 @@@
  		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));
 +		php_error_docref(NULL, E_NOTICE, "Could not set option %s (%s)", opt->name->val, curl_easy_strerror(rc));
  	}
  	return rv;
  }
@@@ -1690,10 -1690,12 +1714,10 @@@ static ZEND_RESULT_CODE php_http_curlm_
  	CURLM *ch = curl->handle->multi;
  	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;
 +		zval *entry;
  		HashTable *ht = HASH_OF(value);
  		int c = zend_hash_num_elements(ht);
  		char **ptr = ecalloc(c + 1, sizeof(char *));
@@@ -1703,11 -1705,9 +1727,11 @@@
  		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);
 +		ZEND_HASH_FOREACH_VAL(&tmp_ht, entry)
 +		{
 +			*ptr++ = Z_STRVAL_P(entry);
  		}
 +		ZEND_HASH_FOREACH_END();
  	}
  
  	if (CURLM_OK != curl_multi_setopt(ch, opt->option, bl)) {
@@@ -1756,11 -1756,39 +1780,39 @@@ static ZEND_RESULT_CODE php_http_curlm_
  {
  	php_http_client_t *client = userdata;
  
 -	return php_http_curlm_use_eventloop(client, value && Z_BVAL_P(value));
 +	return php_http_curlm_use_eventloop(client, value && Z_TYPE_P(value) == IS_TRUE);
  }
  #endif
  
+ static ZEND_RESULT_CODE php_http_curlm_option_set_share_cookies(php_http_option_t *opt, zval *value, void *userdata)
+ {
+ 	php_http_client_t *client = userdata;
+ 	php_http_client_curl_t *curl = client->ctx;
+ 	CURLSHcode rc;
+ 
 -	if (Z_BVAL_P(value)) {
++	if (Z_TYPE_P(value) == IS_TRUE) {
+ 		rc = curl_share_setopt(curl->handle->share, CURLSHOPT_SHARE, CURL_LOCK_DATA_COOKIE);
+ 	} else {
+ 		rc = curl_share_setopt(curl->handle->share, CURLSHOPT_UNSHARE, CURL_LOCK_DATA_COOKIE);
+ 	}
+ 	return CURLSHE_OK == rc ? SUCCESS : FAILURE;
+ }
+ 
+ static ZEND_RESULT_CODE php_http_curlm_option_set_share_ssl(php_http_option_t *opt, zval *value, void *userdata)
+ {
+ 	php_http_client_t *client = userdata;
+ 	php_http_client_curl_t *curl = client->ctx;
+ 	CURLSHcode rc;
+ 
 -	if (Z_BVAL_P(value)) {
++	if (Z_TYPE_P(value) == IS_TRUE) {
+ 		rc = curl_share_setopt(curl->handle->share, CURLSHOPT_SHARE, CURL_LOCK_DATA_SSL_SESSION);
+ 	} else {
+ 		rc = curl_share_setopt(curl->handle->share, CURLSHOPT_UNSHARE, CURL_LOCK_DATA_SSL_SESSION);
+ 	}
+ 	return CURLSHE_OK == rc ? SUCCESS : FAILURE;
+ }
+ 
 -static void php_http_curlm_options_init(php_http_options_t *registry TSRMLS_DC)
 +static void php_http_curlm_options_init(php_http_options_t *registry)
  {
  	php_http_option_t *opt;
  
@@@ -1784,7 -1812,7 +1836,7 @@@
  	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);
 +	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);
@@@ -1807,10 -1835,19 +1859,19 @@@
  #endif
  	/* events */
  #if PHP_HTTP_HAVE_EVENT
 -	if ((opt = php_http_option_register(registry, ZEND_STRL("use_eventloop"), 0, IS_BOOL))) {
 +	if ((opt = php_http_option_register(registry, ZEND_STRL("use_eventloop"), 0, _IS_BOOL))) {
  		opt->setter = php_http_curlm_option_set_use_eventloop;
  	}
  #endif
+ 	/* share */
 -	if ((opt = php_http_option_register(registry, ZEND_STRL("share_cookies"), 0, IS_BOOL))) {
++	if ((opt = php_http_option_register(registry, ZEND_STRL("share_cookies"), 0, _IS_BOOL))) {
+ 		opt->setter = php_http_curlm_option_set_share_cookies;
 -		ZVAL_BOOL(&opt->defval, 1);
++		ZVAL_TRUE(&opt->defval);
+ 	}
 -	if ((opt = php_http_option_register(registry, ZEND_STRL("share_ssl"), 0, IS_BOOL))) {
++	if ((opt = php_http_option_register(registry, ZEND_STRL("share_ssl"), 0, _IS_BOOL))) {
+ 		opt->setter = php_http_curlm_option_set_share_ssl;
 -		ZVAL_BOOL(&opt->defval, 1);
++		ZVAL_TRUE(&opt->defval);
+ 	}
  }
  
  static ZEND_RESULT_CODE php_http_curlm_set_option(php_http_option_t *opt, zval *val, void *userdata)
@@@ -1821,24 -1858,20 +1882,24 @@@
  	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);
 +		zval zopt;
 +
 +		ZVAL_DUP(&zopt, val);
 +		convert_to_explicit_type(&zopt, opt->type);
 +
 +		val = &zopt;
  	}
  
  	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)))) {
 +		case _IS_BOOL:
 +			if (CURLM_OK != (rc = curl_multi_setopt(ch, opt->option, (long) zend_is_true(val)))) {
  				rv = FAILURE;
  			}
  			break;
@@@ -1854,11 -1887,11 +1915,11 @@@
  	}
  
  	if (val && val != orig && val != &opt->defval) {
 -		zval_ptr_dtor(&val);
 +		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));
 +		php_error_docref(NULL, E_NOTICE, "Could not set option %s (%s)", opt->name->val, curl_easy_strerror(rc));
  	}
  	return rv;
  }
@@@ -1926,9 -1959,10 +1987,9 @@@ static php_http_client_curl_handler_t *
  	void *handle;
  	php_http_client_curl_t *curl = h->ctx;
  	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->multi");
 +	if (!(handle = php_resource_factory_handle_ctor(rf, NULL))) {
 +		php_error_docref(NULL, E_WARNING, "Failed to initialize curl handle");
  		return NULL;
  	}
  
@@@ -1936,7 -1970,7 +1997,7 @@@
  	handler->rf = rf;
  	handler->client = h;
  	handler->handle = handle;
 -	handler->response.body = php_http_message_body_init(NULL, NULL TSRMLS_CC);
 +	handler->response.body = php_http_message_body_init(NULL, NULL);
  	php_http_buffer_init(&handler->response.headers);
  	php_http_buffer_init(&handler->options.cookies);
  	php_http_buffer_init(&handler->options.ranges);
@@@ -1978,10 -2012,11 +2039,10 @@@ static ZEND_RESULT_CODE php_http_client
  	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");
 +		php_error_docref(NULL, E_WARNING, "Cannot request empty URL");
  		return FAILURE;
  	}
  	storage->errorbuffer[0] = '\0';
@@@ -1997,33 -2032,34 +2058,33 @@@
  	/* 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_arrkey_t header_key;
 +		zval *header_val;
 +		zend_string *header_str;
  		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);
 +		zval *ct = zend_hash_str_find(&msg->hdrs, ZEND_STRL("Content-Length"));
  #endif
  
  		php_http_buffer_init(&header);
 -		FOREACH_HASH_KEYVAL(pos, &msg->hdrs, header_key, header_val) {
 -			if (header_key.type == HASH_KEY_IS_STRING) {
 +		ZEND_HASH_FOREACH_KEY_VAL(&msg->hdrs, header_key.h, header_key.key, header_val)
 +		{
 +			if (header_key.key) {
  #if !PHP_HTTP_CURL_VERSION(7,23,0)
  				/* avoid duplicate content-length header */
 -				if (ct && *ct == *header_val) {
 +				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));
 +				header_str = zval_get_string(header_val);
 +				php_http_buffer_appendf(&header, "%s: %s", header_key.key->val, header_str->val);
  				php_http_buffer_fix(&header);
  				curl->options.headers = curl_slist_append(curl->options.headers, header.data);
  				php_http_buffer_reset(&header);
 -
 -				zval_ptr_dtor(&header_cpy);
 +				zend_string_release(header_str);
  			}
  		}
 +		ZEND_HASH_FOREACH_END();
  		php_http_buffer_dtor(&header);
  	}
  	curl_easy_setopt(curl->handle, CURLOPT_HTTPHEADER, curl->options.headers);
@@@ -2073,7 -2109,7 +2134,7 @@@
  			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");
 +		php_error_docref(NULL, E_WARNING, "Cannot use empty request method");
  		return FAILURE;
  	}
  
@@@ -2096,9 -2132,11 +2157,9 @@@ static void php_http_client_curl_handle
  
  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);
  
 -	php_resource_factory_handle_dtor(handler->rf, handler->handle TSRMLS_CC);
 +	php_resource_factory_handle_dtor(handler->rf, handler->handle);
  	php_resource_factory_free(&handler->rf);
  
  	php_http_message_body_free(&handler->response.body);
@@@ -2107,32 -2145,21 +2168,32 @@@
  	php_http_buffer_dtor(&handler->options.cookies);
  	zend_hash_destroy(&handler->options.cache);
  
 +#if PHP_HTTP_CURL_VERSION(7,21,3)
 +	if (handler->options.resolve) {
 +		curl_slist_free_all(handler->options.resolve);
 +		handler->options.resolve = NULL;
 +	}
 +#endif
 +
  	if (handler->options.headers) {
  		curl_slist_free_all(handler->options.headers);
  		handler->options.headers = NULL;
  	}
  
 +	if (handler->options.proxyheaders) {
 +		curl_slist_free_all(handler->options.proxyheaders);
 +		handler->options.proxyheaders = 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->multi");
 +	if (!handle && !(handle = php_resource_factory_handle_ctor(h->rf, NULL))) {
 +		php_error_docref(NULL, E_WARNING, "Failed to initialize curl handle");
  		return NULL;
  	}
  
@@@ -2147,6 -2174,7 +2208,6 @@@
  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) {
@@@ -2163,7 -2191,7 +2224,7 @@@
  #endif
  	curl->unfinished = 0;
  
 -	php_resource_factory_handle_dtor(h->rf, curl->handle TSRMLS_CC);
 +	php_resource_factory_handle_dtor(h->rf, curl->handle);
  
  	efree(curl);
  	h->ctx = NULL;
@@@ -2180,38 -2208,37 +2241,38 @@@ static void queue_dtor(php_http_client_
  	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)
 +static php_resource_factory_t *create_rf(php_http_client_t *h, php_http_client_enqueue_t *enqueue)
  {
  	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");
 +		php_error_docref(NULL, E_WARNING, "Cannot request empty URL");
  		return NULL;
  	}
  
  	/* only if the client itself is setup for persistence */
  	if (php_resource_factory_is_persistent(h->rf)) {
 +		zend_string *id;
  		char *id_str = NULL;
  		size_t id_len;
  		int port = url->port ? url->port : 80;
 -		zval **zport;
 +		zval *zport;
  		php_persistent_handle_factory_t *phf = h->rf->data;
  
 -		if (SUCCESS == zend_hash_find(enqueue->options, ZEND_STRS("port"), (void *) &zport)) {
 -			zval *zcpy = php_http_ztyp(IS_LONG, *zport);
 +		if ((zport = zend_hash_str_find(enqueue->options, ZEND_STRL("port")))) {
 +			zend_long lport = zval_get_long(zport);
  
 -			if (Z_LVAL_P(zcpy)) {
 -				port = Z_LVAL_P(zcpy);
 +			if (lport > 0) {
 +				port = lport;
  			}
 -			zval_ptr_dtor(&zcpy);
  		}
  
 -		id_len = spprintf(&id_str, 0, "%.*s:%s:%d", (int) phf->ident.len, phf->ident.str, 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);
 +		id_len = spprintf(&id_str, 0, "%.*s:%s:%d", (int) phf->ident->len, phf->ident->val, STR_PTR(url->host), port);
 +		id = php_http_cs2zs(id_str, id_len);
 +		pf = php_persistent_handle_concede(NULL, PHP_HTTP_G->client.curl.driver.request_name, id, NULL, NULL);
 +		zend_string_release(id);
  	}
  
  	if (pf) {
@@@ -2230,8 -2257,9 +2291,8 @@@ static ZEND_RESULT_CODE php_http_client
  	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);
 +	rf = create_rf(h, enqueue);
  	if (!rf) {
  		return FAILURE;
  	}
@@@ -2252,7 -2280,7 +2313,7 @@@
  
  	if (CURLM_OK != (rs = curl_multi_add_handle(curl->handle->multi, handler->handle))) {
  		php_http_client_curl_handler_dtor(handler);
 -		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not enqueue request: %s", curl_multi_strerror(rs));
 +		php_error_docref(NULL, E_WARNING, "Could not enqueue request: %s", curl_multi_strerror(rs));
  		return FAILURE;
  	}
  
@@@ -2273,13 -2301,14 +2334,13 @@@ static ZEND_RESULT_CODE php_http_client
  	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->multi, 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));
 +		php_error_docref(NULL, E_WARNING, "Could not dequeue request: %s", curl_multi_strerror(rs));
  	}
  
  	return FAILURE;
@@@ -2378,7 -2407,10 +2439,7 @@@ static ZEND_RESULT_CODE php_http_client
  {
  #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 {
@@@ -2389,7 -2421,7 +2450,7 @@@
  #endif
  
  			if (ev_rc < 0) {
 -				php_error_docref(NULL TSRMLS_CC, E_ERROR, "Error in event_base_dispatch()");
 +				php_error_docref(NULL, E_ERROR, "Error in event_base_dispatch()");
  				return FAILURE;
  			}
  		} while (curl->unfinished && !EG(exception));
@@@ -2400,9 -2432,9 +2461,9 @@@
  			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());
 +				php_error_docref(NULL, E_WARNING, "WinSock error: %d", WSAGetLastError());
  #else
 -				php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", strerror(errno));
 +				php_error_docref(NULL, E_WARNING, "%s", strerror(errno));
  #endif
  				return FAILURE;
  			}
@@@ -2439,31 -2471,34 +2500,31 @@@ static ZEND_RESULT_CODE php_http_client
  	return SUCCESS;
  }
  
 -static int apply_available_options(void *pDest TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key)
 +static int apply_available_options(zval *pDest, int num_args, va_list args, zend_hash_key *hash_key)
  {
 -	php_http_option_t *opt = pDest;
 +	php_http_option_t *opt = Z_PTR_P(pDest);
  	HashTable *ht;
 -	zval *entry;
 +	zval entry;
  	int c;
  
  	ht = va_arg(args, HashTable*);
  
 -	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));
 +		array_init_size(&entry, c);
 +		zend_hash_apply_with_arguments(&opt->suboptions.options, apply_available_options, 1, Z_ARRVAL(entry));
  	} else {
  		/* catch deliberate NULL options */
  		if (Z_TYPE(opt->defval) == IS_STRING && !Z_STRVAL(opt->defval)) {
 -			ZVAL_NULL(entry);
 +			ZVAL_NULL(&entry);
  		} else {
 -			ZVAL_COPY_VALUE(entry, &opt->defval);
 -			zval_copy_ctor(entry);
 +			ZVAL_ZVAL(&entry, &opt->defval, 1, 0);
  		}
  	}
  
 -	if (hash_key->nKeyLength) {
 -		zend_hash_quick_update(ht, hash_key->arKey, hash_key->nKeyLength, hash_key->h, (void *) &entry, sizeof(zval *), NULL);
 +	if (hash_key->key) {
 +		zend_hash_update(ht, hash_key->key, &entry);
  	} else {
 -		zend_hash_index_update(ht, hash_key->h, (void *) &entry, sizeof(zval *), NULL);
 +		zend_hash_index_update(ht, hash_key->h, &entry);
  	}
  
  	return ZEND_HASH_APPLY_KEEP;
@@@ -2472,6 -2507,7 +2533,6 @@@
  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:
@@@ -2493,11 -2529,11 +2554,11 @@@
  		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);
 +		zend_hash_apply_with_arguments(&php_http_curle_options.options, 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);
 +		zend_hash_apply_with_arguments(&php_http_curlm_options.options, apply_available_options, 1, *(HashTable **) res);
  		break;
  
  	default:
@@@ -2531,20 -2567,19 +2592,20 @@@ PHP_MINIT_FUNCTION(http_client_curl
  {
  	curl_version_info_data *info;
  	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)) {
 +	PHP_HTTP_G->client.curl.driver.driver_name = zend_string_init(ZEND_STRL("curl"), 1);
 +	PHP_HTTP_G->client.curl.driver.client_name = zend_string_init(ZEND_STRL("http\\Client\\Curl"), 1);
 +	PHP_HTTP_G->client.curl.driver.request_name = zend_string_init(ZEND_STRL("http\\Client\\Curl\\Request"), 1);
 +	PHP_HTTP_G->client.curl.driver.client_ops = &php_http_client_curl_ops;
 +
 +	if (SUCCESS != php_http_client_driver_add(&PHP_HTTP_G->client.curl.driver)) {
  		return FAILURE;
  	}
  
 -	if (SUCCESS != php_persistent_handle_provide(ZEND_STRL("http\\Client\\Curl"), &php_http_curlm_resource_factory_ops, NULL, NULL TSRMLS_CC)) {
 +	if (SUCCESS != php_persistent_handle_provide(PHP_HTTP_G->client.curl.driver.client_name, &php_http_curlm_resource_factory_ops, NULL, NULL)) {
  		return FAILURE;
  	}
 -	if (SUCCESS != php_persistent_handle_provide(ZEND_STRL("http\\Client\\Curl\\Request"), &php_http_curle_resource_factory_ops, NULL, NULL TSRMLS_CC)) {
 +	if (SUCCESS != php_persistent_handle_provide(PHP_HTTP_G->client.curl.driver.request_name, &php_http_curle_resource_factory_ops, NULL, NULL)) {
  		return FAILURE;
  	}
  
@@@ -2552,13 -2587,13 +2613,13 @@@
  		options->getter = php_http_curle_get_option;
  		options->setter = php_http_curle_set_option;
  
 -		php_http_curle_options_init(options TSRMLS_CC);
 +		php_http_curle_options_init(options);
  	}
  	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);
 +		php_http_curlm_options_init(options);
  	}
  
  	if ((info = curl_version_info(CURLVERSION_NOW))) {
@@@ -2697,11 -2732,8 +2758,11 @@@
  
  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_persistent_handle_cleanup(PHP_HTTP_G->client.curl.driver.client_name, NULL);
 +	php_persistent_handle_cleanup(PHP_HTTP_G->client.curl.driver.request_name, NULL);
 +	zend_string_release(PHP_HTTP_G->client.curl.driver.client_name);
 +	zend_string_release(PHP_HTTP_G->client.curl.driver.request_name);
 +	zend_string_release(PHP_HTTP_G->client.curl.driver.driver_name);
  
  	php_http_options_dtor(&php_http_curle_options);
  	php_http_options_dtor(&php_http_curlm_options);
diff --combined tests/helper/proxy.inc
index 2fb3477,61a68bd..d60b564
--- a/tests/helper/proxy.inc
+++ b/tests/helper/proxy.inc
@@@ -1,4 -1,4 +1,4 @@@
 -<?php 
 +<?php
  
  include "dump.inc";
  include "server.inc";
@@@ -6,19 -6,20 +6,21 @@@
  serve(function($client) {
  	/* this might be a proxy connect or a standard request */
  	$request = new http\Message($client, false);
- 
- 	if ($request->getHeader("Proxy-Connection")) {
+ 	
+ 	/* libcurl >= 7.48 does not send Proxy-Connection anymore */
+ 	if ($request->getHeader("Proxy-Connection")
+ 	||	$request->getRequestMethod() === "CONNECT") {
  		$response = new http\Env\Response;
  		$response->setEnvRequest($request);
  		$response->send($client);
 -		
 +
  		/* soak up the request following the connect */
  		new http\Message($client, false);
  	}
 -	
 +
  	/* return the initial message as response body */
  	$response = new http\Env\Response;
 +	$response->setHeader("X-Request-Content-Length", $request->getBody()->stat("size"));
  	/* avoid OOM with $response->getBody()->append($request); */
  	dump_message($response->getBody()->getResource(), $request);
  	$response->send($client);