X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_api.c;h=38eadf45f24343b653faa7aae58e5d748fbc59be;hp=3aba703820fc8f0d6484f29d3f8ce83af12b269c;hb=6fc78f4b8ea8a34a40f06985648822fbaa7ffb30;hpb=61f165688d2cc39424678829a145c8cbab51d1af

diff --git a/http_request_api.c b/http_request_api.c
index 3aba703..38eadf4 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,29 +15,95 @@
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
-#include "php.h"
+
+#define HTTP_WANT_CURL
+#include "php_http.h"
 
 #ifdef HTTP_HAVE_CURL
 
-#include "php_http.h"
-#include "php_http_std_defs.h"
 #include "php_http_api.h"
 #include "php_http_request_api.h"
 #include "php_http_request_method_api.h"
 #include "php_http_url_api.h"
+
 #ifdef ZEND_ENGINE_2
 #	include "php_http_request_object.h"
 #endif
 
-#include "phpstr/phpstr.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 */
+/* }}} */
+
+ZEND_EXTERN_MODULE_GLOBALS(http);
+
+#ifdef HTTP_NEED_SSL_TSL
+static inline void http_ssl_init(void);
+static inline void http_ssl_cleanup(void);
+#endif
 
-#ifdef PHP_WIN32
-#	include <winsock2.h>
+PHP_MINIT_FUNCTION(http_request)
+{
+#ifdef HTTP_NEED_SSL_TSL
+	http_ssl_init();
 #endif
 
-#include <curl/curl.h>
+	if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) {
+		return FAILURE;
+	}
+	
+#if LIBCURL_VERSION_NUM >= 0x070a05
+	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);
+#endif /* LIBCURL_VERSION_NUM */
 
-ZEND_EXTERN_MODULE_GLOBALS(http);
+	return SUCCESS;
+}
+
+PHP_MSHUTDOWN_FUNCTION(http_request)
+{
+	curl_global_cleanup();
+#ifdef HTTP_NEED_SSL_TSL
+	http_ssl_cleanup();
+#endif
+	return SUCCESS;
+}
 
 #ifndef HAVE_CURL_EASY_STRERROR
 #	define curl_easy_strerror(code) HTTP_G(request).error
@@ -103,19 +166,28 @@ ZEND_EXTERN_MODULE_GLOBALS(http);
 #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);
+#define http_curl_defaults(ch) _http_curl_defaults((ch))
+static inline void _http_curl_defaults(CURL *ch);
 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 *);
 static int http_curl_dummy_callback(char *data, size_t n, size_t l, void *s) { return n*l; }
 
-#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);
-
+/* {{{ http_request_callback_ctx http_request_callback_data(void *) */
+http_request_callback_ctx *_http_request_callback_data_ex(void *data, zend_bool cpy TSRMLS_DC)
+{
+	http_request_callback_ctx *ctx = emalloc(sizeof(http_request_callback_ctx));
+	
+	TSRMLS_SET_CTX(ctx->tsrm_ctx);
+	ctx->data = data;
+	
+	if (cpy) {
+		return http_request_data_copy(COPY_CONTEXT, ctx);
+	} else {
+		return ctx;
+	}
+}
+/* }}} */
 
 /* {{{ void *http_request_data_copy(int, void *) */
 void *_http_request_data_copy(int type, void *data TSRMLS_DC)
@@ -169,17 +241,17 @@ void _http_request_data_free_slist(void *list)
 }
 /* }}} */
 
-/* {{{ _http_request_data_free_context(http_curl_callback_ctx **) */
+/* {{{ _http_request_data_free_context(http_request_callback_ctx **) */
 void _http_request_data_free_context(void *context)
 {
-	efree(*((http_curl_callback_ctx **) context));
+	efree(*((http_request_callback_ctx **) context));
 }
 /* }}} */
 
-/* {{{ _http_request_data_free_conv(http_curl_conv **) */
+/* {{{ _http_request_data_free_conv(http_request_conv **) */
 void _http_request_data_free_conv(void *conv)
 {
-	efree(*((http_curl_conv **) conv));
+	efree(*((http_request_conv **) conv));
 }
 /* }}} */
 
