X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_api.c;h=34126d8858c52d84e06e6f9665c38e0b5e91e60e;hp=b3f7150e62fa240a74aed4ad122afb22e8662b20;hb=a759e1fae5a4d0e989b9735adf8f3224ed9419d7;hpb=8051cb5f80e8ca2d938808397fd2d9298b9a0a5d

diff --git a/http_request_api.c b/http_request_api.c
index b3f7150..34126d8 100644
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -1,16 +1,13 @@
 /*
-   +----------------------------------------------------------------------+
-   | PECL :: http                                                         |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license, that  |
-   | is bundled with this package in the file LICENSE, and is available   |
-   | through the world-wide-web at http://www.php.net/license/3_0.txt.    |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 2004-2005 Michael Wallner <mike@php.net>               |
-   +----------------------------------------------------------------------+
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
@@ -18,33 +15,100 @@
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
-#include "php.h"
 
+#define HTTP_WANT_CURL
 #include "php_http.h"
-#include "php_http_std_defs.h"
+
+#ifdef HTTP_HAVE_CURL
+
 #include "php_http_api.h"
 #include "php_http_request_api.h"
 #include "php_http_url_api.h"
+
 #ifdef ZEND_ENGINE_2
 #	include "php_http_request_object.h"
 #endif
 
-#include "phpstr/phpstr.h"
+ZEND_EXTERN_MODULE_GLOBALS(http);
 
-#ifdef PHP_WIN32
-#	include <winsock2.h>
+/* {{{ cruft for thread safe SSL crypto locks */
+#if defined(ZTS) && defined(HTTP_HAVE_SSL)
+#	ifdef PHP_WIN32
+#		define HTTP_NEED_SSL_TSL
+#		define HTTP_NEED_OPENSSL_TSL
+#		include <openssl/crypto.h>
+#	else /* !PHP_WIN32 */
+#		if defined(HTTP_HAVE_OPENSSL)
+#			if defined(HAVE_OPENSSL_CRYPTO_H)
+#				define HTTP_NEED_SSL_TSL
+#				define HTTP_NEED_OPENSSL_TSL
+#				include <openssl/crypto.h>
+#			else
+#				warning \
+					"libcurl was compiled with OpenSSL support, but configure could not find " \
+					"openssl/crypto.h; thus no SSL crypto locking callbacks will be set, which may " \
+					"cause random crashes on SSL requests"
+#			endif
+#		elif defined(HTTP_HAVE_GNUTLS)
+#			if defined(HAVE_GCRYPT_H)
+#				define HTTP_NEED_SSL_TSL
+#				define HTTP_NEED_GNUTLS_TSL
+#				include <gcrypt.h>
+#			else
+#				warning \
+					"libcurl was compiled with GnuTLS support, but configure could not find " \
+					"gcrypt.h; thus no SSL crypto locking callbacks will be set, which may " \
+					"cause random crashes on SSL requests"
+#			endif
+#		else
+#			warning \
+				"libcurl was compiled with SSL support, but configure could not determine which" \
+				"library was used; thus no SSL crypto locking callbacks will be set, which may " \
+				"cause random crashes on SSL requests"
+#		endif /* HTTP_HAVE_OPENSSL || HTTP_HAVE_GNUTLS */
+#	endif /* PHP_WIN32 */
+#endif /* ZTS && HTTP_HAVE_SSL */
+
+#ifdef HTTP_NEED_SSL_TSL
+static inline void http_ssl_init(void);
+static inline void http_ssl_cleanup(void);
 #endif
+/* }}} */
 
-#include <curl/curl.h>
+/* {{{ MINIT */
+PHP_MINIT_FUNCTION(http_request)
+{
+#ifdef HTTP_NEED_SSL_TSL
+	http_ssl_init();
+#endif
 
-ZEND_EXTERN_MODULE_GLOBALS(http);
+	if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) {
+		return FAILURE;
+	}
+	
+	HTTP_LONG_CONSTANT("HTTP_AUTH_BASIC", CURLAUTH_BASIC);
+	HTTP_LONG_CONSTANT("HTTP_AUTH_DIGEST", CURLAUTH_DIGEST);
+	HTTP_LONG_CONSTANT("HTTP_AUTH_NTLM", CURLAUTH_NTLM);
+	HTTP_LONG_CONSTANT("HTTP_AUTH_ANY", CURLAUTH_ANY);
 
-#ifndef HTTP_CURL_USE_ZEND_MM
-#	define HTTP_CURL_USE_ZEND_MM 0
+	return SUCCESS;
+}
+/* }}} */
+
+/* {{{ MSHUTDOWN */
+PHP_MSHUTDOWN_FUNCTION(http_request)
+{
+	curl_global_cleanup();
+#ifdef HTTP_NEED_SSL_TSL
+	http_ssl_cleanup();
 #endif
+	return SUCCESS;
+}
+/* }}} */
 
-#if LIBCURL_VERSION_NUM < 0x070c00
-#	define curl_easy_strerror(code) HTTP_G(request).error
+/* {{{ MACROS */
+#ifndef HAVE_CURL_EASY_STRERROR
+#	define curl_easy_strerror(dummy) "unkown error"
 #endif
 
 #define HTTP_CURL_INFO(I) HTTP_CURL_INFO_EX(I, I)
