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

diff --git a/http_request_api.c b/http_request_api.c
index b3f7150..8b195f8 100644
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -20,10 +20,22 @@
 #endif
 #include "php.h"
 
+#ifdef HTTP_HAVE_CURL
+
+#if defined(ZTS) && defined(HTTP_HAVE_SSL)
+#	if !defined(HAVE_OPENSSL_CRYPTO_H)
+#		error "libcurl was compiled with OpenSSL support, but we have no openssl/crypto.h"
+#	else
+#		define HTTP_NEED_SSL
+#		include <openssl/crypto.h>
+#	endif
+#endif
+
 #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"
@@ -39,11 +51,40 @@
 
 ZEND_EXTERN_MODULE_GLOBALS(http);
 
-#ifndef HTTP_CURL_USE_ZEND_MM
-#	define HTTP_CURL_USE_ZEND_MM 0
+#ifdef HTTP_NEED_SSL
+static inline zend_bool http_ssl_init(void);
+static inline void http_ssl_cleanup(void);
 #endif
 
-#if LIBCURL_VERSION_NUM < 0x070c00
+STATUS _http_request_global_init(INIT_FUNC_ARGS)
+{
+	if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) {
+		return FAILURE;
+	}
+	
+#ifdef HTTP_NEED_SSL
+	http_ssl_init();
+#endif
+
+#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 */
+
+	return SUCCESS;
+}
+
+void _http_request_global_cleanup(TSRMLS_D)
+{
+	curl_global_cleanup();
+#ifdef HTTP_NEED_SSL
+	http_ssl_cleanup();
+#endif
+}
+
+#ifndef HAVE_CURL_EASY_STRERROR
 #	define curl_easy_strerror(code) HTTP_G(request).error
 #endif
 
@@ -101,51 +142,29 @@ ZEND_EXTERN_MODULE_GLOBALS(http);
 		continue; \
 	}
 
-
-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 *);
+#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_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
+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; }
 
-/* {{{ STATUS http_request_global_init() */
-STATUS _http_request_global_init(void)
+/* {{{ 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)
 {
-#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;
+	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;
 	}
-#endif
-	return SUCCESS;
 }
 /* }}} */
 
@@ -173,6 +192,12 @@ void *_http_request_data_copy(int type, void *data TSRMLS_DC)
 			return data;
 		}
 
+		case COPY_CONV:
+		{
+			zend_llist_add_element(&HTTP_G(request).copies.convs, &data);
+			return data;
+		}
+
 		default:
 		{
 			return data;
@@ -195,10 +220,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_request_conv **) */
+void _http_request_data_free_conv(void *conv)
+{
+	efree(*((http_request_conv **) conv));
 }
 /* }}} */
 
@@ -227,11 +259,11 @@ PHP_HTTP_API STATUS _http_request_body_fill(http_request_body *body, HashTable *
 				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_CONTENTSLENGTH,	(long) 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));
+					http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not encode post fields: %s", curl_easy_strerror(err));
 					curl_formfree(http_post_data[0]);
 					return FAILURE;
 				}
@@ -255,12 +287,12 @@ PHP_HTTP_API STATUS _http_request_body_fill(http_request_body *body, HashTable *
 					CURLFORM_END
 				);
 				if (CURLE_OK != err) {
-					http_error_ex(E_WARNING, HTTP_E_CURL, "Could not encode post files: %s", curl_easy_strerror(err));
+					http_error_ex(HE_WARNING, HTTP_E_ENCODING, "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");
+				http_error(HE_NOTICE, HTTP_E_INVALID_PARAM, "Post file array entry misses either 'name', 'type' or 'file' entry");
 			}
 		}
 
@@ -273,7 +305,7 @@ PHP_HTTP_API STATUS _http_request_body_fill(http_request_body *body, HashTable *
 		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");
+			http_error(HE_WARNING, HTTP_E_ENCODING, "Could not encode post data");
 			return FAILURE;
 		}
 
@@ -320,34 +352,33 @@ PHP_HTTP_API void _http_request_body_free(http_request_body *body TSRMLS_DC)
 }
 /* }}} */
 
-/* {{{ 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_init(CURL *, http_request_method, char *, http_request_body *, HashTable *) */
+PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char *url, http_request_body *body, HashTable *options TSRMLS_DC)
 {
 	zval *zoption;
 	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) {
 		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);
+	/* we'll get all data through the debug function */
+	HTTP_CURL_OPT(WRITEFUNCTION, http_curl_dummy_callback);
+	HTTP_CURL_OPT(HEADERFUNCTION, NULL);
+
+	HTTP_CURL_OPT(VERBOSE, 1);
+	HTTP_CURL_OPT(DEBUGFUNCTION, http_curl_raw_callback);
 
 #if defined(ZTS) && (LIBCURL_VERSION_NUM >= 0x070a00)
 	HTTP_CURL_OPT(NOSIGNAL, 1);
@@ -360,18 +391,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 	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);
-	}
-
-	/* 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_CURL_OPT(PROGRESSDATA,  http_request_callback_data(zoption));
 	}
 
 	/* proxy */
@@ -416,8 +436,6 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 	/* 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 */
@@ -427,22 +445,16 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 		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)) {
 		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)) {
 		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') */
@@ -468,8 +480,6 @@ 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') */
@@ -494,9 +504,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 			phpstr_fix(qstr);
 			HTTP_CURL_OPT(COOKIE, http_request_data_copy(COPY_STRING, qstr->data));
 		}
-		phpstr_free(qstr);
-	} else {
-		HTTP_CURL_OPT(COOKIE, NULL);
+		phpstr_free(&qstr);
 	}
 
 	/* session cookies */
@@ -508,54 +516,39 @@ 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)) {
+	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)) {
 		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);
 	}
 
-	/* timeout, defaults to 3 */
+	/* timeout, defaults to 0 */
 	if (zoption = http_curl_getopt(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)) {
 		HTTP_CURL_OPT(CONNECTTIMEOUT, Z_LVAL_P(zoption));
-	} else {
-		HTTP_CURL_OPT(CONNECTTIMEOUT, 3);
 	}
 
 	/* ssl */
@@ -595,10 +588,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 */
@@ -624,7 +613,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 			if (http_request_method_exists(0, meth, NULL)) {
 				curl_easy_setopt(ch, CURLOPT_CUSTOMREQUEST, http_request_method_name(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", meth);
 				return FAILURE;
 			}
 		break;
@@ -644,12 +633,13 @@ 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;
 
 			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", body->type);
 				return FAILURE;
 			break;
 		}
@@ -659,14 +649,27 @@ 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_request_conv *conv = emalloc(sizeof(http_request_conv));
+	conv->response = response;
+	conv->request = request;
+	conv->last_info = -1;
+	HTTP_CURL_OPT(DEBUGDATA, http_request_callback_data(http_request_data_copy(COPY_CONV, conv)));
+}
+/* }}} */
+
 /* {{{ STATUS http_request_exec(CURL *, HashTable *) */
