X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_api.c;h=b6e40344c27001aeba102f149c63ea4b164af5a2;hp=797e9a2a54744e6881ea7fc430baf080513ac3db;hb=280b469e963c4e96a1cc8de6c500ed58aaf629b5;hpb=798c9bcc3be9879c108f032cf354f83e243da1fb

diff --git a/http_request_api.c b/http_request_api.c
index 797e9a2..b6e4034 100644
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -19,6 +19,7 @@
 #ifdef HTTP_HAVE_CURL
 
 #include "php_http_api.h"
+#include "php_http_persistent_handle_api.h"
 #include "php_http_request_api.h"
 #include "php_http_url_api.h"
 
@@ -83,6 +84,51 @@ static struct gcry_thread_cbs http_gnutls_tsl = {
 #endif
 /* }}} */
 
+/* safe curl wrappers */
+#define init_curl_storage(ch) \
+	{\
+		http_request_storage *st = pecalloc(1, sizeof(http_request_storage), 1); \
+		curl_easy_setopt(ch, CURLOPT_PRIVATE, st); \
+		curl_easy_setopt(ch, CURLOPT_ERRORBUFFER, st->errorbuffer); \
+	}
+
+static void *safe_curl_init(void)
+{
+	CURL *ch;
+	
+	if ((ch = curl_easy_init())) {
+		init_curl_storage(ch);
+		return ch;
+	}
+	return NULL;
+}
+static void *safe_curl_copy(void *p)
+{
+	CURL *ch;
+	
+	if ((ch = curl_easy_duphandle(p))) {
+		init_curl_storage(ch);
+		return ch;
+	}
+	return NULL;
+}
+static void safe_curl_dtor(void *p) {
+	http_request_storage *st = http_request_storage_get(p);
+	
+	curl_easy_cleanup(p);
+	
+	if (st) {
+		if (st->url) {
+			pefree(st->url, 1);
+		}
+		if (st->cookiestore) {
+			pefree(st->cookiestore, 1);
+		}
+		pefree(st, 1);
+	}
+}
+/* }}} */
+
 /* {{{ MINIT */
 PHP_MINIT_FUNCTION(http_request)
 {
@@ -109,8 +155,15 @@ PHP_MINIT_FUNCTION(http_request)
 		return FAILURE;
 	}
 	
+	if (SUCCESS != http_persistent_handle_provide("http_request", safe_curl_init, safe_curl_dtor, safe_curl_copy)) {
+		return FAILURE;
+	}
+	
 	HTTP_LONG_CONSTANT("HTTP_AUTH_BASIC", CURLAUTH_BASIC);
 	HTTP_LONG_CONSTANT("HTTP_AUTH_DIGEST", CURLAUTH_DIGEST);
+#if HTTP_CURL_VERSION(7,19,3)
+	HTTP_LONG_CONSTANT("HTTP_AUTH_DIGEST_IE", CURLAUTH_DIGEST_IE);
+#endif
 	HTTP_LONG_CONSTANT("HTTP_AUTH_NTLM", CURLAUTH_NTLM);
 	HTTP_LONG_CONSTANT("HTTP_AUTH_GSSNEG", CURLAUTH_GSSNEGOTIATE);
 	HTTP_LONG_CONSTANT("HTTP_AUTH_ANY", CURLAUTH_ANY);
@@ -131,9 +184,22 @@ PHP_MINIT_FUNCTION(http_request)
 
 #if HTTP_CURL_VERSION(7,15,2)
 	HTTP_LONG_CONSTANT("HTTP_PROXY_SOCKS4", CURLPROXY_SOCKS4);
+#endif
+#if HTTP_CURL_VERSION(7,18,0)
+	HTTP_LONG_CONSTANT("HTTP_PROXY_SOCKS4A", CURLPROXY_SOCKS4A);
+	HTTP_LONG_CONSTANT("HTTP_PROXY_SOCKS5_HOSTNAME", CURLPROXY_SOCKS5_HOSTNAME);
 #endif
 	HTTP_LONG_CONSTANT("HTTP_PROXY_SOCKS5", CURLPROXY_SOCKS5);
 	HTTP_LONG_CONSTANT("HTTP_PROXY_HTTP", CURLPROXY_HTTP);
+#if HTTP_CURL_VERSION(7,19,4)
+	HTTP_LONG_CONSTANT("HTTP_PROXY_HTTP_1_0", CURLPROXY_HTTP_1_0);
+#endif
+
+#if HTTP_CURL_VERSION(7,19,1)
+	HTTP_LONG_CONSTANT("HTTP_POSTREDIR_301", CURL_REDIR_POST_301);
+	HTTP_LONG_CONSTANT("HTTP_POSTREDIR_302", CURL_REDIR_POST_302);
+	HTTP_LONG_CONSTANT("HTTP_POSTREDIR_ALL", CURL_REDIR_POST_ALL);
+#endif
 	return SUCCESS;
 }
 /* }}} */