@@ -198,12 +270,15 @@ PHP_HTTP_API STATUS _http_request_body_fill(http_request_body *body, HashTable *
 		char *key = NULL;
 		ulong idx;
 		zval **data;
+		HashPosition pos;
 		struct curl_httppost *http_post_data[2] = {NULL, NULL};
 
 		/* normal data */
-		FOREACH_HASH_KEYVAL(fields, key, idx, data) {
+		FOREACH_HASH_KEYVAL(pos, fields, key, idx, data) {
 			CURLcode err;
 			if (key) {
+				zval *orig = *data;
+				
 				convert_to_string_ex(data);
 				err = curl_formadd(&http_post_data[0], &http_post_data[1],
 					CURLFORM_COPYNAME,			key,
@@ -211,6 +286,11 @@ PHP_HTTP_API STATUS _http_request_body_fill(http_request_body *body, HashTable *
 					CURLFORM_CONTENTSLENGTH,	(long) Z_STRLEN_PP(data),
 					CURLFORM_END
 				);
+				
+				if (orig != *data) {
+					zval_ptr_dtor(data);
+				}
+				
 				if (CURLE_OK != err) {
 					http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not encode post fields: %s", curl_easy_strerror(err));
 					curl_formfree(http_post_data[0]);
@@ -223,13 +303,17 @@ PHP_HTTP_API STATUS _http_request_body_fill(http_request_body *body, HashTable *
 		}
 
 		/* file data */
-		FOREACH_HASH_VAL(files, data) {
-			CURLcode err;
+		FOREACH_HASH_VAL(pos, files, data) {
 			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],
+			
+			if (Z_TYPE_PP(data) != IS_ARRAY) {
+				http_error(HE_NOTICE, HTTP_E_INVALID_PARAM, "Unrecognized type of post file array entry");
+			} else 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)) {
+				http_error(HE_NOTICE, HTTP_E_INVALID_PARAM, "Post file array entry misses either 'name', 'type' or 'file' entry");
+			} else {
+				CURLcode 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),
@@ -240,8 +324,6 @@ PHP_HTTP_API STATUS _http_request_body_fill(http_request_body *body, HashTable *
 					curl_formfree(http_post_data[0]);
 					return FAILURE;
 				}
-			} else {
-				http_error(HE_NOTICE, HTTP_E_INVALID_PARAM, "Post file array entry misses either 'name', 'type' or 'file' entry");
 			}
 		}
 
@@ -292,11 +374,12 @@ PHP_HTTP_API void _http_request_body_dtor(http_request_body *body TSRMLS_DC)
 /* }}} */
 
 /* {{{ void http_request_body_free(http_request_body *) */
-PHP_HTTP_API void _http_request_body_free(http_request_body *body TSRMLS_DC)
+PHP_HTTP_API void _http_request_body_free(http_request_body **body TSRMLS_DC)
 {
-	if (body) {
-		http_request_body_dtor(body);
-		efree(body);
+	if (*body) {
+		http_request_body_dtor(*body);
+		efree(*body);
+		*body = NULL;
 	}
 }
 /* }}} */
@@ -308,9 +391,10 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 	zend_bool range_req = 0;
 
 	/* reset CURL handle */
-#if LIBCURL_VERSION_NUM >= 0x070c01
+#ifdef HAVE_CURL_EASY_RESET
 	curl_easy_reset(ch);
 #endif
+	http_curl_defaults(ch);
 
 	/* set options */
 	if (url) {
@@ -336,95 +420,90 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 #endif
 
 	/* progress callback */
-	if (zoption = http_curl_getopt(options, "onprogress", 0)) {
+	if ((zoption = http_curl_getopt(options, "onprogress", 0))) {
 		HTTP_CURL_OPT(NOPROGRESS, 0);
 		HTTP_CURL_OPT(PROGRESSFUNCTION, http_curl_progress_callback);
-		HTTP_CURL_OPT(PROGRESSDATA,  http_curl_callback_data(zoption));
-	} else {
-		HTTP_CURL_OPT(NOPROGRESS, 1);
+		HTTP_CURL_OPT(PROGRESSDATA,  http_request_callback_data(zoption));
 	}
 
 	/* proxy */
-	if (zoption = http_curl_getopt(options, "proxyhost", IS_STRING)) {
+	if ((zoption = http_curl_getopt(options, "proxyhost", IS_STRING))) {
 		HTTP_CURL_OPT(PROXY, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
 		/* port */
-		if (zoption = http_curl_getopt(options, "proxyport", IS_LONG)) {
+		if ((zoption = http_curl_getopt(options, "proxyport", IS_LONG))) {
 			HTTP_CURL_OPT(PROXYPORT, Z_LVAL_P(zoption));
 		}
 		/* user:pass */
-		if (zoption = http_curl_getopt(options, "proxyauth", IS_STRING)) {
+		if ((zoption = http_curl_getopt(options, "proxyauth", IS_STRING))) {
 			HTTP_CURL_OPT(PROXYUSERPWD, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
 		}
 #if LIBCURL_VERSION_NUM >= 0x070a07
 		/* auth method */
-		if (zoption = http_curl_getopt(options, "proxyauthtype", IS_LONG)) {
+		if ((zoption = http_curl_getopt(options, "proxyauthtype", IS_LONG))) {
 			HTTP_CURL_OPT(PROXYAUTH, Z_LVAL_P(zoption));
 		}
 #endif
 	}
 
 	/* outgoing interface */
-	if (zoption = http_curl_getopt(options, "interface", IS_STRING)) {
+	if ((zoption = http_curl_getopt(options, "interface", IS_STRING))) {
 		HTTP_CURL_OPT(INTERFACE, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
 	}
 
 	/* another port */
-	if (zoption = http_curl_getopt(options, "port", IS_LONG)) {
+	if ((zoption = http_curl_getopt(options, "port", IS_LONG))) {
 		HTTP_CURL_OPT(PORT, Z_LVAL_P(zoption));
 	}
 
 	/* auth */
-	if (zoption = http_curl_getopt(options, "httpauth", IS_STRING)) {
+	if ((zoption = http_curl_getopt(options, "httpauth", IS_STRING))) {
 		HTTP_CURL_OPT(USERPWD, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
 	}
 #if LIBCURL_VERSION_NUM >= 0x070a06
-	if (zoption = http_curl_getopt(options, "httpauthtype", IS_LONG)) {
+	if ((zoption = http_curl_getopt(options, "httpauthtype", IS_LONG))) {
 		HTTP_CURL_OPT(HTTPAUTH, Z_LVAL_P(zoption));
 	}
 #endif
 
-	/* compress, empty string enables deflate and gzip */
+	/* compress, empty string enables all supported if libcurl was build with zlib support */
 	if ((zoption = http_curl_getopt(options, "compress", IS_BOOL)) && Z_LVAL_P(zoption)) {
+#ifdef HTTP_HAVE_CURL_ZLIB
 		HTTP_CURL_OPT(ENCODING, "");
-	} else {
-		HTTP_CURL_OPT(ENCODING, 0);
+#else
+		HTTP_CURL_OPT(ENCODING, "gzip;q=1.0, deflate;q=0.5, *;q=0.1");
+#endif
 	}
 
 	/* redirects, defaults to 0 */
-	if (zoption = http_curl_getopt(options, "redirect", IS_LONG)) {
+	if ((zoption = http_curl_getopt(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_curl_getopt(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)) {
+	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);
 	}
 
 	/* useragent, default "PECL::HTTP/version (PHP/version)" */
-	if (zoption = http_curl_getopt(options, "useragent", IS_STRING)) {
+	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 ")");
 	}
 
 	/* additional headers, array('name' => 'value') */
-	if (zoption = http_curl_getopt(options, "headers", IS_ARRAY)) {
+	if ((zoption = http_curl_getopt(options, "headers", IS_ARRAY))) {
 		char *header_key;
 		ulong header_idx;
+		HashPosition pos;
 		struct curl_slist *headers = NULL;
 
-		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));
@@ -438,20 +517,19 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 		if (headers) {
 			HTTP_CURL_OPT(HTTPHEADER, http_request_data_copy(COPY_SLIST, headers));
 		}
-	} else {
-		HTTP_CURL_OPT(HTTPHEADER, NULL);
 	}
 
 	/* cookies, array('name' => 'value') */
-	if (zoption = http_curl_getopt(options, "cookies", IS_ARRAY)) {
+	if ((zoption = http_curl_getopt(options, "cookies", IS_ARRAY))) {
 		char *cookie_key = NULL;
 		ulong cookie_idx = 0;
+		HashPosition pos;
 		phpstr *qstr = phpstr_new();
 
-		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)) {
+				if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_P(zoption), (void **) &cookie_val, &pos)) {
 					phpstr_appendf(qstr, "%s=%s; ", cookie_key, Z_STRVAL_PP(cookie_val));
 				}
 
@@ -465,12 +543,10 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 			HTTP_CURL_OPT(COOKIE, http_request_data_copy(COPY_STRING, qstr->data));
 		}
 		phpstr_free(&qstr);
-	} else {
-		HTTP_CURL_OPT(COOKIE, NULL);
 	}
 
 	/* session cookies */
-	if (zoption = http_curl_getopt(options, "cookiesession", IS_BOOL)) {
+	if ((zoption = http_curl_getopt(options, "cookiesession", IS_BOOL))) {
 		if (Z_LVAL_P(zoption)) {
 			/* accept cookies for this session */
 			HTTP_CURL_OPT(COOKIEFILE, "");
@@ -478,63 +554,57 @@ 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);
 	}
 
 	/* resume */
 	if ((zoption = http_curl_getopt(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_curl_getopt(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_curl_getopt(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 0 */
-	if (zoption = http_curl_getopt(options, "timeout", IS_LONG)) {
+	if ((zoption = http_curl_getopt(options, "timeout", IS_LONG))) {
 		HTTP_CURL_OPT(TIMEOUT, Z_LVAL_P(zoption));
-	} else {
-		HTTP_CURL_OPT(TIMEOUT, 0);
 	}
 
 	/* connecttimeout, defaults to 3 */
-	if (zoption = http_curl_getopt(options, "connecttimeout", IS_LONG)) {
+	if ((zoption = http_curl_getopt(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_curl_getopt(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
@@ -553,7 +623,6 @@ 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);
@@ -565,10 +634,6 @@ 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 */
@@ -614,7 +679,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 			break;
 
 			case HTTP_REQUEST_BODY_UPLOADFILE:
-				curl_easy_setopt(ch, CURLOPT_READDATA, http_curl_callback_data(body));
+				curl_easy_setopt(ch, CURLOPT_READDATA, http_request_callback_data(body));
 				curl_easy_setopt(ch, CURLOPT_INFILESIZE, body->size);
 			break;
 
@@ -633,11 +698,11 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 /* {{{ void http_request_conv(CURL *, phpstr *, phpstr *) */
 void _http_request_conv(CURL *ch, phpstr* response, phpstr *request TSRMLS_DC)
 {
-	http_curl_conv *conv = emalloc(sizeof(http_curl_conv));
+	http_request_conv *conv = emalloc(sizeof(http_request_conv));
 	conv->response = response;
 	conv->request = request;
 	conv->last_info = -1;
-	HTTP_CURL_OPT(DEBUGDATA, http_curl_callback_data(http_request_data_copy(COPY_CONV, conv)));
+	HTTP_CURL_OPT(DEBUGDATA, http_request_callback_data(http_request_data_copy(COPY_CONV, conv)));
 }
 /* }}} */
 
@@ -650,15 +715,14 @@ PHP_HTTP_API STATUS _http_request_exec(CURL *ch, HashTable *info, phpstr *respon
 
 	/* perform request */
 	if (CURLE_OK != (result = curl_easy_perform(ch))) {
-		http_error_ex(HE_WARNING, HTTP_E_REQUEST, "Could not perform request: %s", curl_easy_strerror(result));
-		return FAILURE;
-	} else {
-		/* get curl info */
-		if (info) {
-			http_request_info(ch, info);
-		}
-		return SUCCESS;
+		http_error(HE_WARNING, HTTP_E_REQUEST, curl_easy_strerror(result));
+	}
+	/* get curl info */
+	if (info) {
+		http_request_info(ch, info);
 	}
+	/* always succeeds */
+	return SUCCESS;
 }
 /* }}} */
 
@@ -666,7 +730,7 @@ PHP_HTTP_API STATUS _http_request_exec(CURL *ch, HashTable *info, phpstr *respon
 PHP_HTTP_API void _http_request_info(CURL *ch, HashTable *info TSRMLS_DC)
 {
 	zval array;
-	Z_ARRVAL(array) = info;
+	INIT_ZARR(array, info);
 
 	HTTP_CURL_INFO(EFFECTIVE_URL);
 #if LIBCURL_VERSION_NUM >= 0x070a07
@@ -720,14 +784,9 @@ PHP_HTTP_API void _http_request_info(CURL *ch, HashTable *info TSRMLS_DC)
 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;
+	zend_bool clean_curl = !ch;
 
-	if ((clean_curl = (!ch))) {
-		if (!(ch = curl_easy_init())) {
-			http_error(HE_WARNING, HTTP_E_REQUEST, "Could not initialize curl.");
-			return FAILURE;
-		}
-	}
+	HTTP_CHECK_CURL_INIT(ch, curl_easy_init(), return FAILURE);
 
 	status =	((SUCCESS == http_request_init(ch, meth, url, body, options)) &&
 				(SUCCESS == http_request_exec(ch, info, response, NULL))) ? SUCCESS : FAILURE;
@@ -742,7 +801,7 @@ PHP_HTTP_API STATUS _http_request_ex(CURL *ch, http_request_method meth, char *u
 /* {{{ 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)
 {
-	HTTP_CURL_CALLBACK_DATA(s, http_request_body *, body);
+	HTTP_REQUEST_CALLBACK_DATA(s, http_request_body *, body);
 
 	if (body->type != HTTP_REQUEST_BODY_UPLOADFILE) {
 		return 0;
@@ -751,21 +810,11 @@ static size_t http_curl_read_callback(void *data, size_t len, size_t n, void *s)
 }
 /* }}} */
 
-/* {{{ 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);
-}
-/* }}} */
-
 /* {{{ 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)
 {
 	zval *params_pass[4], params_local[4], retval;
-	HTTP_CURL_CALLBACK_DATA(data, zval *, func);
+	HTTP_REQUEST_CALLBACK_DATA(data, zval *, func);
 
 	params_pass[0] = &params_local[0];
 	params_pass[1] = &params_local[1];
@@ -788,7 +837,7 @@ static int http_curl_progress_callback(void *data, double dltotal, double dlnow,
 /* {{{ 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_CURL_CALLBACK_DATA(ctx, http_curl_conv *, conv);
+	HTTP_REQUEST_CALLBACK_DATA(ctx, http_request_conv *, conv);
 
 	switch (type)
 	{
@@ -810,6 +859,26 @@ static int http_curl_raw_callback(CURL *ch, curl_infotype type, char *data, size
 				phpstr_append(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 (type) {
@@ -846,7 +915,165 @@ static inline zval *_http_curl_getopt_ex(HashTable *options, char *key, size_t k
 }
 /* }}} */
 
+#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 */
+/* }}} */
+
+/* {{{ http_curl_defaults(CURL *) */
+static inline void _http_curl_defaults(CURL *ch)
+{
+	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);
+#if LIBCURL_VERSION_NUM >= 0x070a07
+	HTTP_CURL_OPT(PROXYAUTH, 0);
 #endif
+	HTTP_CURL_OPT(INTERFACE, NULL);
+	HTTP_CURL_OPT(PORT, 0);
+	HTTP_CURL_OPT(USERPWD, NULL);
+#if LIBCURL_VERSION_NUM >= 0x070a06
+	HTTP_CURL_OPT(HTTPAUTH, 0);
+#endif
+	HTTP_CURL_OPT(ENCODING, 0);
+	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);
+#if LIBCURL_VERSION_NUM >= 0x070903
+	HTTP_CURL_OPT(SSLCERTTYPE, NULL);
+#endif
+	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);
+#if LIBCURL_VERSION_NUM >= 0x070908
+	HTTP_CURL_OPT(CAPATH, NULL);
+#endif
+	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(READDATA, NULL);
+	HTTP_CURL_OPT(INFILESIZE, 0);
+}
+/* }}} */
+
+#endif /* HTTP_HAVE_CURL */
 
 /*
  * Local variables: