From: Michael Wallner <mike@php.net>
Date: Wed, 9 Mar 2016 09:56:20 +0000 (+0100)
Subject: Merge branch 'v2.5.x'
X-Git-Tag: RELEASE_3_0_1~1
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=e57370d1f00da9e12de0917a9f907281ab8e84b5;hp=-c

Merge branch 'v2.5.x'
---

e57370d1f00da9e12de0917a9f907281ab8e84b5
diff --combined src/php_http_client_curl.c
index e79ef15,f49aabc..e56f8d4
--- a/src/php_http_client_curl.c
+++ b/src/php_http_client_curl.c
@@@ -76,15 -76,15 +76,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;
@@@ -110,7 -110,7 +110,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;
  
@@@ -121,7 -121,7 +121,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;
  
@@@ -133,7 -133,7 +133,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);
  
@@@ -156,12 -156,12 +156,12 @@@ 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)
  {
  	return curl_multi_init();
  }
  
 -static void php_http_curlm_dtor(void *opaque, void *handle TSRMLS_DC)
 +static void php_http_curlm_dtor(void *opaque, void *handle)
  {
  	curl_multi_cleanup(handle);
  }
@@@ -178,10 -178,11 +178,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();
  	}
@@@ -220,6 -221,7 +220,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;
@@@ -314,161 -316,131 +314,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
  
@@@ -476,14 -448,16 +476,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:
@@@ -495,13 -469,13 +495,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;
@@@ -512,12 -486,12 +512,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;
@@@ -548,9 -522,9 +548,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
@@@ -558,41 -532,41 +558,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;
@@@ -603,14 -577,14 +603,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,
@@@ -635,24 -609,20 +635,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);
  
@@@ -665,6 -635,7 +665,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, &remaining);
@@@ -687,7 -658,7 +687,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);
@@@ -701,7 -672,7 +701,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);
  			}
@@@ -744,6 -715,7 +744,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;
@@@ -752,7 -724,7 +752,7 @@@
  		while (CURLM_CALL_MULTI_PERFORM == (rc = curl_multi_socket_action(curl->handle, 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);
@@@ -769,11 -741,12 +769,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, 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);
@@@ -796,6 -769,7 +796,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));
@@@ -823,7 -797,7 +823,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;
  		}
  
@@@ -876,7 -850,7 +876,7 @@@ 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;
@@@ -891,7 -865,7 +891,7 @@@ static ZEND_RESULT_CODE php_http_curle_
  	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;
@@@ -908,12 -882,11 +908,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;
@@@ -922,20 -895,19 +922,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) {
@@@ -957,7 -929,7 +957,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;
  }
  
@@@ -965,6 -937,7 +965,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) {
@@@ -972,7 -945,7 +972,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;
  			}
  		}
@@@ -997,7 -970,7 +997,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;
@@@ -1008,7 -981,7 +1008,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));
@@@ -1023,29 -996,32 +1023,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;
@@@ -1108,16 -1084,26 +1108,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;
@@@ -1135,28 -1121,26 +1135,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)) {
@@@ -1175,18 -1159,18 +1175,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;
 +		HashTable *ht = HASH_OF(val);
 +		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);
 +		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;
@@@ -1224,13 -1208,13 +1224,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 */
@@@ -1245,7 -1229,7 +1245,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
@@@ -1312,8 -1296,8 +1312,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);
@@@ -1346,7 -1330,7 +1346,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
@@@ -1363,17 -1347,18 +1363,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 */
@@@ -1392,7 -1377,7 +1392,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;
  	}
  
@@@ -1402,7 -1387,7 +1402,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);
  	}
@@@ -1411,7 -1396,7 +1411,7 @@@
  	}
  
  	/* cookiesession, don't load session cookies from cookiestore */
 -	php_http_option_register(registry, ZEND_STRL("cookiesession"), CURLOPT_COOKIESESSION, IS_BOOL);
 +	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;
@@@ -1441,9 -1426,9 +1441,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;
  	}
@@@ -1462,7 -1447,7 +1462,7 @@@
  		}
  		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;
@@@ -1470,29 -1455,29 +1470,29 @@@
  		}
  		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)
+ #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;
  #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))) {
@@@ -1520,15 -1505,13 +1520,15 @@@
  #	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))
 -		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))) {
 +		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
@@@ -1551,7 -1534,7 +1551,7 @@@
  		}
  #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
  	}
  }
@@@ -1562,12 -1545,8 +1562,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;
  }
@@@ -1579,16 -1558,17 +1579,16 @@@ static ZEND_RESULT_CODE php_http_curle_
  	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:
 +	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;
@@@ -1604,15 -1584,11 +1604,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;
  			}
@@@ -1651,7 -1627,7 +1651,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;
  }
@@@ -1664,10 -1640,12 +1664,10 @@@ static ZEND_RESULT_CODE php_http_curlm_
  	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;
 +		zval *entry;
  		HashTable *ht = HASH_OF(value);
  		int c = zend_hash_num_elements(ht);
  		char **ptr = ecalloc(c + 1, sizeof(char *));
@@@ -1677,11 -1655,9 +1677,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)) {
@@@ -1730,11 -1706,11 +1730,11 @@@ 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 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;
  
@@@ -1758,7 -1734,7 +1758,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);
@@@ -1781,7 -1757,7 +1781,7 @@@
  #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
@@@ -1795,24 -1771,20 +1795,24 @@@ static ZEND_RESULT_CODE php_http_curlm_
  	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;
@@@ -1828,11 -1800,11 +1828,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;
  }
@@@ -1898,9 -1870,10 +1898,9 @@@ static php_http_client_curl_handler_t *
  {
  	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");
 +	if (!(handle = php_resource_factory_handle_ctor(rf, NULL))) {
 +		php_error_docref(NULL, E_WARNING, "Failed to initialize curl handle");
  		return NULL;
  	}
  
@@@ -1908,7 -1881,7 +1908,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);
@@@ -1949,10 -1922,11 +1949,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';
@@@ -1968,33 -1942,34 +1968,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);
@@@ -2044,7 -2019,7 +2044,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;
  	}
  
@@@ -2065,9 -2040,11 +2065,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);
@@@ -2076,32 -2053,21 +2076,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");
 +	if (!handle && !(handle = php_resource_factory_handle_ctor(h->rf, NULL))) {
 +		php_error_docref(NULL, E_WARNING, "Failed to initialize curl handle");
  		return NULL;
  	}
  
@@@ -2116,6 -2082,7 +2116,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) {
@@@ -2132,7 -2099,7 +2132,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;
@@@ -2149,37 -2116,36 +2149,37 @@@ 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;
  
 -		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:%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);
 +		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) {
@@@ -2198,8 -2164,9 +2198,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;
  	}
@@@ -2230,7 -2197,7 +2230,7 @@@
  
  		return SUCCESS;
  	} else {
 -		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;
  	}
  }
@@@ -2240,13 -2207,14 +2240,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, 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;
@@@ -2345,7 -2313,10 +2345,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 {
@@@ -2356,7 -2327,7 +2356,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));
@@@ -2367,9 -2338,9 +2367,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;
  			}
@@@ -2406,31 -2377,34 +2406,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;
@@@ -2439,6 -2413,7 +2439,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:
@@@ -2460,11 -2435,11 +2460,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:
@@@ -2497,20 -2472,19 +2497,20 @@@ php_http_client_ops_t *php_http_client_
  PHP_MINIT_FUNCTION(http_client_curl)
  {
  	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;
  	}
  