@@ -169,6 +235,9 @@ static inline zval *_http_request_option_ex(http_request *request, HashTable *op
 #define http_request_option_cache_ex(r, k, kl, h, z) _http_request_option_cache_ex((r), (k), (kl), (h), (z) TSRMLS_CC)
 static inline zval *_http_request_option_cache_ex(http_request *r, char *key, size_t keylen, ulong h, zval *opt TSRMLS_DC);
 
+#define http_request_cookies_enabled(r) _http_request_cookies_enabled((r))
+static inline int _http_request_cookies_enabled(http_request *r);
+
 static size_t http_curl_read_callback(void *, size_t, size_t, void *);
 static int http_curl_progress_callback(void *, double, double, double, double);
 static int http_curl_raw_callback(CURL *, curl_infotype, char *, size_t, void *);
@@ -177,9 +246,9 @@ static curlioerr http_curl_ioctl_callback(CURL *, curliocmd, void *);
 /* }}} */
 
 /* {{{ CURL *http_curl_init(http_request *) */
-PHP_HTTP_API CURL * _http_curl_init_ex(CURL *ch, http_request *request)
+PHP_HTTP_API CURL * _http_curl_init_ex(CURL *ch, http_request *request TSRMLS_DC)
 {
-	if (ch || (ch = curl_easy_init())) {
+	if (ch || (SUCCESS == http_persistent_handle_acquire("http_request", &ch))) {
 #if defined(ZTS)
 		curl_easy_setopt(ch, CURLOPT_NOSIGNAL, 1L);
 #endif
@@ -195,9 +264,7 @@ PHP_HTTP_API CURL * _http_curl_init_ex(CURL *ch, http_request *request)
 		
 		/* set context */
 		if (request) {
-			curl_easy_setopt(ch, CURLOPT_PRIVATE, request);
 			curl_easy_setopt(ch, CURLOPT_DEBUGDATA, request);
-			curl_easy_setopt(ch, CURLOPT_ERRORBUFFER, request->_error);
 			
 			/* attach curl handle */
 			request->ch = ch;
@@ -210,17 +277,28 @@ PHP_HTTP_API CURL * _http_curl_init_ex(CURL *ch, http_request *request)
 }
 /* }}} */
 
+/* {{{ CURL *http_curl_copy(CURL *) */
+PHP_HTTP_API CURL *_http_curl_copy(CURL *ch TSRMLS_DC)
+{
+	CURL *copy;
+	
+	if (SUCCESS == http_persistent_handle_accrete("http_request", ch, &copy)) {
+		return copy;
+	}
+	return NULL;
+}
+/* }}} */
+
 /* {{{ void http_curl_free(CURL **) */
-PHP_HTTP_API void _http_curl_free(CURL **ch)
+PHP_HTTP_API void _http_curl_free(CURL **ch TSRMLS_DC)
 {
 	if (*ch) {
-		/* avoid nasty segfaults with already cleaned up callbacks */
 		curl_easy_setopt(*ch, CURLOPT_NOPROGRESS, 1L);
 		curl_easy_setopt(*ch, CURLOPT_PROGRESSFUNCTION, NULL);
 		curl_easy_setopt(*ch, CURLOPT_VERBOSE, 0L);
 		curl_easy_setopt(*ch, CURLOPT_DEBUGFUNCTION, NULL);
-		curl_easy_cleanup(*ch);
-		*ch = NULL;
+		
+		http_persistent_handle_release("http_request", ch);
 	}
 }
 /* }}} */
@@ -255,8 +333,10 @@ PHP_HTTP_API http_request *_http_request_init_ex(http_request *request, CURL *ch
 /* {{{ void http_request_dtor(http_request *) */
 PHP_HTTP_API void _http_request_dtor(http_request *request)
 {
-	http_curl_free(&request->ch);
+	TSRMLS_FETCH_FROM_CTX(request->tsrm_ls);
+	
 	http_request_reset(request);
+	http_curl_free(&request->ch);
 	
 	phpstr_dtor(&request->_cache.cookies);
 	zend_hash_destroy(&request->_cache.options);
@@ -293,11 +373,23 @@ PHP_HTTP_API void _http_request_reset(http_request *request)
 	phpstr_dtor(&request->conv.request);
 	phpstr_dtor(&request->conv.response);
 	http_request_body_dtor(request->body);
+	http_request_defaults(request);
 	
 	if (request->ch) {
-		http_request_defaults(request);
+		http_request_storage *st = http_request_storage_get(request->ch);
+		
+		if (st) {
+			if (st->url) {
+				pefree(st->url, 1);
+				st->url = NULL;
+			}
+			if (st->cookiestore) {
+				pefree(st->cookiestore, 1);
+				st->cookiestore = NULL;
+			}
+			st->errorbuffer[0] = '\0';
+		}
 	}
-	request->_error[0] = '\0';
 }
 /* }}} */
 
@@ -308,7 +400,7 @@ PHP_HTTP_API STATUS _http_request_enable_cookies(http_request *request)
 	TSRMLS_FETCH_FROM_CTX(request->tsrm_ls);
 	
 	HTTP_CHECK_CURL_INIT(request->ch, http_curl_init_ex(request->ch, request), initialized = 0);
-	if (initialized && CURLE_OK == curl_easy_setopt(request->ch, CURLOPT_COOKIEFILE, "")) {
+	if (initialized && (http_request_cookies_enabled(request) || (CURLE_OK == curl_easy_setopt(request->ch, CURLOPT_COOKIEFILE, "")))) {
 		return SUCCESS;
 	}
 	http_error(HE_WARNING, HTTP_E_REQUEST, "Could not enable cookies for this session");
@@ -323,24 +415,54 @@ PHP_HTTP_API STATUS _http_request_reset_cookies(http_request *request, int sessi
 	TSRMLS_FETCH_FROM_CTX(request->tsrm_ls);
 	
 	HTTP_CHECK_CURL_INIT(request->ch, http_curl_init_ex(request->ch, request), initialized = 0);
-	if (session_only) {
-#if HTTP_CURL_VERSION(7,15,4)
-		if (initialized && CURLE_OK == curl_easy_setopt(request->ch, CURLOPT_COOKIELIST, "SESS")) {
-			return SUCCESS;
+	if (initialized) {
+		if (!http_request_cookies_enabled(request)) {
+			if (SUCCESS != http_request_enable_cookies(request)) {
+				return FAILURE;
+			}
 		}
+		if (session_only) {
+#if HTTP_CURL_VERSION(7,15,4)
+			if (CURLE_OK == curl_easy_setopt(request->ch, CURLOPT_COOKIELIST, "SESS")) {
+				return SUCCESS;
+			}
+#else
+			http_error(HE_WARNING, HTTP_E_REQUEST, "Could not reset session cookies (need libcurl >= v7.15.4)");
 #endif
-		http_error(HE_WARNING, HTTP_E_REQUEST, "Could not reset session cookies (need libcurl >= v7.15.4)");
-	} else {
+		} else {
 #if HTTP_CURL_VERSION(7,14,1)
-		if (initialized && CURLE_OK == curl_easy_setopt(request->ch, CURLOPT_COOKIELIST, "ALL")) {
+			if (CURLE_OK == curl_easy_setopt(request->ch, CURLOPT_COOKIELIST, "ALL")) {
+				return SUCCESS;
+			}
+#else
+			http_error(HE_WARNING, HTTP_E_REQUEST, "Could not reset cookies (need libcurl >= v7.14.1)");
+#endif
+		}
+	}
+	return FAILURE;
+}
+/* }}} */
+
+PHP_HTTP_API STATUS _http_request_flush_cookies(http_request *request)
+{
+	int initialized = 1;
+	TSRMLS_FETCH_FROM_CTX(request->tsrm_ls);
+	
+	HTTP_CHECK_CURL_INIT(request->ch, http_curl_init_ex(request->ch, request), initialized = 0);
+	if (initialized) {
+		if (!http_request_cookies_enabled(request)) {
+			return FAILURE;
+		}
+#if HTTP_CURL_VERSION(7,17,1)
+		if (CURLE_OK == curl_easy_setopt(request->ch, CURLOPT_COOKIELIST, "FLUSH")) {
 			return SUCCESS;
 		}
+#else
+		http_error(HE_WARNING, HTTP_E_REQUEST, "Could not flush cookies (need libcurl >= v7.17.1)");
 #endif
-		http_error(HE_WARNING, HTTP_E_REQUEST, "Could not reset cookies (need libcurl >= v7.14.1)");
 	}
 	return FAILURE;
 }
-/* }}} */
 
 /* {{{ void http_request_defaults(http_request *) */
 PHP_HTTP_API void _http_request_defaults(http_request *request)
@@ -349,18 +471,28 @@ PHP_HTTP_API void _http_request_defaults(http_request *request)
 		HTTP_CURL_OPT(CURLOPT_PROGRESSFUNCTION, NULL);
 		HTTP_CURL_OPT(CURLOPT_URL, NULL);
 		HTTP_CURL_OPT(CURLOPT_NOPROGRESS, 1L);
+#if HTTP_CURL_VERSION(7,19,4)
+		HTTP_CURL_OPT(CURLOPT_NOPROXY, NULL);
+#endif
 		HTTP_CURL_OPT(CURLOPT_PROXY, NULL);
 		HTTP_CURL_OPT(CURLOPT_PROXYPORT, 0L);
 		HTTP_CURL_OPT(CURLOPT_PROXYTYPE, 0L);
-		HTTP_CURL_OPT(CURLOPT_PROXYUSERPWD, NULL);
+		/* libcurl < 7.19.6 does not clear auth info with USERPWD set to NULL */
+#if HTTP_CURL_VERSION(7,19,1)		
+		HTTP_CURL_OPT(CURLOPT_PROXYUSERNAME, NULL);
+		HTTP_CURL_OPT(CURLOPT_PROXYPASSWORD, NULL);
+#endif
 		HTTP_CURL_OPT(CURLOPT_PROXYAUTH, 0L);
+		HTTP_CURL_OPT(CURLOPT_HTTPPROXYTUNNEL, 0L);
 		HTTP_CURL_OPT(CURLOPT_DNS_CACHE_TIMEOUT, 60L);
 		HTTP_CURL_OPT(CURLOPT_IPRESOLVE, 0);
 		HTTP_CURL_OPT(CURLOPT_LOW_SPEED_LIMIT, 0L);
 		HTTP_CURL_OPT(CURLOPT_LOW_SPEED_TIME, 0L);
 #if HTTP_CURL_VERSION(7,15,5)
+		/* LFS weirdance
 		HTTP_CURL_OPT(CURLOPT_MAX_SEND_SPEED_LARGE, (curl_off_t) 0);
 		HTTP_CURL_OPT(CURLOPT_MAX_RECV_SPEED_LARGE, (curl_off_t) 0);
+		*/
 #endif
 		/* crashes
 		HTTP_CURL_OPT(CURLOPT_MAXCONNECTS, 5L); */
@@ -368,19 +500,40 @@ PHP_HTTP_API void _http_request_defaults(http_request *request)
 		HTTP_CURL_OPT(CURLOPT_FORBID_REUSE, 0L);
 		HTTP_CURL_OPT(CURLOPT_INTERFACE, NULL);
 		HTTP_CURL_OPT(CURLOPT_PORT, 0L);
+#if HTTP_CURL_VERSION(7,19,0)
+		HTTP_CURL_OPT(CURLOPT_ADDRESS_SCOPE, 0L);
+#endif
 #if HTTP_CURL_VERSION(7,15,2)
 		HTTP_CURL_OPT(CURLOPT_LOCALPORT, 0L);
 		HTTP_CURL_OPT(CURLOPT_LOCALPORTRANGE, 0L);
 #endif
-		HTTP_CURL_OPT(CURLOPT_USERPWD, NULL);
+		/* libcurl < 7.19.6 does not clear auth info with USERPWD set to NULL */
+#if HTTP_CURL_VERSION(7,19,1)
+		HTTP_CURL_OPT(CURLOPT_USERNAME, NULL);
+		HTTP_CURL_OPT(CURLOPT_PASSWORD, NULL);
+#endif
 		HTTP_CURL_OPT(CURLOPT_HTTPAUTH, 0L);
 		HTTP_CURL_OPT(CURLOPT_ENCODING, NULL);
+#if HTTP_CURL_VERSION(7,16,2)
+		/* we do this ourself anyway */
+		HTTP_CURL_OPT(CURLOPT_HTTP_CONTENT_DECODING, 0L);
+		HTTP_CURL_OPT(CURLOPT_HTTP_TRANSFER_DECODING, 0L);
+#endif
 		HTTP_CURL_OPT(CURLOPT_FOLLOWLOCATION, 0L);
+#if HTTP_CURL_VERSION(7,19,1)
+		HTTP_CURL_OPT(CURLOPT_POSTREDIR, 0L);
+#elif HTTP_CURL_VERSION(7,17,1)
+		HTTP_CURL_OPT(CURLOPT_POST301, 0L);
+#endif
 		HTTP_CURL_OPT(CURLOPT_UNRESTRICTED_AUTH, 0L);
 		HTTP_CURL_OPT(CURLOPT_REFERER, NULL);
-		HTTP_CURL_OPT(CURLOPT_USERAGENT, "PECL::HTTP/" PHP_EXT_HTTP_VERSION " (PHP/" PHP_VERSION ")");
+		HTTP_CURL_OPT(CURLOPT_USERAGENT, "PECL::HTTP/" PHP_HTTP_VERSION " (PHP/" PHP_VERSION ")");
 		HTTP_CURL_OPT(CURLOPT_HTTPHEADER, NULL);
 		HTTP_CURL_OPT(CURLOPT_COOKIE, NULL);
+		HTTP_CURL_OPT(CURLOPT_COOKIESESSION, 0L);
+		/* these options would enable curl's cookie engine by default which we don't want
+		HTTP_CURL_OPT(CURLOPT_COOKIEFILE, NULL);
+		HTTP_CURL_OPT(CURLOPT_COOKIEJAR, NULL); */
 #if HTTP_CURL_VERSION(7,14,1)
 		HTTP_CURL_OPT(CURLOPT_COOKIELIST, NULL);
 #endif
@@ -402,6 +555,15 @@ PHP_HTTP_API void _http_request_defaults(http_request *request)
 		HTTP_CURL_OPT(CURLOPT_SSL_VERIFYPEER, 0L);
 		HTTP_CURL_OPT(CURLOPT_SSL_VERIFYHOST, 0L);
 		HTTP_CURL_OPT(CURLOPT_SSL_CIPHER_LIST, NULL);
+#if HTTP_CURL_VERSION(7,19,0)
+		HTTP_CURL_OPT(CURLOPT_ISSUERCERT, NULL);
+	#if defined(HTTP_HAVE_OPENSSL)
+		HTTP_CURL_OPT(CURLOPT_CRLFILE, NULL);
+	#endif
+#endif
+#if HTTP_CURL_VERSION(7,19,1) && defined(HTTP_HAVE_OPENSSL)
+		HTTP_CURL_OPT(CURLOPT_CERTINFO, NULL);
+#endif
 #ifdef HTTP_CURL_CAINFO
 		HTTP_CURL_OPT(CURLOPT_CAINFO, HTTP_CURL_CAINFO);
 #else
@@ -448,13 +610,25 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 {
 	zval *zoption;
 	zend_bool range_req = 0;
+	http_request_storage *storage;
 
 	TSRMLS_FETCH_FROM_CTX(request->tsrm_ls);
 	
 	HTTP_CHECK_CURL_INIT(request->ch, http_curl_init(request), return FAILURE);
-	
+
+	if (!request->url) {
+		return FAILURE;
+	}
+	if (!(storage = http_request_storage_get(request->ch))) {
+		return FAILURE;
+	}
+	storage->errorbuffer[0] = '\0';
 	/* set options */
-	HTTP_CURL_OPT(CURLOPT_URL, request->url);
+	if (storage->url) {
+		pefree(storage->url, 1);
+	}
+	storage->url = pestrdup(request->url, 1);
+	HTTP_CURL_OPT(CURLOPT_URL, storage->url);
 
 	/* progress callback */
 	if ((zoption = http_request_option(request, options, "onprogress", -1))) {
@@ -463,9 +637,7 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 
 	/* proxy */
 	if ((zoption = http_request_option(request, options, "proxyhost", IS_STRING))) {
-		if (Z_STRLEN_P(zoption)) {
-			HTTP_CURL_OPT(CURLOPT_PROXY, Z_STRVAL_P(zoption));
-		}
+		HTTP_CURL_OPT(CURLOPT_PROXY, Z_STRVAL_P(zoption));
 		/* type */
 		if ((zoption = http_request_option(request, options, "proxytype", IS_LONG))) {
 			HTTP_CURL_OPT(CURLOPT_PROXYTYPE, Z_LVAL_P(zoption));
@@ -482,7 +654,16 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 		if ((zoption = http_request_option(request, options, "proxyauthtype", IS_LONG))) {
 			HTTP_CURL_OPT(CURLOPT_PROXYAUTH, Z_LVAL_P(zoption));
 		}
+		/* tunnel */
+		if ((zoption = http_request_option(request, options, "proxytunnel", IS_BOOL)) && Z_BVAL_P(zoption)) {
+			HTTP_CURL_OPT(CURLOPT_HTTPPROXYTUNNEL, 1L);
+		}
+	}
+#if HTTP_CURL_VERSION(7,19,4)
+	if ((zoption = http_request_option(request, options, "noproxy", IS_STRING))) {
+		HTTP_CURL_OPT(CURLOPT_NOPROXY, Z_STRVAL_P(zoption));
 	}
+#endif
 
 	/* dns */
 	if ((zoption = http_request_option(request, options, "dns_cache_timeout", IS_LONG))) {
@@ -500,12 +681,14 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 		HTTP_CURL_OPT(CURLOPT_LOW_SPEED_TIME, Z_LVAL_P(zoption));
 	}
 #if HTTP_CURL_VERSION(7,15,5)
+	/* LSF weirdance
 	if ((zoption = http_request_option(request, options, "max_send_speed", IS_LONG))) {
 		HTTP_CURL_OPT(CURLOPT_MAX_SEND_SPEED_LARGE, (curl_off_t) Z_LVAL_P(zoption));
 	}
 	if ((zoption = http_request_option(request, options, "max_recv_speed", IS_LONG))) {
 		HTTP_CURL_OPT(CURLOPT_MAX_RECV_SPEED_LARGE, (curl_off_t) Z_LVAL_P(zoption));
 	}
+	*/
 #endif
 	/* crashes
 	if ((zoption = http_request_option(request, options, "maxconnects", IS_LONG))) {
@@ -530,14 +713,15 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 			if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void *) &prs)) {
 				zend_hash_move_forward(Z_ARRVAL_P(zoption));
 				if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void *) &pre)) {
-					zval *prs_cpy = zval_copy(IS_LONG, *prs), *pre_cpy = zval_copy(IS_LONG, *pre);
+					zval *prs_cpy = http_zsep(IS_LONG, *prs);
+					zval *pre_cpy = http_zsep(IS_LONG, *pre);
 					
 					if (Z_LVAL_P(prs_cpy) && Z_LVAL_P(pre_cpy)) {
 						HTTP_CURL_OPT(CURLOPT_LOCALPORT, MIN(Z_LVAL_P(prs_cpy), Z_LVAL_P(pre_cpy)));
 						HTTP_CURL_OPT(CURLOPT_LOCALPORTRANGE, labs(Z_LVAL_P(prs_cpy)-Z_LVAL_P(pre_cpy))+1L);
 					}
-					zval_free(&prs_cpy);
-					zval_free(&pre_cpy);
+					zval_ptr_dtor(&prs_cpy);
+					zval_ptr_dtor(&pre_cpy);
 				}
 			}
 		}
@@ -548,6 +732,13 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 	if ((zoption = http_request_option(request, options, "port", IS_LONG))) {
 		HTTP_CURL_OPT(CURLOPT_PORT, Z_LVAL_P(zoption));
 	}
+	
+	/* RFC4007 zone_id */
+#if HTTP_CURL_VERSION(7,19,0)
+	if ((zoption = http_request_option(request, options, "address_scope", IS_LONG))) {
+		HTTP_CURL_OPT(CURLOPT_ADDRESS_SCOPE, Z_LVAL_P(zoption));
+	}
+#endif
 
 	/* auth */
 	if ((zoption = http_request_option(request, options, "httpauth", IS_STRING)) && Z_STRLEN_P(zoption)) {
@@ -564,6 +755,27 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 		if ((zoption = http_request_option(request, options, "unrestrictedauth", IS_BOOL))) {
 			HTTP_CURL_OPT(CURLOPT_UNRESTRICTED_AUTH, Z_LVAL_P(zoption));
 		}
+#if HTTP_CURL_VERSION(7,17,1)
+		if ((zoption = http_request_option(request, options, "postredir", IS_BOOL))) {
+#	if HTTP_CURL_VERSION(7,19,1)
+			HTTP_CURL_OPT(CURLOPT_POSTREDIR, Z_BVAL_P(zoption) ? 1L : 0L);
+#	else
+			HTTP_CURL_OPT(CURLOPT_POST301, Z_BVAL_P(zoption) ? 1L : 0L);
+#	endif
+		}
+#endif
+	}
+	
+	/* retries, defaults to 0 */
+	if ((zoption = http_request_option(request, options, "retrycount", IS_LONG))) {
+		request->_retry.count = Z_LVAL_P(zoption);
+		if ((zoption = http_request_option(request, options, "retrydelay", IS_DOUBLE))) {
+			request->_retry.delay = Z_DVAL_P(zoption);
+		} else {
+			request->_retry.delay = 0;
+		}
+	} else {
+		request->_retry.count = 0;
 	}
 
 	/* referer */
@@ -601,13 +813,14 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 					if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_PP(rr), (void *) &re, &pos2)) {
 						if (	((Z_TYPE_PP(rb) == IS_LONG) || ((Z_TYPE_PP(rb) == IS_STRING) && is_numeric_string(Z_STRVAL_PP(rb), Z_STRLEN_PP(rb), NULL, NULL, 1))) &&
 								((Z_TYPE_PP(re) == IS_LONG) || ((Z_TYPE_PP(re) == IS_STRING) && is_numeric_string(Z_STRVAL_PP(re), Z_STRLEN_PP(re), NULL, NULL, 1)))) {
-							zval *rbl = zval_copy(IS_LONG, *rb), *rel = zval_copy(IS_LONG, *re);
+							zval *rbl = http_zsep(IS_LONG, *rb);
+							zval *rel = http_zsep(IS_LONG, *re);
 							
 							if ((Z_LVAL_P(rbl) >= 0) && (Z_LVAL_P(rel) >= 0)) {
 								phpstr_appendf(&rs, "%ld-%ld,", Z_LVAL_P(rbl), Z_LVAL_P(rel));
 							}
-							zval_free(&rbl);
-							zval_free(&rel);
+							zval_ptr_dtor(&rbl);
+							zval_ptr_dtor(&rel);
 						}
 					}
 				}
@@ -636,32 +849,54 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 		HashKey header_key = initHashKey(0);
 		zval **header_val;
 		HashPosition pos;
-
+		phpstr header;
+		
+		phpstr_init(&header);
 		FOREACH_KEYVAL(pos, zoption, header_key, header_val) {
 			if (header_key.type == HASH_KEY_IS_STRING) {
-				char header[1024] = {0};
+				zval *header_cpy = http_zsep(IS_STRING, *header_val);
 				
-				ZVAL_ADDREF(*header_val);
-				convert_to_string_ex(header_val);
 				if (!strcasecmp(header_key.str, "range")) {
 					range_req = 1;
 				}
-				snprintf(header, lenof(header), "%s: %s", header_key.str, Z_STRVAL_PP(header_val));
-				request->_cache.headers = curl_slist_append(request->_cache.headers, header);
-				zval_ptr_dtor(header_val);
+
+				phpstr_appendf(&header, "%s: %s", header_key.str, Z_STRVAL_P(header_cpy));
+				phpstr_fix(&header);
+				request->_cache.headers = curl_slist_append(request->_cache.headers, PHPSTR_VAL(&header));
+				phpstr_reset(&header);
+				
+				zval_ptr_dtor(&header_cpy);
 			}
 		}
+		phpstr_dtor(&header);
 	}
 	/* etag */
 	if ((zoption = http_request_option(request, options, "etag", IS_STRING)) && Z_STRLEN_P(zoption)) {
-		char match_header[1024] = {0}, *quoted_etag = NULL;
-		
-		if ((Z_STRVAL_P(zoption)[0] != '"') || (Z_STRVAL_P(zoption)[Z_STRLEN_P(zoption)-1] != '"')) {
-			spprintf(&quoted_etag, 0, "\"%s\"", Z_STRVAL_P(zoption));
+		zend_bool is_quoted;
+		phpstr header;
+
+		phpstr_init(&header);
+		phpstr_appendf(&header, "%s: ", range_req?"If-Match":"If-None-Match");
+		if ((Z_STRVAL_P(zoption)[0] == '"') && (Z_STRVAL_P(zoption)[Z_STRLEN_P(zoption)-1] == '"')) {
+			/* properly quoted etag */
+			phpstr_append(&header, Z_STRVAL_P(zoption), Z_STRLEN_P(zoption));
+		} else if ((Z_STRVAL_P(zoption)[0] == 'W') && (Z_STRVAL_P(zoption)[1] == '/')) {
+			/* weak etag */
+			if ((Z_STRLEN_P(zoption) > 3) && (Z_STRVAL_P(zoption)[2] == '"') && (Z_STRVAL_P(zoption)[Z_STRLEN_P(zoption)-1] == '"')) {
+				/* quoted */
+				phpstr_append(&header, Z_STRVAL_P(zoption), Z_STRLEN_P(zoption));
+			} else {
+				/* unquoted */
+				phpstr_appendf(&header, "W/\"%s\"", Z_STRVAL_P(zoption) + 2);
+			}
+		} else {
+			/* assume unquoted etag */
+			phpstr_appendf(&header, "\"%s\"", Z_STRVAL_P(zoption));
 		}
-		snprintf(match_header, lenof(match_header), "%s: %s", range_req?"If-Match":"If-None-Match", quoted_etag?quoted_etag:Z_STRVAL_P(zoption));
-		request->_cache.headers = curl_slist_append(request->_cache.headers, match_header);
-		STR_FREE(quoted_etag);
+		phpstr_fix(&header);
+
+		request->_cache.headers = curl_slist_append(request->_cache.headers, PHPSTR_VAL(&header));
+		phpstr_dtor(&header);
 	}
 	/* compression */
 	if ((zoption = http_request_option(request, options, "compress", IS_BOOL)) && Z_LVAL_P(zoption)) {
@@ -701,9 +936,9 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 				
 				FOREACH_KEYVAL(pos, zoption, cookie_key, cookie_val) {
 					if (cookie_key.type == HASH_KEY_IS_STRING) {
-						zval *val = zval_copy(IS_STRING, *cookie_val);
+						zval *val = http_zsep(IS_STRING, *cookie_val);
 						phpstr_appendf(&request->_cache.cookies, "%s=%s; ", cookie_key.str, Z_STRVAL_P(val));
-						zval_free(&val);
+						zval_ptr_dtor(&val);
 					}
 				}
 				
@@ -725,8 +960,12 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 		if (Z_STRLEN_P(zoption)) {
 			HTTP_CHECK_OPEN_BASEDIR(Z_STRVAL_P(zoption), return FAILURE);
 		}
-		HTTP_CURL_OPT(CURLOPT_COOKIEFILE, Z_STRVAL_P(zoption));
-		HTTP_CURL_OPT(CURLOPT_COOKIEJAR, Z_STRVAL_P(zoption));
+		if (storage->cookiestore) {
+			pefree(storage->cookiestore, 1);
+		}
+		storage->cookiestore = pestrndup(Z_STRVAL_P(zoption), Z_STRLEN_P(zoption), 1);
+		HTTP_CURL_OPT(CURLOPT_COOKIEFILE, storage->cookiestore);
+		HTTP_CURL_OPT(CURLOPT_COOKIEJAR, storage->cookiestore);
 	}
 
 	/* maxfilesize */
@@ -739,15 +978,25 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 		HTTP_CURL_OPT(CURLOPT_HTTP_VERSION, Z_LVAL_P(zoption));
 	}
 
+#if HTTP_CURL_VERSION(7,16,2)
+	/* timeout, defaults to 0 */
+	if ((zoption = http_request_option(request, options, "timeout", IS_DOUBLE))) {
+		HTTP_CURL_OPT(CURLOPT_TIMEOUT_MS, (long)(Z_DVAL_P(zoption)*1000));
+	}
+	/* connecttimeout, defaults to 0 */
+	if ((zoption = http_request_option(request, options, "connecttimeout", IS_DOUBLE))) {
+		HTTP_CURL_OPT(CURLOPT_CONNECTTIMEOUT_MS, (long)(Z_DVAL_P(zoption)*1000));
+	}
+#else
 	/* timeout, defaults to 0 */
 	if ((zoption = http_request_option(request, options, "timeout", IS_LONG))) {
 		HTTP_CURL_OPT(CURLOPT_TIMEOUT, Z_LVAL_P(zoption));
 	}
-
 	/* connecttimeout, defaults to 0 */
 	if ((zoption = http_request_option(request, options, "connecttimeout", IS_LONG))) {
 		HTTP_CURL_OPT(CURLOPT_CONNECTTIMEOUT, Z_LVAL_P(zoption));
 	}
+#endif
 
 	/* ssl */
 	if ((zoption = http_request_option(request, options, "ssl", IS_ARRAY))) {
@@ -776,6 +1025,15 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 				HTTP_CURL_OPT_STRING(CURLOPT_CAPATH, -3, 1);
 				HTTP_CURL_OPT_STRING(CURLOPT_RANDOM_FILE, -3, 1);
 				HTTP_CURL_OPT_STRING(CURLOPT_EGDSOCKET, -3, 1);
+#if HTTP_CURL_VERSION(7,19,0)
+				HTTP_CURL_OPT_STRING(CURLOPT_ISSUERCERT, -3, 1);
+	#if defined(HTTP_HAVE_OPENSSL)
+				HTTP_CURL_OPT_STRING(CURLOPT_CRLFILE, -3, 1);
+	#endif
+#endif
+#if HTTP_CURL_VERSION(7,19,1) && defined(HTTP_HAVE_OPENSSL)
+				HTTP_CURL_OPT_LONG(CURLOPT_CERTINFO, -3);
+#endif
 			}
 		}
 	}
@@ -846,11 +1104,42 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 /* {{{ void http_request_exec(http_request *) */
 PHP_HTTP_API void _http_request_exec(http_request *request)
 {
+	uint tries = 0;
 	CURLcode result;
 	TSRMLS_FETCH_FROM_CTX(request->tsrm_ls);
 	
+retry:
 	if (CURLE_OK != (result = curl_easy_perform(request->ch))) {
-		http_error_ex(HE_WARNING, HTTP_E_REQUEST, "%s; %s (%s)", curl_easy_strerror(result), request->_error, request->url);
+		http_error_ex(HE_WARNING, HTTP_E_REQUEST, "%s; %s (%s)", curl_easy_strerror(result), http_request_storage_get(request->ch)->errorbuffer, request->url);
+#ifdef ZEND_ENGINE_2
+		if ((HTTP_G->only_exceptions || GLOBAL_ERROR_HANDLING == EH_THROW) && EG(exception)) {
+			add_property_long(EG(exception), "curlCode", result);
+		}
+#endif
+		
+		if (request->_retry.count > tries++) {
+			switch (result) {
+				case CURLE_COULDNT_RESOLVE_PROXY:
+				case CURLE_COULDNT_RESOLVE_HOST:
+				case CURLE_COULDNT_CONNECT:
+				case CURLE_WRITE_ERROR:
+				case CURLE_READ_ERROR:
+				case CURLE_OPERATION_TIMEDOUT:
+				case CURLE_SSL_CONNECT_ERROR:
+				case CURLE_GOT_NOTHING:
+				case CURLE_SSL_ENGINE_SETFAILED:
+				case CURLE_SEND_ERROR:
+				case CURLE_RECV_ERROR:
+				case CURLE_SSL_ENGINE_INITFAILED:
+				case CURLE_LOGIN_DENIED:
+					if (request->_retry.delay >= HTTP_DIFFSEC) {
+						http_sleep(request->_retry.delay);
+					}
+					goto retry;
+				default:
+					break;
+			}
+		}
 	}
 }
 /* }}} */
@@ -947,7 +1236,7 @@ static int http_curl_raw_callback(CURL *ch, curl_infotype type, char *data, size
 {
 	http_request *request = (http_request *) ctx;
 
-#define EMPTY_HEADER(d, l) ((l == 1 && d[0] == '\n') || (l == 2 && d[0] == '\r' && d[1] == '\n'))
+#define EMPTY_HEADER(d, l) (!l || (l == 1 && d[0] == '\n') || (l == 2 && d[0] == '\r' && d[1] == '\n'))
 	switch (type) {
 		case CURLINFO_DATA_IN:
 			if (request->conv.last_type == CURLINFO_HEADER_IN) {
@@ -961,40 +1250,28 @@ static int http_curl_raw_callback(CURL *ch, curl_infotype type, char *data, size
 			}
 			break;
 		case CURLINFO_DATA_OUT:
-			if (request->conv.last_type == CURLINFO_HEADER_OUT) {
-				phpstr_appends(&request->conv.request, HTTP_CRLF);
-			}
-			phpstr_append(&request->conv.request, data, length);
-			break;
 		case CURLINFO_HEADER_OUT:
-			if (!EMPTY_HEADER(data, length)) {
-				phpstr_append(&request->conv.request, data, length);
-			}
+			phpstr_append(&request->conv.request, data, length);
 			break;
 		default:
-#if 0
-			fprintf(stderr, "## ", type);
-			if (!type) {
-				fprintf(stderr, "%s", data);
-			} else {
-				ulong i;
-				for (i = 1; i <= length; ++i) {
-					fprintf(stderr, "%02X ", data[i-1] & 0xFF);
-					if (!(i % 20)) {
-						fprintf(stderr, "\n## ");
-					}
-				}
-				fprintf(stderr, "\n");
-			}
-			if (data[length-1] != 0xa) {
-				fprintf(stderr, "\n");
-			}
-#endif
 			break;
 	}
 
 #if 0
-	fprintf(stderr, "DEBUG: %3d (%5zu) %.*s%s", type, length, length, data, data[length-1]=='\n'?"":"\n");
+	{
+		const char _sym[] = "><><><";
+		if (type) {
+			for (fprintf(stderr, "%c ", _sym[type-1]); length--; data++) {
+				fprintf(stderr, HTTP_IS_CTYPE(print, *data)?"%c":"\\x%02X", (int) *data);
+				if (*data == '\n' && length) {
+					fprintf(stderr, "\n%c ", _sym[type-1]);
+				}
+			}
+			fprintf(stderr, "\n");
+		} else {
+			fprintf(stderr, "# %s", data);
+		}
+	}
 #endif
 	
 	if (type) {
@@ -1007,24 +1284,22 @@ static int http_curl_raw_callback(CURL *ch, curl_infotype type, char *data, size
 /* {{{ static inline zval *http_request_option(http_request *, HashTable *, char *, size_t, int) */
 static inline zval *_http_request_option_ex(http_request *r, HashTable *options, char *key, size_t keylen, int type TSRMLS_DC)
 {
-	zval **zoption;
-#ifdef ZEND_ENGINE_2
-	ulong h = zend_get_hash_value(key, keylen);
-#else
-	ulong h = 0;
-#endif
-	
-	if (!options || 
-#ifdef ZEND_ENGINE_2
-			(SUCCESS != zend_hash_quick_find(options, key, keylen, h, (void *) &zoption))
-#else
-			(SUCCESS != zend_hash_find(options, key, keylen, (void *) &zoption))
-#endif
-	) {
-		return NULL;
+	if (options) {
+		zval **zoption;
+		ulong h = zend_hash_func(key, keylen);
+		
+		if (SUCCESS == zend_hash_quick_find(options, key, keylen, h, (void *) &zoption)) {
+			zval *option, *cached;
+			
+			option = http_zsep(type, *zoption);
+			cached = http_request_option_cache_ex(r, key, keylen, h, option);
+			
+			zval_ptr_dtor(&option);
+			return cached;
+		}
 	}
 	
-	return http_request_option_cache_ex(r, key, keylen, h, zval_copy(type, *zoption));
+	return NULL;
 }
 /* }}} */
 
@@ -1033,25 +1308,28 @@ static inline zval *_http_request_option_cache_ex(http_request *r, char *key, si
 {
 	ZVAL_ADDREF(opt);
 	
-#ifdef ZEND_ENGINE_2
 	if (h) {
-		_zend_hash_quick_add_or_update(&r->_cache.options, key, keylen, h, &opt, sizeof(zval *), NULL, 
-			zend_hash_quick_exists(&r->_cache.options, key, keylen, h)?HASH_UPDATE:HASH_ADD ZEND_FILE_LINE_CC);
-	}
-	else
-#endif
-	{
-		if (zend_hash_exists(&r->_cache.options, key, keylen)) {
-			zend_hash_update(&r->_cache.options, key, keylen, &opt, sizeof(zval *), NULL);
-		} else {
-			zend_hash_add(&r->_cache.options, key, keylen, &opt, sizeof(zval *), NULL);
-		}
+		zend_hash_quick_update(&r->_cache.options, key, keylen, h, &opt, sizeof(zval *), NULL);
+	} else {
+		zend_hash_update(&r->_cache.options, key, keylen, &opt, sizeof(zval *), NULL);
 	}
 	
 	return opt;
 }
 /* }}} */
 
+/* {{{ static inline int http_request_cookies_enabled(http_request *) */
+static inline int _http_request_cookies_enabled(http_request *request) {
+	http_request_storage *st;
+	
+	if (request->ch && (st = http_request_storage_get(request->ch)) && st->cookiestore) {
+		/* cookies are enabled */
+		return 1;
+	}
+	return 0;
+}
+/* }}} */
+
 #endif /* HTTP_HAVE_CURL */
 
 /*