@@ -54,8 +118,10 @@ ZEND_EXTERN_MODULE_GLOBALS(http);
 		case CURLINFO_STRING: \
 		{ \
 			char *c; \
-			if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_ ##I, &c)) { \
-				add_assoc_string(&array, pretty_key(http_request_data_copy(COPY_STRING, #X), sizeof(#X)-1, 0, 0), c ? c : "", 1); \
+			if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_ ##I, &c)) { \
+				char *key = estrndup(#X, lenof(#X)); \
+				add_assoc_string(&array, pretty_key(key, lenof(#X), 0, 0), c ? c : "", 1); \
+				efree(key); \
 			} \
 		} \
 		break; \
@@ -63,8 +129,10 @@ ZEND_EXTERN_MODULE_GLOBALS(http);
 		case CURLINFO_DOUBLE: \
 		{ \
 			double d; \
-			if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_ ##I, &d)) { \
-				add_assoc_double(&array, pretty_key(http_request_data_copy(COPY_STRING, #X), sizeof(#X)-1, 0, 0), d); \
+			if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_ ##I, &d)) { \
+				char *key = estrndup(#X, lenof(#X)); \
+				add_assoc_double(&array, pretty_key(key, lenof(#X), 0, 0), d); \
+				efree(key); \
 			} \
 		} \
 		break; \
@@ -72,21 +140,40 @@ ZEND_EXTERN_MODULE_GLOBALS(http);
 		case CURLINFO_LONG: \
 		{ \
 			long l; \
-			if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_ ##I, &l)) { \
-				add_assoc_long(&array, pretty_key(http_request_data_copy(COPY_STRING, #X), sizeof(#X)-1, 0, 0), l); \
+			if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_ ##I, &l)) { \
+				char *key = estrndup(#X, lenof(#X)); \
+				add_assoc_long(&array, pretty_key(key, lenof(#X), 0, 0), l); \
+				efree(key); \
 			} \
 		} \
 		break; \
+\
+		case CURLINFO_SLIST: \
+		{ \
+			struct curl_slist *l, *p; \
+			if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_ ##I, &l)) { \
+				zval *subarray; \
+				char *key = estrndup(#X, lenof(#X)); \
+				MAKE_STD_ZVAL(subarray); \
+				array_init(subarray); \
+				for (p = l; p; p = p->next) { \
+					add_next_index_string(subarray, p->data, 1); \
+				} \
+				add_assoc_zval(&array, pretty_key(key, lenof(#X), 0, 0), subarray); \
+				curl_slist_free_all(l); \
+				efree(key); \
+			} \
+		} \
 	}
 
-#define HTTP_CURL_OPT(OPTION, p) curl_easy_setopt(ch, CURLOPT_##OPTION, (p))
+#define HTTP_CURL_OPT(OPTION, p) curl_easy_setopt(request->ch, CURLOPT_##OPTION, (p))
 #define HTTP_CURL_OPT_STRING(keyname) HTTP_CURL_OPT_STRING_EX(keyname, keyname)
 #define HTTP_CURL_OPT_SSL_STRING(keyname) HTTP_CURL_OPT_STRING_EX(keyname, SSL##keyname)
 #define HTTP_CURL_OPT_SSL_STRING_(keyname) HTTP_CURL_OPT_STRING_EX(keyname, SSL_##keyname)
 #define HTTP_CURL_OPT_STRING_EX(keyname, optname) \
 	if (!strcasecmp(key, #keyname)) { \
-		convert_to_string_ex(param); \
-		HTTP_CURL_OPT(optname, http_request_data_copy(COPY_STRING, Z_STRVAL_PP(param))); \
+		convert_to_string(*param); \
+		HTTP_CURL_OPT(optname, Z_STRVAL_PP(param)); \
 		key = NULL; \
 		continue; \
 	}
@@ -95,394 +182,324 @@ ZEND_EXTERN_MODULE_GLOBALS(http);
 #define HTTP_CURL_OPT_SSL_LONG_(keyname) HTTP_CURL_OPT_LONG_EX(keyname, SSL_##keyname)
 #define HTTP_CURL_OPT_LONG_EX(keyname, optname) \
 	if (!strcasecmp(key, #keyname)) { \
-		convert_to_long_ex(param); \
+		convert_to_long(*param); \
 		HTTP_CURL_OPT(optname, Z_LVAL_PP(param)); \
 		key = NULL; \
 		continue; \
 	}
+/* }}} */
 
+/* {{{ forward declarations */
+#define http_request_option(r, o, k, t) _http_request_option_ex((r), (o), (k), sizeof(k), (t) TSRMLS_CC)
+#define http_request_option_ex(r, o, k, l, t) _http_request_option_ex((r), (o), (k), (l), (t) TSRMLS_CC)
+static inline zval *_http_request_option_ex(http_request *request, HashTable *options, char *key, size_t keylen, int type TSRMLS_DC);
 
-static const char *const http_request_methods[HTTP_MAX_REQUEST_METHOD + 1];
-#define http_curl_getopt(o, k, t) _http_curl_getopt_ex((o), (k), sizeof(k), (t) TSRMLS_CC)
-#define http_curl_getopt_ex(o, k, l, t) _http_curl_getopt_ex((o), (k), (l), (t) TSRMLS_CC)
-static inline zval *_http_curl_getopt_ex(HashTable *options, char *key, size_t keylen, int type TSRMLS_DC);
-static size_t http_curl_write_callback(char *, size_t, size_t, void *);
 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_debug_callback(CURL *, curl_infotype, char *, size_t, void *);
-
-#define HTTP_CURL_CALLBACK_DATA(from, type, var) \
-	http_curl_callback_ctx *__CTX = (http_curl_callback_ctx *) (from); \
-	TSRMLS_FETCH_FROM_CTX(__CTX->tsrm_ctx); \
-	type (var) = (type) (__CTX->data)
-
-#define http_curl_callback_data(data) _http_curl_callback_data((data) TSRMLS_CC)
-static http_curl_callback_ctx *_http_curl_callback_data(void *data TSRMLS_DC);
-
-
-#if HTTP_CURL_USE_ZEND_MM
-static void http_curl_free(void *p)					{ efree(p); }
-static char *http_curl_strdup(const char *p)		{ return estrdup(p); }
-static void *http_curl_malloc(size_t s)				{ return emalloc(s); }
-static void *http_curl_realloc(void *p, size_t s)	{ return erealloc(p, s); }
-static void *http_curl_calloc(size_t n, size_t s)	{ return ecalloc(n, s); }
-#endif
-
-/* {{{ STATUS http_request_global_init() */
-STATUS _http_request_global_init(void)
-{
-#if HTTP_CURL_USE_ZEND_MM
-	if (CURLE_OK != curl_global_init_mem(CURL_GLOBAL_ALL,
-			http_curl_malloc,
-			http_curl_free,
-			http_curl_realloc,
-			http_curl_strdup,
-			http_curl_calloc)) {
-		return FAILURE;
-	}
-#else
-	if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) {
-		return FAILURE;
-	}
-#endif
-	return SUCCESS;
-}
-/* }}} */
-
-/* {{{ void *http_request_data_copy(int, void *) */
-void *_http_request_data_copy(int type, void *data TSRMLS_DC)
-{
-	switch (type)
-	{
-		case COPY_STRING:
-		{
-			char *new_str = estrdup(data);
-			zend_llist_add_element(&HTTP_G(request).copies.strings, &new_str);
-			return new_str;
-		}
-
-		case COPY_SLIST:
-		{
-			zend_llist_add_element(&HTTP_G(request).copies.slists, &data);
-			return data;
-		}
-
-		case COPY_CONTEXT:
-		{
-			zend_llist_add_element(&HTTP_G(request).copies.contexts, &data);
-			return data;
-		}
-
-		default:
-		{
-			return data;
-		}
-	}
-}
+static int http_curl_raw_callback(CURL *, curl_infotype, char *, size_t, void *);
+static int http_curl_dummy_callback(char *data, size_t n, size_t l, void *s) { return n*l; }
+static curlioerr http_curl_ioctl_callback(CURL *, curliocmd, void *);
 /* }}} */
 
-/* {{{ void http_request_data_free_string(char **) */
-void _http_request_data_free_string(void *string)
+/* {{{ http_request *http_request_init(http_request *) */
+PHP_HTTP_API http_request *_http_request_init_ex(http_request *request, CURL *ch, http_request_method meth, const char *url ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC)
 {
-	efree(*((char **)string));
+	http_request *r;
+	
+	if (request) {
+		r = request;
+	} else {
+		r = emalloc_rel(sizeof(http_request));
+	}
+	memset(r, 0, sizeof(http_request));
+	
+	r->ch = ch;
+	r->url = (url && *url) ? estrdup(url) : NULL;
+	r->meth = (meth > 0) ? meth : HTTP_GET;
+	
+	phpstr_init(&r->conv.request);
+	phpstr_init_ex(&r->conv.response, HTTP_CURLBUF_SIZE, 0);
+	phpstr_init(&r->_cache.cookies);
+	zend_hash_init(&r->_cache.options, 0, NULL, ZVAL_PTR_DTOR, 0);
+	
+	TSRMLS_SET_CTX(r->tsrm_ls);
+	
+	return r;
 }
 /* }}} */
 
-/* {{{ void http_request_data_free_slist(struct curl_slist **) */
-void _http_request_data_free_slist(void *list)
+/* {{{ void http_request_dtor(http_request *) */
+PHP_HTTP_API void _http_request_dtor(http_request *request)
 {
-	curl_slist_free_all(*((struct curl_slist **) list));
+	TSRMLS_FETCH_FROM_CTX(request->tsrm_ls);
+	
+	if (request->ch) {
+		/* avoid nasty segfaults with already cleaned up callbacks */
+		curl_easy_setopt(request->ch, CURLOPT_NOPROGRESS, 1);
+		curl_easy_setopt(request->ch, CURLOPT_PROGRESSFUNCTION, NULL);
+		curl_easy_setopt(request->ch, CURLOPT_VERBOSE, 0);
+		curl_easy_setopt(request->ch, CURLOPT_DEBUGFUNCTION, NULL);
+		curl_easy_cleanup(request->ch);
+		request->ch = NULL;
+	}
+	
+	http_request_reset(request);
+	
+	phpstr_dtor(&request->_cache.cookies);
+	zend_hash_destroy(&request->_cache.options);
+	if (request->_cache.headers) {
+		curl_slist_free_all(request->_cache.headers);
+		request->_cache.headers = NULL;
+	}
+	if (request->_progress_callback) {
+		zval_ptr_dtor(&request->_progress_callback);
+		request->_progress_callback = NULL;
+	}
 }
 /* }}} */
 
-/* {{{ _http_request_data_free_context(http_curl_callback_ctx **) */
-void _http_request_data_free_context(void *context)
+/* {{{ void http_request_free(http_request **) */
+PHP_HTTP_API void _http_request_free(http_request **request)
 {
-	efree(*((http_curl_callback_ctx **) context));
+	if (*request) {
+		TSRMLS_FETCH_FROM_CTX((*request)->tsrm_ls);
+		http_request_body_free(&(*request)->body);
+		http_request_dtor(*request);
+		efree(*request);
+		*request = NULL;
+	}
 }
 /* }}} */
 
-/* {{{ http_request_body *http_request_body_new() */
-PHP_HTTP_API http_request_body *_http_request_body_new(TSRMLS_D)
+/* {{{ void http_request_reset(http_request *) */
+PHP_HTTP_API void _http_request_reset(http_request *request)
 {
-	http_request_body *body = ecalloc(1, sizeof(http_request_body));
-	return body;
+	TSRMLS_FETCH_FROM_CTX(request->tsrm_ls);
+	STR_SET(request->url, NULL);
+	request->conv.last_type = 0;
+	phpstr_dtor(&request->conv.request);
+	phpstr_dtor(&request->conv.response);
+	http_request_body_dtor(request->body);
 }
 /* }}} */
 
-/* {{{ STATUS http_request_body_fill(http_request_body *body, HashTable *, HashTable *) */
-PHP_HTTP_API STATUS _http_request_body_fill(http_request_body *body, HashTable *fields, HashTable *files TSRMLS_DC)
+/* {{{ void http_request_defaults(http_request *) */
+PHP_HTTP_API void _http_request_defaults(http_request *request)
 {
-	if (files && (zend_hash_num_elements(files) > 0)) {
-		char *key = NULL;
-		ulong idx;
-		zval **data;
-		struct curl_httppost *http_post_data[2] = {NULL, NULL};
-
-		/* normal data */
-		FOREACH_HASH_KEYVAL(fields, key, idx, data) {
-			CURLcode err;
-			if (key) {
-				convert_to_string_ex(data);
-				err = curl_formadd(&http_post_data[0], &http_post_data[1],
-					CURLFORM_COPYNAME,			key,
-					CURLFORM_COPYCONTENTS,		Z_STRVAL_PP(data),
-					CURLFORM_CONTENTSLENGTH,	Z_STRLEN_PP(data),
-					CURLFORM_END
-				);
-				if (CURLE_OK != err) {
-					http_error_ex(E_WARNING, HTTP_E_CURL, "Could not encode post fields: %s", curl_easy_strerror(err));
-					curl_formfree(http_post_data[0]);
-					return FAILURE;
-				}
-
-				/* reset */
-				key = NULL;
-			}
-		}
-
-		/* file data */
-		FOREACH_HASH_VAL(files, data) {
-			CURLcode err;
-			zval **file, **type, **name;
-			if (	SUCCESS == zend_hash_find(Z_ARRVAL_PP(data), "name", sizeof("name"), (void **) &name) &&
-					SUCCESS == zend_hash_find(Z_ARRVAL_PP(data), "type", sizeof("type"), (void **) &type) &&
-					SUCCESS == zend_hash_find(Z_ARRVAL_PP(data), "file", sizeof("file"), (void **) &file)) {
-				err = curl_formadd(&http_post_data[0], &http_post_data[1],
-					CURLFORM_COPYNAME,		Z_STRVAL_PP(name),
-					CURLFORM_FILE,			Z_STRVAL_PP(file),
-					CURLFORM_CONTENTTYPE,	Z_STRVAL_PP(type),
-					CURLFORM_END
-				);
-				if (CURLE_OK != err) {
-					http_error_ex(E_WARNING, HTTP_E_CURL, "Could not encode post files: %s", curl_easy_strerror(err));
-					curl_formfree(http_post_data[0]);
-					return FAILURE;
-				}
-			} else {
-				http_error(E_NOTICE, HTTP_E_PARAM, "Post file array entry misses either 'name', 'type' or 'file' entry");
-			}
-		}
-
-		body->type = HTTP_REQUEST_BODY_CURLPOST;
-		body->data = http_post_data[0];
-		body->size = 0;
-
-	} else {
-		char *encoded;
-		size_t encoded_len;
-
-		if (SUCCESS != http_urlencode_hash_ex(fields, 1, NULL, 0, &encoded, &encoded_len)) {
-			http_error(E_WARNING, HTTP_E_ENCODE, "Could not encode post data");
-			return FAILURE;
-		}
-
-		body->type = HTTP_REQUEST_BODY_CSTRING;
-		body->data = encoded;
-		body->size = encoded_len;
+	if (request->ch) {
+#ifdef HAVE_CURL_EASY_RESET
+		curl_easy_reset(request->ch);
+#endif
+#if defined(ZTS)
+		HTTP_CURL_OPT(NOSIGNAL, 1);
+#endif
+		HTTP_CURL_OPT(PRIVATE, request);
+		HTTP_CURL_OPT(ERRORBUFFER, request->_error);
+		HTTP_CURL_OPT(HEADER, 0);
+		HTTP_CURL_OPT(FILETIME, 1);
+		HTTP_CURL_OPT(AUTOREFERER, 1);
+		HTTP_CURL_OPT(VERBOSE, 1);
+		HTTP_CURL_OPT(HEADERFUNCTION, NULL);
+		HTTP_CURL_OPT(DEBUGFUNCTION, http_curl_raw_callback);
+		HTTP_CURL_OPT(READFUNCTION, http_curl_read_callback);
+		HTTP_CURL_OPT(IOCTLFUNCTION, http_curl_ioctl_callback);
+		HTTP_CURL_OPT(WRITEFUNCTION, http_curl_dummy_callback);
+		HTTP_CURL_OPT(PROGRESSFUNCTION, NULL);
+		HTTP_CURL_OPT(URL, NULL);
+		HTTP_CURL_OPT(NOPROGRESS, 1);
+		HTTP_CURL_OPT(PROXY, NULL);
+		HTTP_CURL_OPT(PROXYPORT, 0);
+		HTTP_CURL_OPT(PROXYUSERPWD, NULL);
+		HTTP_CURL_OPT(PROXYAUTH, 0);
+		HTTP_CURL_OPT(INTERFACE, NULL);
+		HTTP_CURL_OPT(PORT, 0);
+		HTTP_CURL_OPT(USERPWD, NULL);
+		HTTP_CURL_OPT(HTTPAUTH, 0);
+		HTTP_CURL_OPT(ENCODING, NULL);
+		HTTP_CURL_OPT(FOLLOWLOCATION, 0);
+		HTTP_CURL_OPT(UNRESTRICTED_AUTH, 0);
+		HTTP_CURL_OPT(REFERER, NULL);
+		HTTP_CURL_OPT(USERAGENT, "PECL::HTTP/" PHP_EXT_HTTP_VERSION " (PHP/" PHP_VERSION ")");
+		HTTP_CURL_OPT(HTTPHEADER, NULL);
+		HTTP_CURL_OPT(COOKIE, NULL);
+		HTTP_CURL_OPT(COOKIEFILE, NULL);
+		HTTP_CURL_OPT(COOKIEJAR, NULL);
+		HTTP_CURL_OPT(RESUME_FROM, 0);
+		HTTP_CURL_OPT(MAXFILESIZE, 0);
+		HTTP_CURL_OPT(TIMECONDITION, 0);
+		HTTP_CURL_OPT(TIMEVALUE, 0);
+		HTTP_CURL_OPT(TIMEOUT, 0);
+		HTTP_CURL_OPT(CONNECTTIMEOUT, 3);
+		HTTP_CURL_OPT(SSLCERT, NULL);
+		HTTP_CURL_OPT(SSLCERTTYPE, NULL);
+		HTTP_CURL_OPT(SSLCERTPASSWD, NULL);
+		HTTP_CURL_OPT(SSLKEY, NULL);
+		HTTP_CURL_OPT(SSLKEYTYPE, NULL);
+		HTTP_CURL_OPT(SSLKEYPASSWD, NULL);
+		HTTP_CURL_OPT(SSLENGINE, NULL);
+		HTTP_CURL_OPT(SSLVERSION, 0);
+		HTTP_CURL_OPT(SSL_VERIFYPEER, 0);
+		HTTP_CURL_OPT(SSL_VERIFYHOST, 0);
+		HTTP_CURL_OPT(SSL_CIPHER_LIST, NULL);
+		HTTP_CURL_OPT(CAINFO, NULL);
+		HTTP_CURL_OPT(CAPATH, NULL);
+		HTTP_CURL_OPT(RANDOM_FILE, NULL);
+		HTTP_CURL_OPT(EGDSOCKET, NULL);
+		HTTP_CURL_OPT(POSTFIELDS, NULL);
+		HTTP_CURL_OPT(POSTFIELDSIZE, 0);
+		HTTP_CURL_OPT(HTTPPOST, NULL);
+		HTTP_CURL_OPT(IOCTLDATA, NULL);
+		HTTP_CURL_OPT(READDATA, NULL);
+		HTTP_CURL_OPT(INFILESIZE, 0);
 	}
-
-	return SUCCESS;
 }
 /* }}} */
 
-/* {{{ void http_request_body_dtor(http_request_body *) */
-PHP_HTTP_API void _http_request_body_dtor(http_request_body *body TSRMLS_DC)
+PHP_HTTP_API void _http_request_set_progress_callback(http_request *request, zval *cb)
 {
-	if (body) {
-		switch (body->type)
-		{
-			case HTTP_REQUEST_BODY_CSTRING:
-				if (body->data) {
-					efree(body->data);
-				}
-			break;
-
-			case HTTP_REQUEST_BODY_CURLPOST:
-				curl_formfree(body->data);
-			break;
-
-			case HTTP_REQUEST_BODY_UPLOADFILE:
-				php_stream_close(body->data);
-			break;
-		}
+	TSRMLS_FETCH_FROM_CTX(request->tsrm_ls);
+	
+	if (request->_progress_callback) {
+		zval_ptr_dtor(&request->_progress_callback);
 	}
-}
-/* }}} */
-
-/* {{{ void http_request_body_free(http_request_body *) */
-PHP_HTTP_API void _http_request_body_free(http_request_body *body TSRMLS_DC)
-{
-	if (body) {
-		http_request_body_dtor(body);
-		efree(body);
+	if (cb) {
+		ZVAL_ADDREF(cb);
 	}
+	request->_progress_callback = cb;
 }
-/* }}} */
 
-/* {{{ STATUS http_request_init(CURL *, http_request_method, char *, http_request_body *, HashTable *, phpstr *) */
-PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char *url, http_request_body *body, HashTable *options, phpstr *response TSRMLS_DC)
+/* {{{ STATUS http_request_prepare(http_request *, HashTable *) */
+PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *options)
 {
 	zval *zoption;
 	zend_bool range_req = 0;
 
-	/* reset CURL handle */
-#if LIBCURL_VERSION_NUM >= 0x070c01
-	curl_easy_reset(ch);
-#endif
-
+	TSRMLS_FETCH_FROM_CTX(request->tsrm_ls);
+	
+	HTTP_CHECK_CURL_INIT(request->ch, curl_easy_init(), return FAILURE);
+	
+	http_request_defaults(request);
+	
 	/* set options */
-	if (url) {
-		HTTP_CURL_OPT(URL, http_request_data_copy(COPY_STRING, url));
-	}
-
-	if (response) {
-		http_curl_callback_ctx *response_ctx = http_curl_callback_data(response);
-		HTTP_CURL_OPT(WRITEDATA, response_ctx);
-		HTTP_CURL_OPT(WRITEHEADER, response_ctx);
-	}
-
-	HTTP_CURL_OPT(HEADER, 0);
-	HTTP_CURL_OPT(FILETIME, 1);
-	HTTP_CURL_OPT(AUTOREFERER, 1);
-	HTTP_CURL_OPT(READFUNCTION, http_curl_read_callback);
-	HTTP_CURL_OPT(WRITEFUNCTION, http_curl_write_callback);
-	HTTP_CURL_OPT(HEADERFUNCTION, http_curl_write_callback);
-
-#if defined(ZTS) && (LIBCURL_VERSION_NUM >= 0x070a00)
-	HTTP_CURL_OPT(NOSIGNAL, 1);
-#endif
-#if LIBCURL_VERSION_NUM < 0x070c00
-	HTTP_CURL_OPT(ERRORBUFFER, HTTP_G(request).error);
-#endif
+	HTTP_CURL_OPT(DEBUGDATA, request);
+	HTTP_CURL_OPT(URL, request->url);
 
 	/* progress callback */
-	if (zoption = http_curl_getopt(options, "onprogress", 0)) {
+	if ((zoption = http_request_option(request, options, "onprogress", 0))) {
 		HTTP_CURL_OPT(NOPROGRESS, 0);
+		HTTP_CURL_OPT(PROGRESSDATA, request);
 		HTTP_CURL_OPT(PROGRESSFUNCTION, http_curl_progress_callback);
-		HTTP_CURL_OPT(PROGRESSDATA,  http_curl_callback_data(zoption));
-	} else {
-		HTTP_CURL_OPT(NOPROGRESS, 1);
-	}
-
-	/* debug callback */
-	if (zoption = http_curl_getopt(options, "ondebug", 0)) {
-		HTTP_CURL_OPT(VERBOSE, 1);
-		HTTP_CURL_OPT(DEBUGFUNCTION, http_curl_debug_callback);
-		HTTP_CURL_OPT(DEBUGDATA, http_curl_callback_data(zoption));
-	} else {
-		HTTP_CURL_OPT(VERBOSE, 0);
+		http_request_set_progress_callback(request, zoption);
 	}
 
 	/* proxy */
-	if (zoption = http_curl_getopt(options, "proxyhost", IS_STRING)) {
-		HTTP_CURL_OPT(PROXY, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
+	if ((zoption = http_request_option(request, options, "proxyhost", IS_STRING))) {
+		HTTP_CURL_OPT(PROXY, Z_STRVAL_P(zoption));
 		/* port */
-		if (zoption = http_curl_getopt(options, "proxyport", IS_LONG)) {
+		if ((zoption = http_request_option(request, options, "proxyport", IS_LONG))) {
 			HTTP_CURL_OPT(PROXYPORT, Z_LVAL_P(zoption));
 		}
 		/* user:pass */
-		if (zoption = http_curl_getopt(options, "proxyauth", IS_STRING)) {
-			HTTP_CURL_OPT(PROXYUSERPWD, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
+		if ((zoption = http_request_option(request, options, "proxyauth", IS_STRING))) {
+			HTTP_CURL_OPT(PROXYUSERPWD, Z_STRVAL_P(zoption));
 		}
-#if LIBCURL_VERSION_NUM >= 0x070a07
 		/* auth method */
-		if (zoption = http_curl_getopt(options, "proxyauthtype", IS_LONG)) {
+		if ((zoption = http_request_option(request, options, "proxyauthtype", IS_LONG))) {
 			HTTP_CURL_OPT(PROXYAUTH, Z_LVAL_P(zoption));
 		}
-#endif
 	}
 
 	/* outgoing interface */
-	if (zoption = http_curl_getopt(options, "interface", IS_STRING)) {
-		HTTP_CURL_OPT(INTERFACE, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
+	if ((zoption = http_request_option(request, options, "interface", IS_STRING))) {
+		HTTP_CURL_OPT(INTERFACE, Z_STRVAL_P(zoption));
 	}
 
 	/* another port */
-	if (zoption = http_curl_getopt(options, "port", IS_LONG)) {
+	if ((zoption = http_request_option(request, options, "port", IS_LONG))) {
 		HTTP_CURL_OPT(PORT, Z_LVAL_P(zoption));
 	}
 
 	/* auth */
-	if (zoption = http_curl_getopt(options, "httpauth", IS_STRING)) {
-		HTTP_CURL_OPT(USERPWD, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
+	if ((zoption = http_request_option(request, options, "httpauth", IS_STRING))) {
+		HTTP_CURL_OPT(USERPWD, Z_STRVAL_P(zoption));
 	}
-#if LIBCURL_VERSION_NUM >= 0x070a06
-	if (zoption = http_curl_getopt(options, "httpauthtype", IS_LONG)) {
+	if ((zoption = http_request_option(request, options, "httpauthtype", IS_LONG))) {
 		HTTP_CURL_OPT(HTTPAUTH, Z_LVAL_P(zoption));
 	}
-#endif
-
-	/* compress, empty string enables deflate and gzip */
-	if ((zoption = http_curl_getopt(options, "compress", IS_BOOL)) && Z_LVAL_P(zoption)) {
-		HTTP_CURL_OPT(ENCODING, "");
-	} else {
-		HTTP_CURL_OPT(ENCODING, 0);
-	}
 
 	/* redirects, defaults to 0 */
-	if (zoption = http_curl_getopt(options, "redirect", IS_LONG)) {
+	if ((zoption = http_request_option(request, options, "redirect", IS_LONG))) {
 		HTTP_CURL_OPT(FOLLOWLOCATION, Z_LVAL_P(zoption) ? 1 : 0);
 		HTTP_CURL_OPT(MAXREDIRS, Z_LVAL_P(zoption));
-		if (zoption = http_curl_getopt(options, "unrestrictedauth", IS_BOOL)) {
+		if ((zoption = http_request_option(request, options, "unrestrictedauth", IS_BOOL))) {
 			HTTP_CURL_OPT(UNRESTRICTED_AUTH, Z_LVAL_P(zoption));
 		}
-	} else {
-		HTTP_CURL_OPT(FOLLOWLOCATION, 0);
 	}
 
 	/* referer */
-	if (zoption = http_curl_getopt(options, "referer", IS_STRING)) {
-		HTTP_CURL_OPT(REFERER, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
-	} else {
-		HTTP_CURL_OPT(REFERER, NULL);
+	if ((zoption = http_request_option(request, options, "referer", IS_STRING))) {
+		HTTP_CURL_OPT(REFERER, Z_STRVAL_P(zoption));
 	}
 
 	/* useragent, default "PECL::HTTP/version (PHP/version)" */
-	if (zoption = http_curl_getopt(options, "useragent", IS_STRING)) {
-		HTTP_CURL_OPT(USERAGENT, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
-	} else {
-		HTTP_CURL_OPT(USERAGENT, "PECL::HTTP/" HTTP_PEXT_VERSION " (PHP/" PHP_VERSION ")");
+	if ((zoption = http_request_option(request, options, "useragent", IS_STRING))) {
+		HTTP_CURL_OPT(USERAGENT, Z_STRVAL_P(zoption));
 	}
 
 	/* additional headers, array('name' => 'value') */
-	if (zoption = http_curl_getopt(options, "headers", IS_ARRAY)) {
+	if (request->_cache.headers) {
+		curl_slist_free_all(request->_cache.headers);
+		request->_cache.headers = NULL;
+	}
+	if ((zoption = http_request_option(request, options, "headers", IS_ARRAY))) {
 		char *header_key;
 		ulong header_idx;
-		struct curl_slist *headers = NULL;
+		HashPosition pos;
 
-		FOREACH_KEY(zoption, header_key, header_idx) {
+		FOREACH_KEY(pos, zoption, header_key, header_idx) {
 			if (header_key) {
 				zval **header_val;
-				if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &header_val)) {
+				if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_P(zoption), (void **) &header_val, &pos)) {
 					char header[1024] = {0};
-					snprintf(header, 1023, "%s: %s", header_key, Z_STRVAL_PP(header_val));
-					headers = curl_slist_append(headers, http_request_data_copy(COPY_STRING, header));
+					zval *cpy, *val = convert_to_type_ex(IS_STRING, *header_val, &cpy);
+					
+					snprintf(header, 1023, "%s: %s", header_key, Z_STRVAL_P(val));
+					request->_cache.headers = curl_slist_append(request->_cache.headers, header);
+					
+					if (cpy) {
+						zval_ptr_dtor(&cpy);
+					}
 				}
 
 				/* reset */
 				header_key = NULL;
 			}
 		}
-
-		if (headers) {
-			HTTP_CURL_OPT(HTTPHEADER, http_request_data_copy(COPY_SLIST, headers));
-		}
-	} else {
-		HTTP_CURL_OPT(HTTPHEADER, NULL);
 	}
+	if ((zoption = http_request_option(request, options, "compress", IS_BOOL)) && Z_LVAL_P(zoption)) {
+		request->_cache.headers = curl_slist_append(request->_cache.headers, "Accept-Encoding: gzip;q=1.0,deflate;q=0.5,*;q=0.1");
+	}
+	HTTP_CURL_OPT(HTTPHEADER, request->_cache.headers);
 
 	/* cookies, array('name' => 'value') */
-	if (zoption = http_curl_getopt(options, "cookies", IS_ARRAY)) {
+	if ((zoption = http_request_option(request, options, "cookies", IS_ARRAY))) {
 		char *cookie_key = NULL;
 		ulong cookie_idx = 0;
-		phpstr *qstr = phpstr_new();
+		HashPosition pos;
+		
+		phpstr_dtor(&request->_cache.cookies);
 
-		FOREACH_KEY(zoption, cookie_key, cookie_idx) {
+		FOREACH_KEY(pos, zoption, cookie_key, cookie_idx) {
 			if (cookie_key) {
 				zval **cookie_val;
-				if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &cookie_val)) {
-					phpstr_appendf(qstr, "%s=%s; ", cookie_key, Z_STRVAL_PP(cookie_val));
+				if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_P(zoption), (void **) &cookie_val, &pos)) {
+					zval *cpy, *val = convert_to_type_ex(IS_STRING, *cookie_val, &cpy);
+					
+					phpstr_appendf(&request->_cache.cookies, "%s=%s; ", cookie_key, Z_STRVAL_P(val));
+					
+					if (cpy) {
+						zval_ptr_dtor(&cpy);
+					}
 				}
 
 				/* reset */
@@ -490,17 +507,14 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 			}
 		}
 
-		if (qstr->used) {
-			phpstr_fix(qstr);
-			HTTP_CURL_OPT(COOKIE, http_request_data_copy(COPY_STRING, qstr->data));
+		if (request->_cache.cookies.used) {
+			phpstr_fix(&request->_cache.cookies);
+			HTTP_CURL_OPT(COOKIE, request->_cache.cookies.data);
 		}
-		phpstr_free(qstr);
-	} else {
-		HTTP_CURL_OPT(COOKIE, NULL);
 	}
 
 	/* session cookies */
-	if (zoption = http_curl_getopt(options, "cookiesession", IS_BOOL)) {
+	if ((zoption = http_request_option(request, options, "cookiesession", IS_BOOL))) {
 		if (Z_LVAL_P(zoption)) {
 			/* accept cookies for this session */
 			HTTP_CURL_OPT(COOKIEFILE, "");
@@ -508,68 +522,60 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 			/* reset session cookies */
 			HTTP_CURL_OPT(COOKIESESSION, 1);
 		}
-	} else {
-		HTTP_CURL_OPT(COOKIEFILE, NULL);
 	}
 
 	/* cookiestore, read initial cookies from that file and store cookies back into that file */
-	if ((zoption = http_curl_getopt(options, "cookiestore", IS_STRING)) && Z_STRLEN_P(zoption)) {
-		HTTP_CURL_OPT(COOKIEFILE, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
-		HTTP_CURL_OPT(COOKIEJAR, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
-	} else {
-		HTTP_CURL_OPT(COOKIEFILE, NULL);
-		HTTP_CURL_OPT(COOKIEJAR, NULL);
+	if ((zoption = http_request_option(request, options, "cookiestore", IS_STRING)) && Z_STRLEN_P(zoption)) {
+		HTTP_CURL_OPT(COOKIEFILE, Z_STRVAL_P(zoption));
+		HTTP_CURL_OPT(COOKIEJAR, Z_STRVAL_P(zoption));
 	}
 
 	/* resume */
-	if (zoption = http_curl_getopt(options, "resume", IS_LONG)) {
+	if ((zoption = http_request_option(request, options, "resume", IS_LONG)) && (Z_LVAL_P(zoption) != 0)) {
 		range_req = 1;
 		HTTP_CURL_OPT(RESUME_FROM, Z_LVAL_P(zoption));
-	} else {
-		HTTP_CURL_OPT(RESUME_FROM, 0);
 	}
 
 	/* maxfilesize */
-	if (zoption = http_curl_getopt(options, "maxfilesize", IS_LONG)) {
+	if ((zoption = http_request_option(request, options, "maxfilesize", IS_LONG))) {
 		HTTP_CURL_OPT(MAXFILESIZE, Z_LVAL_P(zoption));
-	} else {
-		HTTP_CURL_OPT(MAXFILESIZE, 0);
 	}
 
 	/* lastmodified */
-	if (zoption = http_curl_getopt(options, "lastmodified", IS_LONG)) {
-		HTTP_CURL_OPT(TIMECONDITION, range_req ? CURL_TIMECOND_IFUNMODSINCE : CURL_TIMECOND_IFMODSINCE);
-		HTTP_CURL_OPT(TIMEVALUE, Z_LVAL_P(zoption));
-	} else {
-		HTTP_CURL_OPT(TIMEVALUE, 0);
+	if ((zoption = http_request_option(request, options, "lastmodified", IS_LONG))) {
+		if (Z_LVAL_P(zoption)) {
+			if (Z_LVAL_P(zoption) > 0) {
+				HTTP_CURL_OPT(TIMEVALUE, Z_LVAL_P(zoption));
+			} else {
+				HTTP_CURL_OPT(TIMEVALUE, time(NULL) + Z_LVAL_P(zoption));
+			}
+			HTTP_CURL_OPT(TIMECONDITION, range_req ? CURL_TIMECOND_IFUNMODSINCE : CURL_TIMECOND_IFMODSINCE);
+		} else {
+			HTTP_CURL_OPT(TIMECONDITION, CURL_TIMECOND_NONE);
+		}
 	}
 
-	/* timeout, defaults to 3 */
-	if (zoption = http_curl_getopt(options, "timeout", IS_LONG)) {
+	/* timeout, defaults to 0 */
+	if ((zoption = http_request_option(request, options, "timeout", IS_LONG))) {
 		HTTP_CURL_OPT(TIMEOUT, Z_LVAL_P(zoption));
-	} else {
-		HTTP_CURL_OPT(TIMEOUT, 3);
 	}
 
 	/* connecttimeout, defaults to 3 */
-	if (zoption = http_curl_getopt(options, "connecttimeout", IS_LONG)) {
+	if ((zoption = http_request_option(request, options, "connecttimeout", IS_LONG))) {
 		HTTP_CURL_OPT(CONNECTTIMEOUT, Z_LVAL_P(zoption));
-	} else {
-		HTTP_CURL_OPT(CONNECTTIMEOUT, 3);
 	}
 
 	/* ssl */
-	if (zoption = http_curl_getopt(options, "ssl", IS_ARRAY)) {
+	if ((zoption = http_request_option(request, options, "ssl", IS_ARRAY))) {
 		ulong idx;
 		char *key = NULL;
 		zval **param;
+		HashPosition pos;
 
-		FOREACH_KEYVAL(zoption, key, idx, param) {
+		FOREACH_KEYVAL(pos, zoption, key, idx, param) {
 			if (key) {
 				HTTP_CURL_OPT_SSL_STRING(CERT);
-#if LIBCURL_VERSION_NUM >= 0x070903
 				HTTP_CURL_OPT_SSL_STRING(CERTTYPE);
-#endif
 				HTTP_CURL_OPT_SSL_STRING(CERTPASSWD);
 
 				HTTP_CURL_OPT_SSL_STRING(KEY);
@@ -583,11 +589,8 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 				HTTP_CURL_OPT_SSL_LONG_(VERIFYHOST);
 				HTTP_CURL_OPT_SSL_STRING_(CIPHER_LIST);
 
-
 				HTTP_CURL_OPT_STRING(CAINFO);
-#if LIBCURL_VERSION_NUM >= 0x070908
 				HTTP_CURL_OPT_STRING(CAPATH);
-#endif
 				HTTP_CURL_OPT_STRING(RANDOM_FILE);
 				HTTP_CURL_OPT_STRING(EGDSOCKET);
 
@@ -595,61 +598,59 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 				key = NULL;
 			}
 		}
-	} else {
-		/* disable SSL verification by default */
-		HTTP_CURL_OPT(SSL_VERIFYPEER, 0);
-		HTTP_CURL_OPT(SSL_VERIFYHOST, 0);
 	}
 
 	/* request method */
-	switch (meth)
+	switch (request->meth)
 	{
 		case HTTP_GET:
-			curl_easy_setopt(ch, CURLOPT_HTTPGET, 1);
+			curl_easy_setopt(request->ch, CURLOPT_HTTPGET, 1);
 		break;
 
 		case HTTP_HEAD:
-			curl_easy_setopt(ch, CURLOPT_NOBODY, 1);
+			curl_easy_setopt(request->ch, CURLOPT_NOBODY, 1);
 		break;
 
 		case HTTP_POST:
-			curl_easy_setopt(ch, CURLOPT_POST, 1);
+			curl_easy_setopt(request->ch, CURLOPT_POST, 1);
 		break;
 
 		case HTTP_PUT:
-			curl_easy_setopt(ch, CURLOPT_UPLOAD, 1);
+			curl_easy_setopt(request->ch, CURLOPT_UPLOAD, 1);
 		break;
 
 		default:
-			if (http_request_method_exists(0, meth, NULL)) {
-				curl_easy_setopt(ch, CURLOPT_CUSTOMREQUEST, http_request_method_name(meth));
+			if (http_request_method_exists(0, request->meth, NULL)) {
+				curl_easy_setopt(request->ch, CURLOPT_CUSTOMREQUEST, http_request_method_name(request->meth));
 			} else {
-				http_error_ex(E_WARNING, HTTP_E_CURL, "Unsupported request method: %d", meth);
+				http_error_ex(HE_WARNING, HTTP_E_REQUEST_METHOD, "Unsupported request method: %d (%s)", request->meth, request->url);
 				return FAILURE;
 			}
 		break;
 	}
 
 	/* attach request body */
-	if (body && (meth != HTTP_GET) && (meth != HTTP_HEAD)) {
-		switch (body->type)
+	if (request->body && (request->meth != HTTP_GET) && (request->meth != HTTP_HEAD)) {
+		switch (request->body->type)
 		{
 			case HTTP_REQUEST_BODY_CSTRING:
-				curl_easy_setopt(ch, CURLOPT_POSTFIELDS, body->data);
-				curl_easy_setopt(ch, CURLOPT_POSTFIELDSIZE, body->size);
+				curl_easy_setopt(request->ch, CURLOPT_POSTFIELDS, request->body->data);
+				curl_easy_setopt(request->ch, CURLOPT_POSTFIELDSIZE, request->body->size);
 			break;
 
 			case HTTP_REQUEST_BODY_CURLPOST:
-				curl_easy_setopt(ch, CURLOPT_HTTPPOST, (struct curl_httppost *) body->data);
+				curl_easy_setopt(request->ch, CURLOPT_HTTPPOST, (struct curl_httppost *) request->body->data);
 			break;
 
 			case HTTP_REQUEST_BODY_UPLOADFILE:
-				curl_easy_setopt(ch, CURLOPT_READDATA, http_curl_callback_data(body));
-				curl_easy_setopt(ch, CURLOPT_INFILESIZE, body->size);
+				curl_easy_setopt(request->ch, CURLOPT_IOCTLDATA, request);
+				curl_easy_setopt(request->ch, CURLOPT_READDATA, request);
+				curl_easy_setopt(request->ch, CURLOPT_INFILESIZE, request->body->size);
 			break;
 
 			default:
-				http_error_ex(E_WARNING, HTTP_E_CURL, "Unknown request body type: %d", body->type);
+				/* shouldn't ever happen */
+				http_error_ex(HE_ERROR, 0, "Unknown request body type: %d (%s)", request->body->type, request->url);
 				return FAILURE;
 			break;
 		}
@@ -659,50 +660,35 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 }
 /* }}} */
 
-/* {{{ STATUS http_request_exec(CURL *, HashTable *) */
-PHP_HTTP_API STATUS _http_request_exec(CURL *ch, HashTable *info TSRMLS_DC)
+/* {{{ void http_request_exec(http_request *) */
+PHP_HTTP_API void _http_request_exec(http_request *request)
 {
 	CURLcode result;
-
-	/* perform request */
-	if (CURLE_OK != (result = curl_easy_perform(ch))) {
-		http_error_ex(E_WARNING, HTTP_E_CURL, "Could not perform request: %s", curl_easy_strerror(result));
-		return FAILURE;
-	} else {
-		/* get curl info */
-		if (info) {
-			http_request_info(ch, info);
-		}
-		return SUCCESS;
+	TSRMLS_FETCH_FROM_CTX(request->tsrm_ls);
+	
+	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);
 	}
 }
 /* }}} */
 
-/* {{{ void http_request_info(CURL *, HashTable *) */
-PHP_HTTP_API void _http_request_info(CURL *ch, HashTable *info TSRMLS_DC)
+/* {{{ void http_request_info(http_request *, HashTable *) */
+PHP_HTTP_API void _http_request_info(http_request *request, HashTable *info)
 {
 	zval array;
-	Z_ARRVAL(array) = info;
+	INIT_ZARR(array, info);
 
 	HTTP_CURL_INFO(EFFECTIVE_URL);
-#if LIBCURL_VERSION_NUM >= 0x070a07
 	HTTP_CURL_INFO(RESPONSE_CODE);
-#else
-	HTTP_CURL_INFO_EX(HTTP_CODE, RESPONSE_CODE);
-#endif
-	HTTP_CURL_INFO(HTTP_CONNECTCODE);
-#if LIBCURL_VERSION_NUM >= 0x070500
+	HTTP_CURL_INFO_EX(HTTP_CONNECTCODE, connect_code);
 	HTTP_CURL_INFO(FILETIME);
-#endif
 	HTTP_CURL_INFO(TOTAL_TIME);
 	HTTP_CURL_INFO(NAMELOOKUP_TIME);
 	HTTP_CURL_INFO(CONNECT_TIME);
 	HTTP_CURL_INFO(PRETRANSFER_TIME);
 	HTTP_CURL_INFO(STARTTRANSFER_TIME);
-#if LIBCURL_VERSION_NUM >= 0x070907
 	HTTP_CURL_INFO(REDIRECT_TIME);
 	HTTP_CURL_INFO(REDIRECT_COUNT);
-#endif
 	HTTP_CURL_INFO(SIZE_UPLOAD);
 	HTTP_CURL_INFO(SIZE_DOWNLOAD);
 	HTTP_CURL_INFO(SPEED_DOWNLOAD);
@@ -710,214 +696,41 @@ PHP_HTTP_API void _http_request_info(CURL *ch, HashTable *info TSRMLS_DC)
 	HTTP_CURL_INFO(HEADER_SIZE);
 	HTTP_CURL_INFO(REQUEST_SIZE);
 	HTTP_CURL_INFO(SSL_VERIFYRESULT);
-#if LIBCURL_VERSION_NUM >= 0x070c03
-	/*HTTP_CURL_INFO(SSL_ENGINES); todo: CURLINFO_SLIST */
-#endif
+	HTTP_CURL_INFO(SSL_ENGINES);
 	HTTP_CURL_INFO(CONTENT_LENGTH_DOWNLOAD);
 	HTTP_CURL_INFO(CONTENT_LENGTH_UPLOAD);
 	HTTP_CURL_INFO(CONTENT_TYPE);
-#if LIBCURL_VERSION_NUM >= 0x070a03
 	/*HTTP_CURL_INFO(PRIVATE);*/
-#endif
-#if LIBCURL_VERSION_NUM >= 0x070a08
 	HTTP_CURL_INFO(HTTPAUTH_AVAIL);
 	HTTP_CURL_INFO(PROXYAUTH_AVAIL);
-#endif
-#if LIBCURL_VERSION_NUM >= 0x070c02
 	/*HTTP_CURL_INFO(OS_ERRNO);*/
-#endif
-#if LIBCURL_VERSION_NUM >= 0x070c03
 	HTTP_CURL_INFO(NUM_CONNECTS);
+#if LIBCURL_VERSION_NUM >= 0x070e01
+	HTTP_CURL_INFO_EX(COOKIELIST, cookies);
 #endif
 }
 /* }}} */
 
-/* {{{ STATUS http_request_ex(CURL *, http_request_method, char *, http_request_body, HashTable, HashTable, phpstr *) */
-PHP_HTTP_API STATUS _http_request_ex(CURL *ch, http_request_method meth, char *url, http_request_body *body, HashTable *options, HashTable *info, phpstr *response TSRMLS_DC)
-{
-	STATUS status;
-	zend_bool clean_curl;
-
-	if ((clean_curl = (!ch))) {
-		if (!(ch = curl_easy_init())) {
-			http_error(E_WARNING, HTTP_E_CURL, "Could not initialize curl.");
-			return FAILURE;
-		}
-	}
-
-	status =	((SUCCESS == http_request_init(ch, meth, url, body, options, response)) &&
-				(SUCCESS == http_request_exec(ch, info))) ? SUCCESS : FAILURE;
-
-	if (clean_curl) {
-		curl_easy_cleanup(ch);
-	}
-	return status;
-}
-/* }}} */
-
-/* {{{ char *http_request_method_name(http_request_method) */
-PHP_HTTP_API const char *_http_request_method_name(http_request_method m TSRMLS_DC)
-{
-	zval **meth;
-
-	if (HTTP_STD_REQUEST_METHOD(m)) {
-		return http_request_methods[m];
-	}
-
-	if (SUCCESS == zend_hash_index_find(&HTTP_G(request).methods.custom, HTTP_CUSTOM_REQUEST_METHOD(m), (void **) &meth)) {
-		return Z_STRVAL_PP(meth);
-	}
-
-	return http_request_methods[0];
-}
-/* }}} */
-
-/* {{{ unsigned long http_request_method_exists(zend_bool, unsigned long, char *) */
-PHP_HTTP_API unsigned long _http_request_method_exists(zend_bool by_name, unsigned long id, const char *name TSRMLS_DC)
-{
-	if (by_name) {
-		unsigned i;
-
-		for (i = HTTP_NO_REQUEST_METHOD + 1; i < HTTP_MAX_REQUEST_METHOD; ++i) {
-			if (!strcmp(name, http_request_methods[i])) {
-				return i;
-			}
-		}
-		{
-			zval **data;
-			char *key;
-			ulong idx;
-
-			FOREACH_HASH_KEYVAL(&HTTP_G(request).methods.custom, key, idx, data) {
-				if (!strcmp(name, Z_STRVAL_PP(data))) {
-					return idx + HTTP_MAX_REQUEST_METHOD;
-				}
-			}
-		}
-		return 0;
-	} else {
-		return HTTP_STD_REQUEST_METHOD(id) || zend_hash_index_exists(&HTTP_G(request).methods.custom, HTTP_CUSTOM_REQUEST_METHOD(id)) ? id : 0;
-	}
-}
-/* }}} */
-
-/* {{{ unsigned long http_request_method_register(char *) */
-PHP_HTTP_API unsigned long _http_request_method_register(const char *method TSRMLS_DC)
-{
-	zval array;
-	char *http_method;
-	unsigned long meth_num = HTTP_G(request).methods.custom.nNextFreeElement + HTTP_MAX_REQUEST_METHOD;
-
-	Z_ARRVAL(array) = &HTTP_G(request).methods.custom;
-	add_next_index_string(&array, estrdup(method), 0);
-
-	spprintf(&http_method, 0, "HTTP_%s", method);
-	zend_register_long_constant(http_method, strlen(http_method) + 1, meth_num, CONST_CS, http_module_number TSRMLS_CC);
-	efree(http_method);
-
-	return meth_num;
-}
-/* }}} */
-
-/* {{{ STATUS http_request_method_unregister(usngigned long) */
-PHP_HTTP_API STATUS _http_request_method_unregister(unsigned long method TSRMLS_DC)
-{
-	zval **zmethod;
-	char *http_method;
-
-	if (SUCCESS != zend_hash_index_find(&HTTP_G(request).methods.custom, HTTP_CUSTOM_REQUEST_METHOD(method), (void **) &zmethod)) {
-		http_error_ex(E_NOTICE, HTTP_E_PARAM, "Request method with id %lu does not exist", method);
-		return FAILURE;
-	}
-
-	spprintf(&http_method, 0, "HTTP_%s", Z_STRVAL_PP(zmethod));
-
-	if (	(SUCCESS != zend_hash_index_del(&HTTP_G(request).methods.custom, HTTP_CUSTOM_REQUEST_METHOD(method)))
-		||	(SUCCESS != zend_hash_del(EG(zend_constants), http_method, strlen(http_method) + 1))) {
-		http_error_ex(E_NOTICE, 0, "Could not unregister request method: %s", http_method);
-		efree(http_method);
-		return FAILURE;
-	}
-
-	efree(http_method);
-	return SUCCESS;
-}
-/* }}} */
-
-
-/* {{{ char *http_request_methods[] */
-static const char *const http_request_methods[] = {
-	"UNKOWN",
-	/* HTTP/1.1 */
-	"GET",
-	"HEAD",
-	"POST",
-	"PUT",
-	"DELETE",
-	"OPTIONS",
-	"TRACE",
-	"CONNECT",
-	/* WebDAV - RFC 2518 */
-	"PROPFIND",
-	"PROPPATCH",
-	"MKCOL",
-	"COPY",
-	"MOVE",
-	"LOCK",
-	"UNLOCK",
-	/* WebDAV Versioning - RFC 3253 */
-	"VERSION-CONTROL",
-	"REPORT",
-	"CHECKOUT",
-	"CHECKIN",
-	"UNCHECKOUT",
-	"MKWORKSPACE",
-	"UPDATE",
-	"LABEL",
-	"MERGE",
-	"BASELINE-CONTROL",
-	"MKACTIVITY",
-	/* WebDAV Access Control - RFC 3744 */
-	"ACL",
-	NULL
-};
-/* }}} */
-
-/* {{{ static size_t http_curl_write_callback(char *, size_t, size_t, void *) */
-static size_t http_curl_write_callback(char *buf, size_t len, size_t n, void *s)
-{
-	HTTP_CURL_CALLBACK_DATA(s, phpstr *, str);
-	return str ? phpstr_append(PHPSTR(str), buf, len * n) : len * n;
-}
-/* }}} */
-
 /* {{{ static size_t http_curl_read_callback(void *, size_t, size_t, void *) */
-static size_t http_curl_read_callback(void *data, size_t len, size_t n, void *s)
+static size_t http_curl_read_callback(void *data, size_t len, size_t n, void *ctx)
 {
-	HTTP_CURL_CALLBACK_DATA(s, http_request_body *, body);
+	http_request *request = (http_request *) ctx;
+	TSRMLS_FETCH_FROM_CTX(request->tsrm_ls);
 
-	if (body->type != HTTP_REQUEST_BODY_UPLOADFILE) {
+	if (request->body == NULL || request->body->type != HTTP_REQUEST_BODY_UPLOADFILE) {
 		return 0;
 	}
-	return php_stream_read((php_stream *) body->data, data, len * n);
-}
-/* }}} */
-
-/* {{{ http_curl_callback_ctx http_curl_callback_data(void *) */
-static http_curl_callback_ctx *_http_curl_callback_data(void *data TSRMLS_DC)
-{
-	http_curl_callback_ctx *ctx = emalloc(sizeof(http_curl_callback_ctx));
-	TSRMLS_SET_CTX(ctx->tsrm_ctx);
-	ctx->data = data;
-	return http_request_data_copy(COPY_CONTEXT, ctx);
+	return php_stream_read((php_stream *) request->body->data, data, len * n);
 }
 /* }}} */
 
 /* {{{ static int http_curl_progress_callback(void *, double, double, double, double) */
-static int http_curl_progress_callback(void *data, double dltotal, double dlnow, double ultotal, double ulnow)
+static int http_curl_progress_callback(void *ctx, double dltotal, double dlnow, double ultotal, double ulnow)
 {
+	int rc;
 	zval *params_pass[4], params_local[4], retval;
-	HTTP_CURL_CALLBACK_DATA(data, zval *, func);
+	http_request *request = (http_request *) ctx;
+	TSRMLS_FETCH_FROM_CTX(request->tsrm_ls);
 
 	params_pass[0] = &params_local[0];
 	params_pass[1] = &params_local[1];
@@ -933,47 +746,97 @@ static int http_curl_progress_callback(void *data, double dltotal, double dlnow,
 	ZVAL_DOUBLE(params_pass[2], ultotal);
 	ZVAL_DOUBLE(params_pass[3], ulnow);
 
-	return call_user_function(EG(function_table), NULL, func, &retval, 4, params_pass TSRMLS_CC);
+	INIT_PZVAL(&retval);
+	ZVAL_NULL(&retval);
+	rc = call_user_function(EG(function_table), NULL, request->_progress_callback, &retval, 4, params_pass TSRMLS_CC);
+	zval_dtor(&retval);
+	return rc;
 }
 /* }}} */
 
-/* {{{ static int http_curl_debug_callback(CURL *, curl_infotype, char *, size_t, void *) */
-static int http_curl_debug_callback(CURL *ch, curl_infotype type, char *string, size_t length, void *data)
+/* {{{ static curlioerr http_curl_ioctl_callback(CURL *, curliocmd, void *) */
+static curlioerr http_curl_ioctl_callback(CURL *ch, curliocmd cmd, void *ctx)
 {
-	zval *params_pass[2], params_local[2], retval;
-	HTTP_CURL_CALLBACK_DATA(data, zval *, func);
-
-	params_pass[0] = &params_local[0];
-	params_pass[1] = &params_local[1];
+	http_request *request = (http_request *) ctx;
+	TSRMLS_FETCH_FROM_CTX(request->tsrm_ls);
+	
+	if (cmd != CURLIOCMD_RESTARTREAD) {
+		return CURLIOE_UNKNOWNCMD;
+	}
+	if (	request->body == NULL || 
+			request->body->type != HTTP_REQUEST_BODY_UPLOADFILE ||
+			SUCCESS != php_stream_rewind((php_stream *) request->body->data)) {
+		return CURLIOE_FAILRESTART;
+	}
+	return CURLIOE_OK;
+}
+/* }}} */
 
-	INIT_PZVAL(&retval);
-	INIT_PZVAL(params_pass[0]);
-	INIT_PZVAL(params_pass[1]);
-	ZVAL_LONG(params_pass[0], type);
-	ZVAL_STRINGL(params_pass[1], string, length, 0);
+/* {{{ static int http_curl_raw_callback(CURL *, curl_infotype, char *, size_t, void *) */
+static int http_curl_raw_callback(CURL *ch, curl_infotype type, char *data, size_t length, void *ctx)
+{
+	http_request *request = (http_request *) ctx;
 
-#ifdef ZEND_ENGINE_2
-	/* ensure we can call private HttpRequest::debugWrapper() */
+	switch (type)
 	{
-		void *sc = EG(scope);
-		EG(scope) = http_request_object_ce;
+		case CURLINFO_DATA_IN:
+			if (request->conv.last_type == CURLINFO_HEADER_IN) {
+				phpstr_appends(&request->conv.response, HTTP_CRLF);
+			}
+		case CURLINFO_HEADER_IN:
+			phpstr_append(&request->conv.response, data, length);
+		break;
+		case CURLINFO_DATA_OUT:
+			if (request->conv.last_type == CURLINFO_HEADER_OUT) {
+				phpstr_appends(&request->conv.request, HTTP_CRLF);
+			}
+		case CURLINFO_HEADER_OUT:
+			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
-		call_user_function(EG(function_table), NULL, func, &retval, 2, params_pass TSRMLS_CC);
-#ifdef ZEND_ENGINE_2
-		EG(scope) = sc;
+		break;
 	}
-#endif
 
+	if (type) {
+		request->conv.last_type = type;
+	}
 	return 0;
 }
 /* }}} */
 
-/* {{{ static inline zval *http_curl_getopt(HashTable *, char *, size_t, int) */
-static inline zval *_http_curl_getopt_ex(HashTable *options, char *key, size_t keylen, int type TSRMLS_DC)
+/* {{{ 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;
-
-	if (!options || (SUCCESS != zend_hash_find(options, key, keylen, (void **) &zoption))) {
+#ifdef ZEND_ENGINE_2
+	ulong h = zend_get_hash_value(key, keylen);
+#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;
 	}
 
@@ -990,11 +853,124 @@ static inline zval *_http_curl_getopt_ex(HashTable *options, char *key, size_t k
 			break;
 		}
 	}
-
+	
+	/* cache strings */
+	if (type == IS_STRING) {
+		ZVAL_ADDREF(*zoption);
+#ifdef ZEND_ENGINE_2
+		_zend_hash_quick_add_or_update(&r->_cache.options, key, keylen, h, zoption, sizeof(zval *), NULL, 
+			zend_hash_quick_exists(&r->_cache.options, key, keylen, h)?HASH_UPDATE:HASH_ADD ZEND_FILE_LINE_CC);
+#else
+		zend_hash_add_or_update(&r->_cache.options, key, keylen, zoption, sizeof(zval *), NULL,
+			zend_hash_exists(&r->_cache.options, key, keylen)?HASH_UPDATE:HASH_ADD);
+#endif
+	}
+	
 	return *zoption;
 }
 /* }}} */
 
+#ifdef HTTP_NEED_OPENSSL_TSL
+/* {{{ */
+static MUTEX_T *http_openssl_tsl = NULL;
+
+static void http_ssl_lock(int mode, int n, const char * file, int line)
+{
+	if (mode & CRYPTO_LOCK) {
+		tsrm_mutex_lock(http_openssl_tsl[n]);
+	} else {
+		tsrm_mutex_unlock(http_openssl_tsl[n]);
+	}
+}
+
+static ulong http_ssl_id(void)
+{
+	return (ulong) tsrm_thread_id();
+}
+
+static inline void http_ssl_init(void)
+{
+	int i, c = CRYPTO_num_locks();
+	
+	http_openssl_tsl = malloc(c * sizeof(MUTEX_T));
+	
+	for (i = 0; i < c; ++i) {
+		http_openssl_tsl[i] = tsrm_mutex_alloc();
+	}
+	
+	CRYPTO_set_id_callback(http_ssl_id);
+	CRYPTO_set_locking_callback(http_ssl_lock);
+}
+
+static inline void http_ssl_cleanup(void)
+{
+	if (http_openssl_tsl) {
+		int i, c = CRYPTO_num_locks();
+		
+		CRYPTO_set_id_callback(NULL);
+		CRYPTO_set_locking_callback(NULL);
+		
+		for (i = 0; i < c; ++i) {
+			tsrm_mutex_free(http_openssl_tsl[i]);
+		}
+		
+		free(http_openssl_tsl);
+		http_openssl_tsl = NULL;
+	}
+}
+#endif /* HTTP_NEED_OPENSSL_TSL */
+/* }}} */
+
+#ifdef HTTP_NEED_GNUTLS_TSL
+/* {{{ */
+static int http_ssl_mutex_create(void **m)
+{
+	if (*((MUTEX_T *) m) = tsrm_mutex_alloc()) {
+		return SUCCESS;
+	} else {
+		return FAILURE;
+	}
+}
+
+static int http_ssl_mutex_destroy(void **m)
+{
+	tsrm_mutex_free(*((MUTEX_T *) m));
+	return SUCCESS;
+}
+
+static int http_ssl_mutex_lock(void **m)
+{
+	return tsrm_mutex_lock(*((MUTEX_T *) m));
+}
+
+static int http_ssl_mutex_unlock(void **m)
+{
+	return tsrm_mutex_unlock(*((MUTEX_T *) m));
+}
+
+static struct gcry_thread_cbs http_gnutls_tsl = {
+	GCRY_THREAD_OPTIONS_USER,
+	NULL,
+	http_ssl_mutex_create,
+	http_ssl_mutex_destroy,
+	http_ssl_mutex_lock,
+	http_ssl_mutex_unlock
+};
+
+static inline void http_ssl_init(void)
+{
+	gcry_control(GCRYCTL_SET_THREAD_CBS, &http_gnutls_tsl);
+}
+
+static inline void http_ssl_cleanup(void)
+{
+	return;
+}
+#endif /* HTTP_NEED_GNUTLS_TSL */
+/* }}} */
+
+#endif /* HTTP_HAVE_CURL */
+
 /*
  * Local variables:
  * tab-width: 4