-PHP_HTTP_API STATUS _http_request_exec(CURL *ch, HashTable *info TSRMLS_DC)
+PHP_HTTP_API STATUS _http_request_exec(CURL *ch, HashTable *info, phpstr *response, phpstr *request TSRMLS_DC)
 {
 	CURLcode result;
 
+	http_request_conv(ch, response, request);
+
 	/* 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));
+		http_error_ex(HE_WARNING, HTTP_E_REQUEST, "Could not perform request: %s", curl_easy_strerror(result));
 		return FAILURE;
 	} else {
 		/* get curl info */
@@ -682,7 +685,7 @@ PHP_HTTP_API STATUS _http_request_exec(CURL *ch, HashTable *info TSRMLS_DC)
 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
@@ -740,13 +743,13 @@ PHP_HTTP_API STATUS _http_request_ex(CURL *ch, http_request_method meth, char *u
 
 	if ((clean_curl = (!ch))) {
 		if (!(ch = curl_easy_init())) {
-			http_error(E_WARNING, HTTP_E_CURL, "Could not initialize curl.");
+			http_error(HE_WARNING, HTTP_E_REQUEST, "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;
+	status =	((SUCCESS == http_request_init(ch, meth, url, body, options)) &&
+				(SUCCESS == http_request_exec(ch, info, response, NULL))) ? SUCCESS : FAILURE;
 
 	if (clean_curl) {
 		curl_easy_cleanup(ch);
@@ -755,146 +758,10 @@ PHP_HTTP_API STATUS _http_request_ex(CURL *ch, http_request_method meth, char *u
 }
 /* }}} */
 
-/* {{{ 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)
 {
-	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;
@@ -903,21 +770,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];
@@ -937,33 +794,40 @@ static int http_curl_progress_callback(void *data, double dltotal, double dlnow,
 }
 /* }}} */
 
-/* {{{ 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 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)
 {
-	zval *params_pass[2], params_local[2], retval;
-	HTTP_CURL_CALLBACK_DATA(data, zval *, func);
+	HTTP_REQUEST_CALLBACK_DATA(ctx, http_request_conv *, conv);
 
-	params_pass[0] = &params_local[0];
-	params_pass[1] = &params_local[1];
-
-	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);
+#if 0
+	fprintf(stderr, "DEBUG: %s\n", data);
+#endif
 
-#ifdef ZEND_ENGINE_2
-	/* ensure we can call private HttpRequest::debugWrapper() */
+	switch (type)
 	{
-		void *sc = EG(scope);
-		EG(scope) = http_request_object_ce;
-#endif
-		call_user_function(EG(function_table), NULL, func, &retval, 2, params_pass TSRMLS_CC);
-#ifdef ZEND_ENGINE_2
-		EG(scope) = sc;
+		case CURLINFO_DATA_IN:
+			if (conv->response && conv->last_info == CURLINFO_HEADER_IN) {
+				phpstr_appends(conv->response, HTTP_CRLF);
+			}
+		case CURLINFO_HEADER_IN:
+			if (conv->response) {
+				phpstr_append(conv->response, data, length);
+			}
+		break;
+		case CURLINFO_DATA_OUT:
+			if (conv->request && conv->last_info == CURLINFO_HEADER_OUT) {
+				phpstr_appends(conv->request, HTTP_CRLF);
+			}
+		case CURLINFO_HEADER_OUT:
+			if (conv->request) {
+				phpstr_append(conv->request, data, length);
+			}
+		break;
 	}
-#endif
 
+	if (type) {
+		conv->last_info = type;
+	}
 	return 0;
 }
 /* }}} */
@@ -995,6 +859,122 @@ static inline zval *_http_curl_getopt_ex(HashTable *options, char *key, size_t k
 }
 /* }}} */
 
+#ifdef HTTP_NEED_SSL
+
+static MUTEX_T *http_ssl_mutex = NULL;
+
+static void http_ssl_lock(int mode, int n, const char * file, int line)
+{
+	if (mode & CRYPTO_LOCK) {
+		tsrm_mutex_lock(http_ssl_mutex[n]);
+	} else {
+		tsrm_mutex_unlock(http_ssl_mutex[n]);
+	}
+}
+
+static unsigned long http_ssl_id(void)
+{
+	return (unsigned long) tsrm_thread_id();
+}
+
+static inline zend_bool http_ssl_init(void)
+{
+	curl_version_info_data *cvid = curl_version_info(CURLVERSION_NOW);
+	
+	if (cvid && (cvid->features & CURL_VERSION_SSL)) {
+		int i, c = CRYPTO_num_locks();
+		
+		http_ssl_mutex = malloc(c * sizeof(MUTEX_T));
+		
+		for (i = 0; i < c; ++i) {
+			http_ssl_mutex[i] = tsrm_mutex_alloc();
+		}
+		
+		CRYPTO_set_id_callback(http_ssl_id);
+		CRYPTO_set_locking_callback(http_ssl_lock);
+		
+		return 1;
+	}
+	
+	return 0;
+}
+
+static inline void http_ssl_cleanup(void)
+{
+	if (http_ssl_mutex) {
+		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_ssl_mutex[i]);
+		}
+		
+		free(http_ssl_mutex);
+		http_ssl_mutex = NULL;
+	}
+}
+#endif /* HTTP_NEED_SSL */
+
+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/" HTTP_PEXT_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(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:
  * tab-width: 4