@@@ -2518,13 -2492,13 +2518,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);
  	}
  
  	/*
@@@ -2534,6 -2508,9 +2534,9 @@@
  	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
+ #if PHP_HTTP_CURL_VERSION(7,47,0)
+ 	REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "HTTP_VERSION_2TLS", CURL_HTTP_VERSION_2TLS, CONST_CS|CONST_PERSISTENT);
  #endif
  	REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "HTTP_VERSION_ANY", CURL_HTTP_VERSION_NONE, CONST_CS|CONST_PERSISTENT);
  
@@@ -2604,11 -2581,8 +2607,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 src/php_http_url.c
index 4009add,07121df..3ed2e3c
--- a/src/php_http_url.c
+++ b/src/php_http_url.c
@@@ -61,7 -61,7 +61,7 @@@ static inline char *localhostname(void
  
  #define url(buf) ((php_http_url_t *) (buf).data)
  
 -static php_http_url_t *php_http_url_from_env(TSRMLS_D)
 +static php_http_url_t *php_http_url_from_env(void)
  {
  	zval *https, *zhost, *zport;
  	long port;
@@@ -73,7 -73,7 +73,7 @@@
  
  	/* scheme */
  	url(buf)->scheme = &buf.data[buf.used];
 -	https = php_http_env_get_server_var(ZEND_STRL("HTTPS"), 1 TSRMLS_CC);
 +	https = php_http_env_get_server_var(ZEND_STRL("HTTPS"), 1);
  	if (https && !strcasecmp(Z_STRVAL_P(https), "ON")) {
  		php_http_buffer_append(&buf, "https", sizeof("https"));
  	} else {
@@@ -82,9 -82,9 +82,9 @@@
  
  	/* host */
  	url(buf)->host = &buf.data[buf.used];
 -	if ((((zhost = php_http_env_get_server_var(ZEND_STRL("HTTP_HOST"), 1 TSRMLS_CC)) ||
 -			(zhost = php_http_env_get_server_var(ZEND_STRL("SERVER_NAME"), 1 TSRMLS_CC)) ||
 -			(zhost = php_http_env_get_server_var(ZEND_STRL("SERVER_ADDR"), 1 TSRMLS_CC)))) && Z_STRLEN_P(zhost)) {
 +	if ((((zhost = php_http_env_get_server_var(ZEND_STRL("HTTP_HOST"), 1)) ||
 +			(zhost = php_http_env_get_server_var(ZEND_STRL("SERVER_NAME"), 1)) ||
 +			(zhost = php_http_env_get_server_var(ZEND_STRL("SERVER_ADDR"), 1)))) && Z_STRLEN_P(zhost)) {
  		size_t stop_at = strspn(Z_STRVAL_P(zhost), "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-.");
  
  		php_http_buffer_append(&buf, Z_STRVAL_P(zhost), stop_at);
@@@ -97,7 -97,7 +97,7 @@@
  	}
  
  	/* port */
 -	zport = php_http_env_get_server_var(ZEND_STRL("SERVER_PORT"), 1 TSRMLS_CC);
 +	zport = php_http_env_get_server_var(ZEND_STRL("SERVER_PORT"), 1);
  	if (zport && IS_LONG == is_numeric_string(Z_STRVAL_P(zport), Z_STRLEN_P(zport), &port, NULL, 0)) {
  		url(buf)->port = port;
  	}
@@@ -154,7 -154,7 +154,7 @@@
  	} \
  } while (0)
  
 -php_http_url_t *php_http_url_mod(const php_http_url_t *old_url, const php_http_url_t *new_url, unsigned flags TSRMLS_DC)
 +php_http_url_t *php_http_url_mod(const php_http_url_t *old_url, const php_http_url_t *new_url, unsigned flags)
  {
  	php_http_url_t *tmp_url = NULL;
  	php_http_buffer_t buf;
@@@ -165,9 -165,9 +165,9 @@@
  
  	/* set from env if requested */
  	if (flags & PHP_HTTP_URL_FROM_ENV) {
 -		php_http_url_t *env_url = php_http_url_from_env(TSRMLS_C);
 +		php_http_url_t *env_url = php_http_url_from_env();
  
 -		old_url = tmp_url = php_http_url_mod(env_url, old_url, flags ^ PHP_HTTP_URL_FROM_ENV TSRMLS_CC);
 +		old_url = tmp_url = php_http_url_mod(env_url, old_url, flags ^ PHP_HTTP_URL_FROM_ENV);
  		php_http_url_free(&env_url);
  	}
  
@@@ -228,17 -228,17 +228,17 @@@
  		if ((flags & PHP_HTTP_URL_JOIN_QUERY) && url_isset(new_url, query) && url_isset(old_url, query)) {
  			zval qarr, qstr;
  			
 -			INIT_PZVAL(&qstr);
 -			INIT_PZVAL(&qarr);
  			array_init(&qarr);
  			
 -			ZVAL_STRING(&qstr, old_url->query, 0);
 -			php_http_querystring_update(&qarr, &qstr, NULL TSRMLS_CC);
 -			ZVAL_STRING(&qstr, new_url->query, 0);
 -			php_http_querystring_update(&qarr, &qstr, NULL TSRMLS_CC);
 +			ZVAL_STRING(&qstr, old_url->query);
 +			php_http_querystring_update(&qarr, &qstr, NULL);
 +			zval_ptr_dtor(&qstr);
 +			ZVAL_STRING(&qstr, new_url->query);
 +			php_http_querystring_update(&qarr, &qstr, NULL);
 +			zval_ptr_dtor(&qstr);
  			
  			ZVAL_NULL(&qstr);
 -			php_http_querystring_update(&qarr, NULL, &qstr TSRMLS_CC);
 +			php_http_querystring_update(&qarr, NULL, &qstr);
  
  			url(buf)->query = &buf.data[buf.used];
  			url_append(&buf, php_http_buffer_append(&buf, Z_STRVAL(qstr), Z_STRLEN(qstr) + 1));
@@@ -423,9 -423,9 +423,9 @@@ char *php_http_url_authority_to_string(
  	return buf.data;
  }
  
 -php_http_url_t *php_http_url_from_zval(zval *value, unsigned flags TSRMLS_DC)
 +php_http_url_t *php_http_url_from_zval(zval *value, unsigned flags)
  {
 -	zval *zcpy;
 +	zend_string *zs;
  	php_http_url_t *purl;
  
  	switch (Z_TYPE_P(value)) {
@@@ -435,9 -435,9 +435,9 @@@
  		break;
  
  	default:
 -		zcpy = php_http_ztyp(IS_STRING, value);
 -		purl = php_http_url_parse(Z_STRVAL_P(zcpy), Z_STRLEN_P(zcpy), flags TSRMLS_CC);
 -		zval_ptr_dtor(&zcpy);
 +		zs = zval_get_string(value);
 +		purl = php_http_url_parse(zs->val, zs->len, flags);
 +		zend_string_release(zs);
  	}
  
  	return purl;
@@@ -445,66 -445,67 +445,66 @@@
  
  php_http_url_t *php_http_url_from_struct(HashTable *ht)
  {
 -	zval **e;
 +	zval *e;
  	php_http_buffer_t buf;
  
  	php_http_buffer_init_ex(&buf, MAX(PHP_HTTP_BUFFER_DEFAULT_SIZE, sizeof(php_http_url_t)<<2), PHP_HTTP_BUFFER_INIT_PREALLOC);
  	php_http_buffer_account(&buf, sizeof(php_http_url_t));
  	memset(buf.data, 0, buf.used);
  
 -	if (SUCCESS == zend_hash_find(ht, "scheme", sizeof("scheme"), (void *) &e)) {
 -		zval *cpy = php_http_ztyp(IS_STRING, *e);
 +	if ((e = zend_hash_str_find_ind(ht, ZEND_STRL("scheme")))) {
 +		zend_string *zs = zval_get_string(e);
  		url(buf)->scheme = &buf.data[buf.used];
 -		url_append(&buf, php_http_buffer_append(&buf, Z_STRVAL_P(cpy), Z_STRLEN_P(cpy) + 1));
 -		zval_ptr_dtor(&cpy);
 +		url_append(&buf, php_http_buffer_append(&buf, zs->val, zs->len + 1));
 +		zend_string_release(zs);
  	}
 -	if (SUCCESS == zend_hash_find(ht, "user", sizeof("user"), (void *) &e)) {
 -		zval *cpy = php_http_ztyp(IS_STRING, *e);
 +	if ((e = zend_hash_str_find_ind(ht, ZEND_STRL("user")))) {
 +		zend_string *zs = zval_get_string(e);
  		url(buf)->user = &buf.data[buf.used];
 -		url_append(&buf, php_http_buffer_append(&buf, Z_STRVAL_P(cpy), Z_STRLEN_P(cpy) + 1));
 -		zval_ptr_dtor(&cpy);
 +		url_append(&buf, php_http_buffer_append(&buf, zs->val, zs->len + 1));
 +		zend_string_release(zs);
  	}
 -	if (SUCCESS == zend_hash_find(ht, "pass", sizeof("pass"), (void *) &e)) {
 -		zval *cpy = php_http_ztyp(IS_STRING, *e);
 +	if ((e = zend_hash_str_find_ind(ht, ZEND_STRL("pass")))) {
 +		zend_string *zs = zval_get_string(e);
  		url(buf)->pass = &buf.data[buf.used];
 -		url_append(&buf, php_http_buffer_append(&buf, Z_STRVAL_P(cpy), Z_STRLEN_P(cpy) + 1));
 -		zval_ptr_dtor(&cpy);
 +		url_append(&buf, php_http_buffer_append(&buf, zs->val, zs->len + 1));
 +		zend_string_release(zs);
  	}
 -	if (SUCCESS == zend_hash_find(ht, "host", sizeof("host"), (void *) &e)) {
 -		zval *cpy = php_http_ztyp(IS_STRING, *e);
 +	if ((e = zend_hash_str_find_ind(ht, ZEND_STRL("host")))) {
 +		zend_string *zs = zval_get_string(e);
  		url(buf)->host = &buf.data[buf.used];
 -		url_append(&buf, php_http_buffer_append(&buf, Z_STRVAL_P(cpy), Z_STRLEN_P(cpy) + 1));
 -		zval_ptr_dtor(&cpy);
 +		url_append(&buf, php_http_buffer_append(&buf, zs->val, zs->len + 1));
 +		zend_string_release(zs);
  	}
 -	if (SUCCESS == zend_hash_find(ht, "port", sizeof("port"), (void *) &e)) {
 -		zval *cpy = php_http_ztyp(IS_LONG, *e);
 -		url(buf)->port = (unsigned short) Z_LVAL_P(cpy);
 -		zval_ptr_dtor(&cpy);
 +	if ((e = zend_hash_str_find_ind(ht, ZEND_STRL("port")))) {
 +		url(buf)->port = (unsigned short) zval_get_long(e);
  	}
 -	if (SUCCESS == zend_hash_find(ht, "path", sizeof("path"), (void *) &e)) {
 -		zval *cpy = php_http_ztyp(IS_STRING, *e);
 +	if ((e = zend_hash_str_find_ind(ht, ZEND_STRL("path")))) {
 +		zend_string *zs = zval_get_string(e);
  		url(buf)->path = &buf.data[buf.used];
 -		url_append(&buf, php_http_buffer_append(&buf, Z_STRVAL_P(cpy), Z_STRLEN_P(cpy) + 1));
 -		zval_ptr_dtor(&cpy);
 +		url_append(&buf, php_http_buffer_append(&buf, zs->val, zs->len + 1));
 +		zend_string_release(zs);
  	}
 -	if (SUCCESS == zend_hash_find(ht, "query", sizeof("query"), (void *) &e)) {
 -		zval *cpy = php_http_ztyp(IS_STRING, *e);
 +	if ((e = zend_hash_str_find_ind(ht, ZEND_STRL("query")))) {
 +		zend_string *zs = zval_get_string(e);
  		url(buf)->query = &buf.data[buf.used];
 -		url_append(&buf, php_http_buffer_append(&buf, Z_STRVAL_P(cpy), Z_STRLEN_P(cpy) + 1));
 -		zval_ptr_dtor(&cpy);
 +		url_append(&buf, php_http_buffer_append(&buf, zs->val, zs->len + 1));
 +		zend_string_release(zs);
  	}
 -	if (SUCCESS == zend_hash_find(ht, "fragment", sizeof("fragment"), (void *) &e)) {
 -		zval *cpy = php_http_ztyp(IS_STRING, *e);
 +	if ((e = zend_hash_str_find_ind(ht, ZEND_STRL("fragment")))) {
 +		zend_string *zs = zval_get_string(e);
  		url(buf)->fragment = &buf.data[buf.used];
 -		url_append(&buf, php_http_buffer_append(&buf, Z_STRVAL_P(cpy), Z_STRLEN_P(cpy) + 1));
 -		zval_ptr_dtor(&cpy);
 +		url_append(&buf, php_http_buffer_append(&buf, zs->val, zs->len + 1));
 +		zend_string_release(zs);
  	}
  
  	return url(buf);
  }
  
 -HashTable *php_http_url_to_struct(const php_http_url_t *url, zval *strct TSRMLS_DC)
 +HashTable *php_http_url_to_struct(const php_http_url_t *url, zval *strct)
  {
 -	zval arr;
 +	HashTable *ht;
 +	zval tmp;
  
  	if (strct) {
  		switch (Z_TYPE_P(strct)) {
@@@ -514,69 -515,53 +514,69 @@@
  				/* no break */
  			case IS_ARRAY:
  			case IS_OBJECT:
 -				INIT_PZVAL_ARRAY((&arr), HASH_OF(strct));
 +				ht = HASH_OF(strct);
  				break;
  		}
  	} else {
 -		INIT_PZVAL(&arr);
 -		array_init(&arr);
 +		ALLOC_HASHTABLE(ht);
 +		zend_hash_init(ht, 8, NULL, ZVAL_PTR_DTOR, 0);
 +	}
 +
 +#define url_struct_add(part) \
 +	if (Z_TYPE_P(strct) == IS_ARRAY) { \
 +		zend_hash_str_update(Z_ARRVAL_P(strct), part, lenof(part), &tmp); \
 +	} else { \
 +		zend_update_property(Z_OBJCE_P(strct), strct, part, lenof(part), &tmp); \
 +		zval_ptr_dtor(&tmp); \
  	}
  
  	if (url) {
  		if (url->scheme) {
 -			add_assoc_string(&arr, "scheme", url->scheme, 1);
 +			ZVAL_STRING(&tmp, url->scheme);
 +			url_struct_add("scheme");
  		}
  		if (url->user) {
 -			add_assoc_string(&arr, "user", url->user, 1);
 +			ZVAL_STRING(&tmp, url->user);
 +			url_struct_add("user");
  		}
  		if (url->pass) {
 -			add_assoc_string(&arr, "pass", url->pass, 1);
 +			ZVAL_STRING(&tmp, url->pass);
 +			url_struct_add("pass");
  		}
  		if (url->host) {
 -			add_assoc_string(&arr, "host", url->host, 1);
 +			ZVAL_STRING(&tmp, url->host);
 +			url_struct_add("host");
  		}
  		if (url->port) {
 -			add_assoc_long(&arr, "port", (long) url->port);
 +			ZVAL_LONG(&tmp, url->port);
 +			url_struct_add("port");
  		}
  		if (url->path) {
 -			add_assoc_string(&arr, "path", url->path, 1);
 +			ZVAL_STRING(&tmp, url->path);
 +			url_struct_add("path");
  		}
  		if (url->query) {
 -			add_assoc_string(&arr, "query", url->query, 1);
 +			ZVAL_STRING(&tmp, url->query);
 +			url_struct_add("query");
  		}
  		if (url->fragment) {
 -			add_assoc_string(&arr, "fragment", url->fragment, 1);
 +			ZVAL_STRING(&tmp, url->fragment);
 +			url_struct_add("fragment");
  		}
  	}
  
 -	return Z_ARRVAL(arr);
 +	return ht;
  }
  
 -ZEND_RESULT_CODE php_http_url_encode_hash(HashTable *hash, const char *pre_encoded_str, size_t pre_encoded_len, char **encoded_str, size_t *encoded_len TSRMLS_DC)
 +ZEND_RESULT_CODE php_http_url_encode_hash(HashTable *hash, const char *pre_encoded_str, size_t pre_encoded_len, char **encoded_str, size_t *encoded_len)
  {
  	const char *arg_sep_str = "&";
  	size_t arg_sep_len = 1;
  	php_http_buffer_t *qstr = php_http_buffer_new();
  
 -	php_http_url_argsep(&arg_sep_str, &arg_sep_len TSRMLS_CC);
 +	php_http_url_argsep(&arg_sep_str, &arg_sep_len);
  
 -	if (SUCCESS != php_http_url_encode_hash_ex(hash, qstr, arg_sep_str, arg_sep_len, "=", 1, pre_encoded_str, pre_encoded_len TSRMLS_CC)) {
 +	if (SUCCESS != php_http_url_encode_hash_ex(hash, qstr, arg_sep_str, arg_sep_len, "=", 1, pre_encoded_str, pre_encoded_len)) {
  		php_http_buffer_free(&qstr);
  		return FAILURE;
  	}
@@@ -587,13 -572,13 +587,13 @@@
  	return SUCCESS;
  }
  
 -ZEND_RESULT_CODE php_http_url_encode_hash_ex(HashTable *hash, php_http_buffer_t *qstr, const char *arg_sep_str, size_t arg_sep_len, const char *val_sep_str, size_t val_sep_len, const char *pre_encoded_str, size_t pre_encoded_len TSRMLS_DC)
 +ZEND_RESULT_CODE php_http_url_encode_hash_ex(HashTable *hash, php_http_buffer_t *qstr, const char *arg_sep_str, size_t arg_sep_len, const char *val_sep_str, size_t val_sep_len, const char *pre_encoded_str, size_t pre_encoded_len)
  {
  	if (pre_encoded_len && pre_encoded_str) {
  		php_http_buffer_append(qstr, pre_encoded_str, pre_encoded_len);
  	}
  
 -	if (!php_http_params_to_string(qstr, hash, arg_sep_str, arg_sep_len, "", 0, val_sep_str, val_sep_len, PHP_HTTP_PARAMS_QUERY TSRMLS_CC)) {
 +	if (!php_http_params_to_string(qstr, hash, arg_sep_str, arg_sep_len, "", 0, val_sep_str, val_sep_len, PHP_HTTP_PARAMS_QUERY)) {
  		return FAILURE;
  	}
  
@@@ -602,6 -587,9 +602,6 @@@
  
  struct parse_state {
  	php_http_url_t url;
 -#ifdef ZTS
 -	void ***ts;
 -#endif
  	const char *ptr;
  	const char *end;
  	size_t maxlen;
@@@ -760,12 -748,13 +760,12 @@@ static size_t parse_mb(struct parse_sta
  	}
  
  	if (!silent) {
 -		TSRMLS_FETCH_FROM_CTX(state->ts);
  		if (consumed) {
 -			php_error_docref(NULL TSRMLS_CC, E_WARNING,
 +			php_error_docref(NULL, E_WARNING,
  					"Failed to parse %s; unexpected multibyte sequence 0x%x at pos %u in '%s'",
  					parse_what[what], wchar, (unsigned) (ptr - begin), begin);
  		} else {
 -			php_error_docref(NULL TSRMLS_CC, E_WARNING,
 +			php_error_docref(NULL, E_WARNING,
  					"Failed to parse %s; unexpected byte 0x%02x at pos %u in '%s'",
  					parse_what[what], (unsigned char) *ptr, (unsigned) (ptr - begin), begin);
  		}
@@@ -778,6 -767,7 +778,6 @@@ static ZEND_RESULT_CODE parse_userinfo(
  {
  	size_t mb;
  	const char *password = NULL, *end = state->ptr, *tmp = ptr;
 -	TSRMLS_FETCH_FROM_CTX(state->ts);
  
  	state->url.user = &state->buffer[state->offset];
  
@@@ -785,7 -775,7 +785,7 @@@
  		switch (*ptr) {
  		case ':':
  			if (password) {
 -				php_error_docref(NULL TSRMLS_CC, E_WARNING,
 +				php_error_docref(NULL, E_WARNING,
  						"Failed to parse password; duplicate ':' at pos %u in '%s'",
  						(unsigned) (ptr - tmp), tmp);
  				return FAILURE;
@@@ -797,7 -787,7 +797,7 @@@
  
  		case '%':
  			if (ptr[1] != '%' && (end - ptr <= 2 || !isxdigit(*(ptr+1)) || !isxdigit(*(ptr+2)))) {
 -				php_error_docref(NULL TSRMLS_CC, E_WARNING,
 +				php_error_docref(NULL, E_WARNING,
  						"Failed to parse userinfo; invalid percent encoding at pos %u in '%s'",
  						(unsigned) (ptr - tmp), tmp);
  				return FAILURE;
@@@ -840,7 -830,7 +840,7 @@@
  
  #if defined(PHP_WIN32) || defined(HAVE_UIDNA_IDNTOASCII)
  typedef size_t (*parse_mb_func)(unsigned *wc, const char *ptr, const char *end);
 -static ZEND_RESULT_CODE to_utf16(parse_mb_func fn, const char *u8, uint16_t **u16, size_t *len TSRMLS_DC)
 +static ZEND_RESULT_CODE to_utf16(parse_mb_func fn, const char *u8, uint16_t **u16, size_t *len)
  {
  	size_t offset = 0, u8_len = strlen(u8);
  
@@@ -854,7 -844,7 +854,7 @@@
  
  		if (!consumed) {
  			efree(*u16);
 -			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse UTF-8 at pos %zu of '%s'", offset, u8);
 +			php_error_docref(NULL, E_WARNING, "Failed to parse UTF-8 at pos %zu of '%s'", offset, u8);
  			return FAILURE;
  		} else {
  			offset += consumed;
@@@ -870,7 -860,7 +870,7 @@@
  		case 0:
  		default:
  			efree(*u16);
 -			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to convert UTF-32 'U+%X' to UTF-16", wc);
 +			php_error_docref(NULL, E_WARNING, "Failed to convert UTF-32 'U+%X' to UTF-16", wc);
  			return FAILURE;
  		}
  	}
@@@ -888,6 -878,7 +888,6 @@@ static ZEND_RESULT_CODE parse_idn2(stru
  {
  	char *idn = NULL;
  	int rv = -1;
 -	TSRMLS_FETCH_FROM_CTX(state->ts);
  
  	if (state->flags & PHP_HTTP_URL_PARSE_MBUTF8) {
  		rv = idn2_lookup_u8((const unsigned char *) state->url.host, (unsigned char **) &idn, IDN2_NFC_INPUT);
@@@ -898,7 -889,7 +898,7 @@@
  	}
  #	endif
  	if (rv != IDN2_OK) {
 -		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse IDN; %s", idn2_strerror(rv));
 +		php_error_docref(NULL, E_WARNING, "Failed to parse IDN; %s", idn2_strerror(rv));
  		return FAILURE;
  	} else {
  		size_t idnlen = strlen(idn);
@@@ -913,6 -904,7 +913,6 @@@ static ZEND_RESULT_CODE parse_idn(struc
  {
  	char *idn = NULL;
  	int rv = -1;
 -	TSRMLS_FETCH_FROM_CTX(state->ts);
  
  	if (state->flags & PHP_HTTP_URL_PARSE_MBUTF8) {
  		rv = idna_to_ascii_8z(state->url.host, &idn, IDNA_ALLOW_UNASSIGNED|IDNA_USE_STD3_ASCII_RULES);
@@@ -923,7 -915,7 +923,7 @@@
  	}
  #	endif
  	if (rv != IDNA_SUCCESS) {
 -		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse IDN; %s", idna_strerror(rv));
 +		php_error_docref(NULL, E_WARNING, "Failed to parse IDN; %s", idna_strerror(rv));
  		return FAILURE;
  	} else {
  		size_t idnlen = strlen(idn);
@@@ -949,19 -941,20 +949,19 @@@ static ZEND_RESULT_CODE parse_uidn(stru
  	uint16_t *uhost_str, ahost_str[MAXHOSTNAMELEN], *ahost_ptr;
  	size_t uhost_len, ahost_len;
  	UErrorCode error = U_ZERO_ERROR;
 -	TSRMLS_FETCH_FROM_CTX(state->ts);
  
  	if (state->flags & PHP_HTTP_URL_PARSE_MBUTF8) {
 -		if (SUCCESS != to_utf16(parse_mb_utf8, state->url.host, &uhost_str, &uhost_len TSRMLS_CC)) {
 +		if (SUCCESS != to_utf16(parse_mb_utf8, state->url.host, &uhost_str, &uhost_len)) {
  			return FAILURE;
  		}
  #ifdef PHP_HTTP_HAVE_WCHAR
  	} else if (state->flags & PHP_HTTP_URL_PARSE_MBLOC) {
 -		if (SUCCESS != to_utf16(parse_mb_loc, state->url.host, &uhost_str, &uhost_len TSRMLS_CC)) {
 +		if (SUCCESS != to_utf16(parse_mb_loc, state->url.host, &uhost_str, &uhost_len)) {
  			return FAILURE;
  		}
  #endif
  	} else {
 -		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse IDN; codepage not specified");
 +		php_error_docref(NULL, E_WARNING, "Failed to parse IDN; codepage not specified");
  		return FAILURE;
  	}
  
@@@ -969,7 -962,7 +969,7 @@@
  	efree(uhost_str);
  
  	if (error != U_ZERO_ERROR) {
 -		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse IDN; ICU error %d", error);
 +		php_error_docref(NULL, E_WARNING, "Failed to parse IDN; ICU error %d", error);
  		return FAILURE;
  	}
  
@@@ -990,27 -983,28 +990,27 @@@ static ZEND_RESULT_CODE parse_widn(stru
  	char *host_ptr;
  	uint16_t *uhost_str, ahost_str[MAXHOSTNAMELEN], *ahost_ptr;
  	size_t uhost_len;
 -	TSRMLS_FETCH_FROM_CTX(state->ts);
  
  	if (state->flags & PHP_HTTP_URL_PARSE_MBUTF8) {
  		if (SUCCESS != to_utf16(parse_mb_utf8, state->url.host, &uhost_str, &uhost_len)) {
 -			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse IDN");
 +			php_error_docref(NULL, E_WARNING, "Failed to parse IDN");
  			return FAILURE;
  		}
  #ifdef PHP_HTTP_HAVE_WCHAR
  	} else if (state->flags & PHP_HTTP_URL_PARSE_MBLOC) {
  		if (SUCCESS != to_utf16(parse_mb_loc, state->url.host, &uhost_str, &uhost_len)) {
 -			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse IDN");
 +			php_error_docref(NULL, E_WARNING, "Failed to parse IDN");
  			return FAILURE;
  		}
  #endif
  	} else {
 -		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse IDN");
 +		php_error_docref(NULL, E_WARNING, "Failed to parse IDN");
  		return FAILURE;
  	}
  
  	if (!IdnToAscii(IDN_ALLOW_UNASSIGNED|IDN_USE_STD3_ASCII_RULES, uhost_str, uhost_len, ahost_str, MAXHOSTNAMELEN)) {
  		efree(uhost_str);
 -		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse IDN");
 +		php_error_docref(NULL, E_WARNING, "Failed to parse IDN");
  		return FAILURE;
  	}
  
@@@ -1031,6 -1025,7 +1031,6 @@@
  static const char *parse_ip6(struct parse_state *state, const char *ptr)
  {
  	const char *error = NULL, *end = state->ptr, *tmp = memchr(ptr, ']', end - ptr);
 -	TSRMLS_FETCH_FROM_CTX(state->ts);
  
  	if (tmp) {
  		size_t addrlen = tmp - ptr + 1;
@@@ -1056,7 -1051,7 +1056,7 @@@
  	}
  
  	if (error) {
 -		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse hostinfo; %s", error);
 +		php_error_docref(NULL, E_WARNING, "Failed to parse hostinfo; %s", error);
  		return NULL;
  	}
  
@@@ -1068,6 -1063,7 +1068,6 @@@ static ZEND_RESULT_CODE parse_hostinfo(
  {
  	size_t mb, len;
  	const char *end = state->ptr, *tmp = ptr, *port = NULL, *label = NULL;
 -	TSRMLS_FETCH_FROM_CTX(state->ts);
  
  #ifdef HAVE_INET_PTON
  	if (*ptr == '[' && !(ptr = parse_ip6(state, ptr))) {
@@@ -1079,7 -1075,7 +1079,7 @@@
  		switch (*ptr) {
  		case ':':
  			if (port) {
 -				php_error_docref(NULL TSRMLS_CC, E_WARNING,
 +				php_error_docref(NULL, E_WARNING,
  						"Failed to parse port; unexpected ':' at pos %u in '%s'",
  						(unsigned) (ptr - tmp), tmp);
  				return FAILURE;
@@@ -1089,7 -1085,7 +1089,7 @@@
  
  		case '%':
  			if (ptr[1] != '%' && (end - ptr <= 2 || !isxdigit(*(ptr+1)) || !isxdigit(*(ptr+2)))) {
 -				php_error_docref(NULL TSRMLS_CC, E_WARNING,
 +				php_error_docref(NULL, E_WARNING,
  						"Failed to parse hostinfo; invalid percent encoding at pos %u in '%s'",
  						(unsigned) (ptr - tmp), tmp);
  				return FAILURE;
@@@ -1106,7 -1102,7 +1106,7 @@@
  				/* sort of a compromise, just ensure we don't end up
  				 * with a dot at the beginning or two consecutive dots
  				 */
 -				php_error_docref(NULL TSRMLS_CC, E_WARNING,
 +				php_error_docref(NULL, E_WARNING,
  						"Failed to parse %s; unexpected '%c' at pos %u in '%s'",
  						port ? "port" : "host",
  						(unsigned char) *ptr, (unsigned) (ptr - tmp), tmp);
@@@ -1125,7 -1121,7 +1125,7 @@@
  		case 'o': case 'p': case 'q': case 'r': case 's': case 't': case 'u':
  		case 'v': case 'w': case 'x': case 'y': case 'z':
  			if (port) {
 -				php_error_docref(NULL TSRMLS_CC, E_WARNING,
 +				php_error_docref(NULL, E_WARNING,
  						"Failed to parse port; unexpected char '%c' at pos %u in '%s'",
  						(unsigned char) *ptr, (unsigned) (ptr - tmp), tmp);
  				return FAILURE;
@@@ -1147,7 -1143,7 +1147,7 @@@
  			if (ptr == end) {
  				break;
  			} else if (port) {
 -				php_error_docref(NULL TSRMLS_CC, E_WARNING,
 +				php_error_docref(NULL, E_WARNING,
  						"Failed to parse port; unexpected byte 0x%02x at pos %u in '%s'",
  						(unsigned char) *ptr, (unsigned) (ptr - tmp), tmp);
  				return FAILURE;
@@@ -1191,7 -1187,8 +1191,7 @@@ static const char *parse_authority(stru
  		case '@':
  			/* userinfo delimiter */
  			if (host) {
 -				TSRMLS_FETCH_FROM_CTX(state->ts);
 -				php_error_docref(NULL TSRMLS_CC, E_WARNING,
 +				php_error_docref(NULL, E_WARNING,
  						"Failed to parse userinfo; unexpected '@'");
  				return NULL;
  			}
@@@ -1223,6 -1220,7 +1223,6 @@@ static const char *parse_path(struct pa
  {
  	size_t mb;
  	const char *tmp;
 -	TSRMLS_FETCH_FROM_CTX(state->ts);
  
  	/* is there actually a path to parse? */
  	if (!*state->ptr) {
@@@ -1239,7 -1237,7 +1239,7 @@@
  
  		case '%':
  			if (state->ptr[1] != '%' && (state->end - state->ptr <= 2 || !isxdigit(*(state->ptr+1)) || !isxdigit(*(state->ptr+2)))) {
 -				php_error_docref(NULL TSRMLS_CC, E_WARNING,
 +				php_error_docref(NULL, E_WARNING,
  						"Failed to parse path; invalid percent encoding at pos %u in '%s'",
  						(unsigned) (state->ptr - tmp), tmp);
  				return NULL;
@@@ -1290,6 -1288,7 +1290,6 @@@ static const char *parse_query(struct p
  {
  	size_t mb;
  	const char *tmp = state->ptr + !!*state->ptr;
 -	TSRMLS_FETCH_FROM_CTX(state->ts);
  
  	/* is there actually a query to parse? */
  	if (*state->ptr != '?') {
@@@ -1307,7 -1306,7 +1307,7 @@@
  
  		case '%':
  			if (state->ptr[1] != '%' && (state->end - state->ptr <= 2 || !isxdigit(*(state->ptr+1)) || !isxdigit(*(state->ptr+2)))) {
 -				php_error_docref(NULL TSRMLS_CC, E_WARNING,
 +				php_error_docref(NULL, E_WARNING,
  						"Failed to parse query; invalid percent encoding at pos %u in '%s'",
  						(unsigned) (state->ptr - tmp), tmp);
  				return NULL;
@@@ -1368,6 -1367,7 +1368,6 @@@ static const char *parse_fragment(struc
  {
  	size_t mb;
  	const char *tmp;
 -	TSRMLS_FETCH_FROM_CTX(state->ts);
  
  	/* is there actually a fragment to parse? */
  	if (*state->ptr != '#') {
@@@ -1382,7 -1382,7 +1382,7 @@@
  		switch (*state->ptr) {
  		case '%':
  			if (state->ptr[1] != '%' && (state->end - state->ptr <= 2 || !isxdigit(*(state->ptr+1)) || !isxdigit(*(state->ptr+2)))) {
 -				php_error_docref(NULL TSRMLS_CC, E_WARNING,
 +				php_error_docref(NULL, E_WARNING,
  						"Failed to parse fragment; invalid percent encoding at pos %u in '%s'",
  						(unsigned) (state->ptr - tmp), tmp);
  				return NULL;
@@@ -1468,7 -1468,7 +1468,7 @@@ static const char *parse_scheme(struct 
  		case '7': case '8': case '9':
  		case '+': case '-': case '.':
  			if (state->ptr == tmp) {
- 				return tmp;
+ 				goto softfail;
  			}
  			/* no break */
  		case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': case 'G':
@@@ -1485,28 -1485,30 +1485,29 @@@
  
  		default:
  			if (!(mb = parse_mb(state, PARSE_SCHEME, state->ptr, state->end, tmp, 1))) {
- 				/* soft fail; parse path next */
- 				return tmp;
+ 				goto softfail;
  			}
  			state->ptr += mb - 1;
  		}
  	} while (++state->ptr != state->end);
  
+ softfail:
+ 	state->offset = 0;
  	return state->ptr = tmp;
  }
  
 -php_http_url_t *php_http_url_parse(const char *str, size_t len, unsigned flags TSRMLS_DC)
 +php_http_url_t *php_http_url_parse(const char *str, size_t len, unsigned flags)
  {
- 	size_t maxlen = 3 * len;
+ 	size_t maxlen = 3 * len + 8 /* null bytes for all components */;
  	struct parse_state *state = ecalloc(1, sizeof(*state) + maxlen);
  
  	state->end = str + len;
  	state->ptr = str;
  	state->flags = flags;
  	state->maxlen = maxlen;
 -	TSRMLS_SET_CTX(state->ts);
  
  	if (!parse_scheme(state)) {
 -		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse URL scheme: '%s'", state->ptr);
 +		php_error_docref(NULL, E_WARNING, "Failed to parse URL scheme: '%s'", state->ptr);
  		efree(state);
  		return NULL;
  	}
@@@ -1517,13 -1519,13 +1518,13 @@@
  	}
  
  	if (!parse_query(state)) {
 -		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse URL query: '%s'", state->ptr);
 +		php_error_docref(NULL, E_WARNING, "Failed to parse URL query: '%s'", state->ptr);
  		efree(state);
  		return NULL;
  	}
  
  	if (!parse_fragment(state)) {
 -		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse URL fragment: '%s'", state->ptr);
 +		php_error_docref(NULL, E_WARNING, "Failed to parse URL fragment: '%s'", state->ptr);
  		efree(state);
  		return NULL;
  	}
@@@ -1531,7 -1533,7 +1532,7 @@@
  	return (php_http_url_t *) state;
  }
  
 -php_http_url_t *php_http_url_parse_authority(const char *str, size_t len, unsigned flags TSRMLS_DC)
 +php_http_url_t *php_http_url_parse_authority(const char *str, size_t len, unsigned flags)
  {
  	size_t maxlen = 3 * len;
  	struct parse_state *state = ecalloc(1, sizeof(*state) + maxlen);
@@@ -1540,6 -1542,7 +1541,6 @@@
  	state->ptr = str;
  	state->flags = flags;
  	state->maxlen = maxlen;
 -	TSRMLS_SET_CTX(state->ts);
  
  	if (!(state->ptr = parse_authority(state))) {
  		efree(state);
@@@ -1547,7 -1550,7 +1548,7 @@@
  	}
  
  	if (state->ptr != state->end) {
 -		php_error_docref(NULL TSRMLS_CC, E_WARNING,
 +		php_error_docref(NULL, E_WARNING,
  				"Failed to parse URL authority, unexpected character at pos %u in '%s'",
  				(unsigned) (state->ptr - str), str);
  		efree(state);
@@@ -1557,19 -1560,6 +1558,19 @@@
  	return (php_http_url_t *) state;
  }
  
 +static zend_class_entry *php_http_url_class_entry;
 +static zend_class_entry *php_http_env_url_class_entry;
 +
 +zend_class_entry *php_http_url_get_class_entry(void)
 +{
 +	return php_http_url_class_entry;
 +}
 +
 +zend_class_entry *php_http_get_env_url_class_entry(void)
 +{
 +	return php_http_env_url_class_entry;
 +}
 +
  ZEND_BEGIN_ARG_INFO_EX(ai_HttpUrl___construct, 0, 0, 0)
  	ZEND_ARG_INFO(0, old_url)
  	ZEND_ARG_INFO(0, new_url)
@@@ -1578,40 -1568,35 +1579,40 @@@ ZEND_END_ARG_INFO()
  PHP_METHOD(HttpUrl, __construct)
  {
  	zval *new_url = NULL, *old_url = NULL;
 -	long flags = PHP_HTTP_URL_FROM_ENV;
 +	zend_long flags = 0;
  	zend_error_handling zeh;
  
 -	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z!z!l", &old_url, &new_url, &flags), invalid_arg, return);
 +	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|z!z!l", &old_url, &new_url, &flags), invalid_arg, return);
  
 -	zend_replace_error_handling(EH_THROW, php_http_exception_bad_url_class_entry, &zeh TSRMLS_CC);
 +	/* always set http\Url::FROM_ENV for instances of http\Env\Url */
 +	if (instanceof_function(Z_OBJCE_P(getThis()), php_http_env_url_class_entry)) {
 +		flags |= PHP_HTTP_URL_FROM_ENV;
 +	}
 +
 +	zend_replace_error_handling(EH_THROW, php_http_get_exception_bad_url_class_entry(), &zeh);
  	{
  		php_http_url_t *res_purl, *new_purl = NULL, *old_purl = NULL;
  
  		if (new_url) {
 -			new_purl = php_http_url_from_zval(new_url, flags TSRMLS_CC);
 +			new_purl = php_http_url_from_zval(new_url, flags);
  			if (!new_purl) {
 -				zend_restore_error_handling(&zeh TSRMLS_CC);
 +				zend_restore_error_handling(&zeh);
  				return;
  			}
  		}
  		if (old_url) {
 -			old_purl = php_http_url_from_zval(old_url, flags TSRMLS_CC);
 +			old_purl = php_http_url_from_zval(old_url, flags);
  			if (!old_purl) {
  				if (new_purl) {
  					php_http_url_free(&new_purl);
  				}
 -				zend_restore_error_handling(&zeh TSRMLS_CC);
 +				zend_restore_error_handling(&zeh);
  				return;
  			}
  		}
  
 -		res_purl = php_http_url_mod(old_purl, new_purl, flags TSRMLS_CC);
 -		php_http_url_to_struct(res_purl, getThis() TSRMLS_CC);
 +		res_purl = php_http_url_mod(old_purl, new_purl, flags);
 +		php_http_url_to_struct(res_purl, getThis());
  
  		php_http_url_free(&res_purl);
  		if (old_purl) {
@@@ -1621,7 -1606,7 +1622,7 @@@
  			php_http_url_free(&new_purl);
  		}
  	}
 -	zend_restore_error_handling(&zeh TSRMLS_CC);
 +	zend_restore_error_handling(&zeh);
  }
  
  ZEND_BEGIN_ARG_INFO_EX(ai_HttpUrl_mod, 0, 0, 1)
@@@ -1631,19 -1616,19 +1632,19 @@@ ZEND_END_ARG_INFO()
  PHP_METHOD(HttpUrl, mod)
  {
  	zval *new_url = NULL;
 -	long flags = PHP_HTTP_URL_JOIN_PATH | PHP_HTTP_URL_JOIN_QUERY | PHP_HTTP_URL_SANITIZE_PATH;
 +	zend_long flags = PHP_HTTP_URL_JOIN_PATH | PHP_HTTP_URL_JOIN_QUERY | PHP_HTTP_URL_SANITIZE_PATH;
  	zend_error_handling zeh;
  
 -	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z!|l", &new_url, &flags), invalid_arg, return);
 +	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "z!|l", &new_url, &flags), invalid_arg, return);
  
 -	zend_replace_error_handling(EH_THROW, php_http_exception_bad_url_class_entry, &zeh TSRMLS_CC);
 +	zend_replace_error_handling(EH_THROW, php_http_get_exception_bad_url_class_entry(), &zeh);
  	{
  		php_http_url_t *new_purl = NULL, *old_purl = NULL;
  
  		if (new_url) {
 -			new_purl = php_http_url_from_zval(new_url, flags TSRMLS_CC);
 +			new_purl = php_http_url_from_zval(new_url, flags);
  			if (!new_purl) {
 -				zend_restore_error_handling(&zeh TSRMLS_CC);
 +				zend_restore_error_handling(&zeh);
  				return;
  			}
  		}
@@@ -1651,10 -1636,10 +1652,10 @@@
  		if ((old_purl = php_http_url_from_struct(HASH_OF(getThis())))) {
  			php_http_url_t *res_purl;
  
 -			ZVAL_OBJVAL(return_value, zend_objects_clone_obj(getThis() TSRMLS_CC), 0);
 +			ZVAL_OBJ(return_value, zend_objects_clone_obj(getThis()));
  
 -			res_purl = php_http_url_mod(old_purl, new_purl, flags TSRMLS_CC);
 -			php_http_url_to_struct(res_purl, return_value TSRMLS_CC);
 +			res_purl = php_http_url_mod(old_purl, new_purl, flags);
 +			php_http_url_to_struct(res_purl, return_value);
  
  			php_http_url_free(&res_purl);
  			php_http_url_free(&old_purl);
@@@ -1663,7 -1648,7 +1664,7 @@@
  			php_http_url_free(&new_purl);
  		}
  	}
 -	zend_restore_error_handling(&zeh TSRMLS_CC);
 +	zend_restore_error_handling(&zeh);
  }
  
  ZEND_BEGIN_ARG_INFO_EX(ai_HttpUrl_toString, 0, 0, 0)
@@@ -1679,7 -1664,7 +1680,7 @@@ PHP_METHOD(HttpUrl, toString
  
  			php_http_url_to_string(purl, &str, &len, 0);
  			php_http_url_free(&purl);
 -			RETURN_STRINGL(str, len, 0);
 +			RETURN_STR(php_http_cs2zs(str, len));
  		}
  	}
  	RETURN_EMPTY_STRING();
@@@ -1697,7 -1682,7 +1698,7 @@@ PHP_METHOD(HttpUrl, toArray
  
  	/* strip any non-URL properties */
  	purl = php_http_url_from_struct(HASH_OF(getThis()));
 -	php_http_url_to_struct(purl, return_value TSRMLS_CC);
 +	php_http_url_to_struct(purl, return_value);
  	php_http_url_free(&purl);
  }
  
@@@ -1710,47 -1695,46 +1711,47 @@@ static zend_function_entry php_http_url
  	EMPTY_FUNCTION_ENTRY
  };
  
 -zend_class_entry *php_http_url_class_entry;
 -
  PHP_MINIT_FUNCTION(http_url)
  {
  	zend_class_entry ce = {0};
  
  	INIT_NS_CLASS_ENTRY(ce, "http", "Url", php_http_url_methods);
 -	php_http_url_class_entry = zend_register_internal_class(&ce TSRMLS_CC);
 -
 -	zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("scheme"), ZEND_ACC_PUBLIC TSRMLS_CC);
 -	zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("user"), ZEND_ACC_PUBLIC TSRMLS_CC);
 -	zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("pass"), ZEND_ACC_PUBLIC TSRMLS_CC);
 -	zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("host"), ZEND_ACC_PUBLIC TSRMLS_CC);
 -	zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("port"), ZEND_ACC_PUBLIC TSRMLS_CC);
 -	zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("path"), ZEND_ACC_PUBLIC TSRMLS_CC);
 -	zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("query"), ZEND_ACC_PUBLIC TSRMLS_CC);
 -	zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("fragment"), ZEND_ACC_PUBLIC TSRMLS_CC);
 -
 -	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("REPLACE"), PHP_HTTP_URL_REPLACE TSRMLS_CC);
 -	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("JOIN_PATH"), PHP_HTTP_URL_JOIN_PATH TSRMLS_CC);
 -	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("JOIN_QUERY"), PHP_HTTP_URL_JOIN_QUERY TSRMLS_CC);
 -	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_USER"), PHP_HTTP_URL_STRIP_USER TSRMLS_CC);
 -	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_PASS"), PHP_HTTP_URL_STRIP_PASS TSRMLS_CC);
 -	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_AUTH"), PHP_HTTP_URL_STRIP_AUTH TSRMLS_CC);
 -	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_PORT"), PHP_HTTP_URL_STRIP_PORT TSRMLS_CC);
 -	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_PATH"), PHP_HTTP_URL_STRIP_PATH TSRMLS_CC);
 -	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_QUERY"), PHP_HTTP_URL_STRIP_QUERY TSRMLS_CC);
 -	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_FRAGMENT"), PHP_HTTP_URL_STRIP_FRAGMENT TSRMLS_CC);
 -	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_ALL"), PHP_HTTP_URL_STRIP_ALL TSRMLS_CC);
 -	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("FROM_ENV"), PHP_HTTP_URL_FROM_ENV TSRMLS_CC);
 -	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("SANITIZE_PATH"), PHP_HTTP_URL_SANITIZE_PATH TSRMLS_CC);
 +	php_http_url_class_entry = zend_register_internal_class(&ce);
 +
 +	zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("scheme"), ZEND_ACC_PUBLIC);
 +	zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("user"), ZEND_ACC_PUBLIC);
 +	zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("pass"), ZEND_ACC_PUBLIC);
 +	zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("host"), ZEND_ACC_PUBLIC);
 +	zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("port"), ZEND_ACC_PUBLIC);
 +	zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("path"), ZEND_ACC_PUBLIC);
 +	zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("query"), ZEND_ACC_PUBLIC);
 +	zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("fragment"), ZEND_ACC_PUBLIC);
 +
 +	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("REPLACE"), PHP_HTTP_URL_REPLACE);
 +	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("JOIN_PATH"), PHP_HTTP_URL_JOIN_PATH);
 +	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("JOIN_QUERY"), PHP_HTTP_URL_JOIN_QUERY);
 +	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_USER"), PHP_HTTP_URL_STRIP_USER);
 +	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_PASS"), PHP_HTTP_URL_STRIP_PASS);
 +	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_AUTH"), PHP_HTTP_URL_STRIP_AUTH);
 +	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_PORT"), PHP_HTTP_URL_STRIP_PORT);
 +	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_PATH"), PHP_HTTP_URL_STRIP_PATH);
 +	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_QUERY"), PHP_HTTP_URL_STRIP_QUERY);
 +	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_FRAGMENT"), PHP_HTTP_URL_STRIP_FRAGMENT);
 +	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_ALL"), PHP_HTTP_URL_STRIP_ALL);
 +	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("FROM_ENV"), PHP_HTTP_URL_FROM_ENV);
 +	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("SANITIZE_PATH"), PHP_HTTP_URL_SANITIZE_PATH);
  
  #ifdef PHP_HTTP_HAVE_WCHAR
 -	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("PARSE_MBLOC"), PHP_HTTP_URL_PARSE_MBLOC TSRMLS_CC);
 +	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("PARSE_MBLOC"), PHP_HTTP_URL_PARSE_MBLOC);
  #endif
 -	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("PARSE_MBUTF8"), PHP_HTTP_URL_PARSE_MBUTF8 TSRMLS_CC);
 +	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("PARSE_MBUTF8"), PHP_HTTP_URL_PARSE_MBUTF8);
  #if defined(PHP_HTTP_HAVE_IDN2) || defined(PHP_HTTP_HAVE_IDN) || defined(HAVE_UIDNA_IDNTOASCII)
 -	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("PARSE_TOIDN"), PHP_HTTP_URL_PARSE_TOIDN TSRMLS_CC);
 +	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("PARSE_TOIDN"), PHP_HTTP_URL_PARSE_TOIDN);
  #endif
 -	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("PARSE_TOPCT"), PHP_HTTP_URL_PARSE_TOPCT TSRMLS_CC);
 +	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("PARSE_TOPCT"), PHP_HTTP_URL_PARSE_TOPCT);
 +
 +	INIT_NS_CLASS_ENTRY(ce, "http\\Env", "Url", php_http_url_methods);
 +	php_http_env_url_class_entry = zend_register_internal_class_ex(&ce, php_http_url_class_entry);
  
  	return SUCCESS;
  }