X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_api.c;h=88bb1b2b51404f3fb507c21f700fdcaf4598d894;hp=bb83e28bde4a77c70af6d601c39966ff8a3ab48e;hb=054426ee13e1680245998c59f571effca5ceda4b;hpb=3e711605ee28d986db49a9a678ca055cf526d129

diff --git a/http_api.c b/http_api.c
index bb83e28..88bb1b2 100644
--- a/http_api.c
+++ b/http_api.c
@@ -39,28 +39,11 @@
 
 #ifdef ZEND_ENGINE_2
 #	include "ext/standard/php_http.h"
-#else
-	#include "http_build_query.c"
 #endif
 
 #include "php_http.h"
 #include "php_http_api.h"
-
-#ifdef HTTP_HAVE_CURL
-
-#	ifdef PHP_WIN32
-#		include <winsock2.h>
-#		include <sys/types.h>
-#	endif
-
-#	include <curl/curl.h>
-#	include <curl/easy.h>
-
-#endif
-
-#if !defined(CURLINFO_RESONSE_CODE) && defined(CURLINFO_HTTP_CODE)
-#define CURLINFO_RESONSE_CODE CURLINFO_HTTP_CODE
-#endif
+#include "php_http_std_defs.h"
 
 ZEND_DECLARE_MODULE_GLOBALS(http)
 
@@ -144,43 +127,8 @@ static int check_day(char *day, size_t len);
 static int check_month(char *month);
 static int check_tzone(char *tzone);
 
-static char *pretty_key(char *key, int key_len, int uctitle, int xhyphen);
-
 static int http_ob_stack_get(php_ob_buffer *, php_ob_buffer **);
 
-/* {{{ HAVE_CURL */
-#ifdef HTTP_HAVE_CURL
-#define http_curl_initbuf(m) _http_curl_initbuf((m) TSRMLS_CC)
-static inline void _http_curl_initbuf(http_curlbuf_member member TSRMLS_DC);
-#define http_curl_freebuf(m) _http_curl_freebuf((m) TSRMLS_CC)
-static inline void _http_curl_freebuf(http_curlbuf_member member TSRMLS_DC);
-#define http_curl_sizebuf(m, l) _http_curl_sizebuf((m), (l) TSRMLS_CC)
-static inline void _http_curl_sizebuf(http_curlbuf_member member, size_t len TSRMLS_DC);
-#define http_curl_movebuf(m, d, l) _http_curl_movebuf((m), (d), (l) TSRMLS_CC)
-static inline void _http_curl_movebuf(http_curlbuf_member member, char **data, size_t *data_len TSRMLS_DC);
-#define http_curl_copybuf(m, d, l) _http_curl_copybuf((m), (d), (l) TSRMLS_CC)
-static inline void _http_curl_copybuf(http_curlbuf_member member, char **data, size_t *data_len TSRMLS_DC);
-#define http_curl_setopts(c, u, o) _http_curl_setopts((c), (u), (o) TSRMLS_CC)
-static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *options TSRMLS_DC);
-
-#define http_curl_getopt(o, k) _http_curl_getopt((o), (k) TSRMLS_CC, 0)
-#define http_curl_getopt1(o, k, t1) _http_curl_getopt((o), (k) TSRMLS_CC, 1, (t1))
-#define http_curl_getopt2(o, k, t1, t2) _http_curl_getopt((o), (k) TSRMLS_CC, 2, (t1), (t2))
-static inline zval *_http_curl_getopt(HashTable *options, char *key TSRMLS_DC, int checks, ...);
-
-static size_t http_curl_body_callback(char *, size_t, size_t, void *);
-static size_t http_curl_hdrs_callback(char *, size_t, size_t, void *);
-
-#define http_curl_getinfo(c, h) _http_curl_getinfo((c), (h) TSRMLS_CC)
-static inline void _http_curl_getinfo(CURL *ch, HashTable *info TSRMLS_DC);
-#define http_curl_getinfo_ex(c, i, a) _http_curl_getinfo_ex((c), (i), (a) TSRMLS_CC)
-static inline void _http_curl_getinfo_ex(CURL *ch, CURLINFO i, zval *array TSRMLS_DC);
-#define http_curl_getinfoname(i) _http_curl_getinfoname((i) TSRMLS_CC)
-static inline char *_http_curl_getinfoname(CURLINFO i TSRMLS_DC);
-
-#endif
-/* }}} HAVE_CURL */
-
 /* {{{ static int http_sort_q(const void *, const void *) */
 static int http_sort_q(const void *a, const void *b TSRMLS_DC)
 {
@@ -217,10 +165,10 @@ static STATUS _http_send_chunk(const void *data, const size_t begin,
 			if (php_stream_seek(s, begin, SEEK_SET)) {
 				return FAILURE;
 			}
-			buf = (char *) ecalloc(1, HTTP_BUF_SIZE);
+			buf = (char *) ecalloc(1, HTTP_SENDBUF_SIZE);
 			/* read into buf and write out */
-			while ((len -= HTTP_BUF_SIZE) >= 0) {
-				if (!(read = php_stream_read(s, buf, HTTP_BUF_SIZE))) {
+			while ((len -= HTTP_SENDBUF_SIZE) >= 0) {
+				if (!(read = php_stream_read(s, buf, HTTP_SENDBUF_SIZE))) {
 					efree(buf);
 					return FAILURE;
 				}
@@ -232,7 +180,7 @@ static STATUS _http_send_chunk(const void *data, const size_t begin,
 
 			/* read & write left over */
 			if (len) {
-				if (read = php_stream_read(s, buf, HTTP_BUF_SIZE + len)) {
+				if (read = php_stream_read(s, buf, HTTP_SENDBUF_SIZE + len)) {
 					if (read - php_body_write(buf, read TSRMLS_CC)) {
 						efree(buf);
 						return FAILURE;
@@ -258,487 +206,6 @@ static STATUS _http_send_chunk(const void *data, const size_t begin,
 }
 /* }}} */
 
-/* {{{ HAVE_CURL */
-#ifdef HTTP_HAVE_CURL
-
-/* {{{ static inline void http_curl_initbuf(http_curlbuf_member) */
-static inline void _http_curl_initbuf(http_curlbuf_member member TSRMLS_DC)
-{
-	http_curl_freebuf(member);
-
-	if (member & CURLBUF_HDRS) {
-		HTTP_G(curlbuf).hdrs.data = emalloc(HTTP_CURLBUF_HDRSSIZE);
-		HTTP_G(curlbuf).hdrs.free = HTTP_CURLBUF_HDRSSIZE;
-	}
-	if (member & CURLBUF_BODY) {
-		HTTP_G(curlbuf).body.data = emalloc(HTTP_CURLBUF_BODYSIZE);
-		HTTP_G(curlbuf).body.free = HTTP_CURLBUF_BODYSIZE;
-	}
-}
-/* }}} */
-
-/* {{{ static inline void http_curl_freebuf(http_curlbuf_member) */
-static inline void _http_curl_freebuf(http_curlbuf_member member TSRMLS_DC)
-{
-	if (member & CURLBUF_HDRS) {
-		if (HTTP_G(curlbuf).hdrs.data) {
-			efree(HTTP_G(curlbuf).hdrs.data);
-			HTTP_G(curlbuf).hdrs.data = NULL;
-		}
-		HTTP_G(curlbuf).hdrs.used = 0;
-		HTTP_G(curlbuf).hdrs.free = 0;
-	}
-	if (member & CURLBUF_BODY) {
-		if (HTTP_G(curlbuf).body.data) {
-			efree(HTTP_G(curlbuf).body.data);
-			HTTP_G(curlbuf).body.data = NULL;
-		}
-		HTTP_G(curlbuf).body.used = 0;
-		HTTP_G(curlbuf).body.free = 0;
-	}
-}
-/* }}} */
-
-/* {{{ static inline void http_curl_copybuf(http_curlbuf_member, char **,
-	size_t *) */
-static inline void _http_curl_copybuf(http_curlbuf_member member, char **data,
-	size_t *data_len TSRMLS_DC)
-{
-	*data = NULL;
-	*data_len = 0;
-
-	if ((member & CURLBUF_HDRS) && HTTP_G(curlbuf).hdrs.used) {
-		if ((member & CURLBUF_BODY) && HTTP_G(curlbuf).body.used) {
-			*data = emalloc(HTTP_G(curlbuf).hdrs.used + HTTP_G(curlbuf).body.used + 1);
-		} else {
-			*data = emalloc(HTTP_G(curlbuf).hdrs.used + 1);
-		}
-		memcpy(*data, HTTP_G(curlbuf).hdrs.data, HTTP_G(curlbuf).hdrs.used);
-		*data_len = HTTP_G(curlbuf).hdrs.used;
-	}
-
-	if ((member & CURLBUF_BODY) && HTTP_G(curlbuf).body.used) {
-		if (*data) {
-			memcpy((*data) + HTTP_G(curlbuf).hdrs.used,
-				HTTP_G(curlbuf).body.data, HTTP_G(curlbuf).body.used);
-			*data_len = HTTP_G(curlbuf).hdrs.used + HTTP_G(curlbuf).body.used;
-		} else {
-			emalloc(HTTP_G(curlbuf).body.used + 1);
-			memcpy(*data, HTTP_G(curlbuf).body.data, HTTP_G(curlbuf).body.used);
-			*data_len = HTTP_G(curlbuf).body.used;
-		}
-	}
-	if (*data) {
-		(*data)[*data_len] = 0;
-	} else {
-		*data = "";
-	}
-}
-/* }}} */
-
-/* {{{ static inline void http_curl_movebuf(http_curlbuf_member, char **,
-	size_t *) */
-static inline void _http_curl_movebuf(http_curlbuf_member member, char **data,
-	size_t *data_len TSRMLS_DC)
-{
-	http_curl_copybuf(member, data, data_len);
-	http_curl_freebuf(member);
-}
-/* }}} */
-
-/* {{{ static size_t http_curl_body_callback(char *, size_t, size_t, void *) */
-static size_t http_curl_body_callback(char *buf, size_t len, size_t n, void *s)
-{
-	TSRMLS_FETCH();
-
-	if ((len *= n) > HTTP_G(curlbuf).body.free) {
-		size_t bsize = HTTP_CURLBUF_BODYSIZE;
-		while (bsize < len) {
-			bsize *= 2;
-		}
-		HTTP_G(curlbuf).body.data = erealloc(HTTP_G(curlbuf).body.data,
-			HTTP_G(curlbuf).body.used + bsize);
-		HTTP_G(curlbuf).body.free += bsize;
-	}
-
-	memcpy(HTTP_G(curlbuf).body.data + HTTP_G(curlbuf).body.used, buf, len);
-	HTTP_G(curlbuf).body.free -= len;
-	HTTP_G(curlbuf).body.used += len;
-
-	return len;
-}
-/* }}} */
-
-/* {{{ static size_t http_curl_hdrs_callback(char*, size_t, size_t, void *) */
-static size_t http_curl_hdrs_callback(char *buf, size_t len, size_t n, void *s)
-{
-	TSRMLS_FETCH();
-
-	/* discard previous headers */
-	if ((HTTP_G(curlbuf).hdrs.used) && (!strncmp(buf, "HTTP/1.", strlen("HTTP/1.")))) {
-		http_curl_initbuf(CURLBUF_HDRS);
-	}
-
-	if ((len *= n) > HTTP_G(curlbuf).hdrs.free) {
-		size_t bsize = HTTP_CURLBUF_HDRSSIZE;
-		while (bsize < len) {
-			bsize *= 2;
-		}
-		HTTP_G(curlbuf).hdrs.data = erealloc(HTTP_G(curlbuf).hdrs.data,
-			HTTP_G(curlbuf).hdrs.used + bsize);
-		HTTP_G(curlbuf).hdrs.free += bsize;
-	}
-
-	memcpy(HTTP_G(curlbuf).hdrs.data + HTTP_G(curlbuf).hdrs.used, buf, len);
-	HTTP_G(curlbuf).hdrs.free -= len;
-	HTTP_G(curlbuf).hdrs.used += len;
-
-	return len;
-}
-/* }}} */
-
-/* {{{ static inline zval *http_curl_getopt(HashTable *, char *, int, ...) */
-static inline zval *_http_curl_getopt(HashTable *options, char *key TSRMLS_DC, int checks, ...)
-{
-	zval **zoption;
-	va_list types;
-	int i;
-
-	if (SUCCESS != zend_hash_find(options, key, strlen(key) + 1, (void **) &zoption)) {
-		return NULL;
-	}
-	if (checks < 1) {
-		return *zoption;
-	}
-
-	va_start(types, checks);
-	for (i = 0; i < checks; ++i) {
-		if ((va_arg(types, int)) == (Z_TYPE_PP(zoption))) {
-			va_end(types);
-			return *zoption;
-		}
-	}
-	va_end(types);
-	return NULL;
-}
-/* }}} */
-
-/* {{{ static inline void http_curl_setopts(CURL *, char *, HashTable *) */
-static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *options TSRMLS_DC)
-{
-	zval *zoption;
-
-	/* standard options */
-	curl_easy_setopt(ch, CURLOPT_URL, url);
-	curl_easy_setopt(ch, CURLOPT_HEADER, 0);
-	curl_easy_setopt(ch, CURLOPT_NOPROGRESS, 1);
-	curl_easy_setopt(ch, CURLOPT_AUTOREFERER, 1);
-	curl_easy_setopt(ch, CURLOPT_WRITEFUNCTION, http_curl_body_callback);
-	curl_easy_setopt(ch, CURLOPT_HEADERFUNCTION, http_curl_hdrs_callback);
-#if defined(ZTS) && (LIBCURL_VERSION_NUM >= 0x070a00)
-	curl_easy_setopt(ch, CURLOPT_NOSIGNAL, 1);
-#endif
-
-	if ((!options) || (1 > zend_hash_num_elements(options))) {
-		return;
-	}
-
-	/* redirects, defaults to 0 */
-	if (zoption = http_curl_getopt1(options, "redirect", IS_LONG)) {
-		curl_easy_setopt(ch, CURLOPT_FOLLOWLOCATION, Z_LVAL_P(zoption) ? 1 : 0);
-		curl_easy_setopt(ch, CURLOPT_MAXREDIRS, Z_LVAL_P(zoption));
-		if (zoption = http_curl_getopt2(options, "unrestrictedauth", IS_LONG, IS_BOOL)) {
-			curl_easy_setopt(ch, CURLOPT_UNRESTRICTED_AUTH, Z_LVAL_P(zoption));
-		}
-	} else {
-		curl_easy_setopt(ch, CURLOPT_FOLLOWLOCATION, 0);
-	}
-
-	/* proxy */
-	if (zoption = http_curl_getopt1(options, "proxyhost", IS_STRING)) {
-		curl_easy_setopt(ch, CURLOPT_PROXY, Z_STRVAL_P(zoption));
-		/* port */
-		if (zoption = http_curl_getopt1(options, "proxyport", IS_LONG)) {
-			curl_easy_setopt(ch, CURLOPT_PROXYPORT, Z_LVAL_P(zoption));
-		}
-		/* user:pass */
-		if (zoption = http_curl_getopt1(options, "proxyauth", IS_STRING)) {
-			curl_easy_setopt(ch, CURLOPT_PROXYUSERPWD, Z_STRVAL_P(zoption));
-		}
-#if LIBCURL_VERSION_NUM > 0x070a06
-		/* auth method */
-		if (zoption = http_curl_getopt1(options, "proxyauthtype", IS_LONG)) {
-			curl_easy_setopt(ch, CURLOPT_PROXYAUTH, Z_LVAL_P(zoption));
-		}
-#endif
-	}
-
-	/* auth */
-	if (zoption = http_curl_getopt1(options, "httpauth", IS_STRING)) {
-		curl_easy_setopt(ch, CURLOPT_USERPWD, Z_STRVAL_P(zoption));
-	}
-#if LIBCURL_VERSION_NUM > 0x070a05
-	if (zoption = http_curl_getopt1(options, "httpauthtype", IS_LONG)) {
-		curl_easy_setopt(ch, CURLOPT_HTTPAUTH, Z_LVAL_P(zoption));
-	}
-#endif
-
-	/* compress, enabled by default (empty string enables deflate and gzip) */
-	if (zoption = http_curl_getopt2(options, "compress", IS_LONG, IS_BOOL)) {
-		if (Z_LVAL_P(zoption)) {
-			curl_easy_setopt(ch, CURLOPT_ENCODING, "");
-		}
-	} else {
-		curl_easy_setopt(ch, CURLOPT_ENCODING, "");
-	}
-
-	/* another port */
-	if (zoption = http_curl_getopt1(options, "port", IS_LONG)) {
-		curl_easy_setopt(ch, CURLOPT_PORT, Z_LVAL_P(zoption));
-	}
-
-	/* referer */
-	if (zoption = http_curl_getopt1(options, "referer", IS_STRING)) {
-		curl_easy_setopt(ch, CURLOPT_REFERER, Z_STRVAL_P(zoption));
-	}
-
-	/* useragent, default "PECL::HTTP/version (PHP/version)" */
-	if (zoption = http_curl_getopt1(options, "useragent", IS_STRING)) {
-		curl_easy_setopt(ch, CURLOPT_USERAGENT, Z_STRVAL_P(zoption));
-	} else {
-		curl_easy_setopt(ch, CURLOPT_USERAGENT,
-			"PECL::HTTP/" PHP_EXT_HTTP_VERSION " (PHP/" PHP_VERSION ")");
-	}
-
-	/* cookies, array('name' => 'value') */
-	if (zoption = http_curl_getopt1(options, "cookies", IS_ARRAY)) {
-		char *cookie_key;
-		zval **cookie_val;
-		int key_type;
-		smart_str qstr = {0};
-
-		zend_hash_internal_pointer_reset(Z_ARRVAL_P(zoption));
-		while (HASH_KEY_NON_EXISTANT != (key_type = zend_hash_get_current_key_type(Z_ARRVAL_P(zoption)))) {
-			if (key_type == HASH_KEY_IS_STRING) {
-				zend_hash_get_current_key(Z_ARRVAL_P(zoption), &cookie_key, NULL, 0);
-				zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &cookie_val);
-				smart_str_appends(&qstr, cookie_key);
-				smart_str_appendl(&qstr, "=", 1);
-				smart_str_appendl(&qstr, Z_STRVAL_PP(cookie_val), Z_STRLEN_PP(cookie_val));
-				smart_str_appendl(&qstr, "; ", 2);
-				zend_hash_move_forward(Z_ARRVAL_P(zoption));
-			}
-		}
-		smart_str_0(&qstr);
-
-		if (qstr.c) {
-			curl_easy_setopt(ch, CURLOPT_COOKIE, qstr.c);
-			/* FIXXXME: mem-leak */
-		}
-	}
-
-	/* cookiestore */
-	if (zoption = http_curl_getopt1(options, "cookiestore", IS_STRING)) {
-		curl_easy_setopt(ch, CURLOPT_COOKIEFILE, Z_STRVAL_P(zoption));
-		curl_easy_setopt(ch, CURLOPT_COOKIEJAR, Z_STRVAL_P(zoption));
-	}
-
-	/* additional headers, array('name' => 'value') */
-	if (zoption = http_curl_getopt1(options, "headers", IS_ARRAY)) {
-		int key_type;
-		char *header_key, header[1024] = {0};
-		zval **header_val;
-		struct curl_slist *headers = NULL;
-
-		zend_hash_internal_pointer_reset(Z_ARRVAL_P(zoption));
-		while (HASH_KEY_NON_EXISTANT != (key_type = zend_hash_get_current_key_type(Z_ARRVAL_P(zoption)))) {
-			if (key_type == HASH_KEY_IS_STRING) {
-				zend_hash_get_current_key(Z_ARRVAL_P(zoption), &header_key, NULL, 0);
-				zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &header_val);
-				snprintf(header, 1023, "%s: %s", header_key, Z_STRVAL_PP(header_val));
-				headers = curl_slist_append(headers, header);
-				zend_hash_move_forward(Z_ARRVAL_P(zoption));
-			}
-		}
-		if (headers) {
-			curl_easy_setopt(ch, CURLOPT_HTTPHEADER, headers);
-		}
-	}
-}
-/* }}} */
-
-/* {{{ static inline char *http_curl_getinfoname(CURLINFO) */
-static inline char *_http_curl_getinfoname(CURLINFO i TSRMLS_DC)
-{
-#define CASE(I) case CURLINFO_ ##I : { static char I[] = #I; return pretty_key(I, sizeof(#I)-1, 0, 0); }
-	switch (i)
-	{
-		/* CURLINFO_EFFECTIVE_URL			=	CURLINFO_STRING	+1, */
-		CASE(EFFECTIVE_URL);
-		/* CURLINFO_RESPONSE_CODE			=	CURLINFO_LONG	+2, */
-#if LIBCURL_VERSION_NUM > 0x070a06
-		CASE(RESPONSE_CODE);
-#else
-		CASE(HTTP_CODE);
-#endif
-		/* CURLINFO_TOTAL_TIME				=	CURLINFO_DOUBLE	+3, */
-		CASE(TOTAL_TIME);
-		/* CURLINFO_NAMELOOKUP_TIME			=	CURLINFO_DOUBLE	+4, */
-		CASE(NAMELOOKUP_TIME);
-		/* CURLINFO_CONNECT_TIME			=	CURLINFO_DOUBLE	+5, */
-		CASE(CONNECT_TIME);
-		/* CURLINFO_PRETRANSFER_TIME		=	CURLINFO_DOUBLE	+6, */
-		CASE(PRETRANSFER_TIME);
-		/* CURLINFO_SIZE_UPLOAD				=	CURLINFO_DOUBLE	+7, */
-		CASE(SIZE_UPLOAD);
-		/* CURLINFO_SIZE_DOWNLOAD			=	CURLINFO_DOUBLE	+8, */
-		CASE(SIZE_DOWNLOAD);
-		/* CURLINFO_SPEED_DOWNLOAD			=	CURLINFO_DOUBLE	+9, */
-		CASE(SPEED_DOWNLOAD);
-		/* CURLINFO_SPEED_UPLOAD			=	CURLINFO_DOUBLE	+10, */
-		CASE(SPEED_UPLOAD);
-		/* CURLINFO_HEADER_SIZE				=	CURLINFO_LONG	+11, */
-		CASE(HEADER_SIZE);
-		/* CURLINFO_REQUEST_SIZE			=	CURLINFO_LONG	+12, */
-		CASE(REQUEST_SIZE);
-		/* CURLINFO_SSL_VERIFYRESULT		=	CURLINFO_LONG	+13, */
-		CASE(SSL_VERIFYRESULT);
-		/* CURLINFO_FILETIME				=	CURLINFO_LONG	+14, */
-		CASE(FILETIME);
-		/* CURLINFO_CONTENT_LENGTH_DOWNLOAD	=	CURLINFO_DOUBLE	+15, */
-		CASE(CONTENT_LENGTH_DOWNLOAD);
-		/* CURLINFO_CONTENT_LENGTH_UPLOAD	=	CURLINFO_DOUBLE	+16, */
-		CASE(CONTENT_LENGTH_UPLOAD);
-		/* CURLINFO_STARTTRANSFER_TIME		=	CURLINFO_DOUBLE	+17, */
-		CASE(STARTTRANSFER_TIME);
-		/* CURLINFO_CONTENT_TYPE			=	CURLINFO_STRING	+18, */
-		CASE(CONTENT_TYPE);
-		/* CURLINFO_REDIRECT_TIME			=	CURLINFO_DOUBLE	+19, */
-		CASE(REDIRECT_TIME);
-		/* CURLINFO_REDIRECT_COUNT			=	CURLINFO_LONG	+20, */
-		CASE(REDIRECT_COUNT);
-		/* CURLINFO_PRIVATE					=	CURLINFO_STRING	+21, * (mike) /
-		CASE(PRIVATE);
-		/* CURLINFO_HTTP_CONNECTCODE		=	CURLINFO_LONG	+22, */
-		CASE(HTTP_CONNECTCODE);
-#if LIBCURL_VERSION_NUM > 0x070a07
-		/* CURLINFO_HTTPAUTH_AVAIL			=	CURLINFO_LONG	+23, */
-		CASE(HTTPAUTH_AVAIL);
-		/* CURLINFO_PROXYAUTH_AVAIL			=	CURLINFO_LONG	+24, */
-		CASE(PROXYAUTH_AVAIL);
-#endif
-	}
-#undef CASE
-	return NULL;
-}
-/* }}} */
-
-/* {{{ static inline void http_curl_getinfo_ex(CURL, CURLINFO, zval *) */
-static inline void _http_curl_getinfo_ex(CURL *ch, CURLINFO i, zval *array TSRMLS_DC)
-{
-	char *key;
-	if (key = http_curl_getinfoname(i)) {
-		switch (i & ~CURLINFO_MASK)
-		{
-			case CURLINFO_STRING:
-			{
-				char *c;
-				if (CURLE_OK == curl_easy_getinfo(ch, i, &c)) {
-					add_assoc_string(array, key, c ? c : "", 1);
-				}
-			}
-			break;
-
-			case CURLINFO_DOUBLE:
-			{
-				double d;
-				if (CURLE_OK == curl_easy_getinfo(ch, i, &d)) {
-					add_assoc_double(array, key, d);
-				}
-			}
-			break;
-
-			case CURLINFO_LONG:
-			{
-				long l;
-				if (CURLE_OK == curl_easy_getinfo(ch, i, &l)) {
-					add_assoc_long(array, key, l);
-				}
-			}
-			break;
-		}
-	}
-}
-/* }}} */
-
-/* {{{ static inline http_curl_getinfo(CURL, HashTable *) */
-static inline void _http_curl_getinfo(CURL *ch, HashTable *info TSRMLS_DC)
-{
-	zval array;
-	Z_ARRVAL(array) = info;
-
-#define INFO(I) http_curl_getinfo_ex(ch, CURLINFO_ ##I , &array)
-	/* CURLINFO_EFFECTIVE_URL			=	CURLINFO_STRING	+1, */
-	INFO(EFFECTIVE_URL);
-#if LIBCURL_VERSION_NUM > 0x070a06
-	/* CURLINFO_RESPONSE_CODE			=	CURLINFO_LONG	+2, */
-	INFO(RESPONSE_CODE);
-#else
-	INFO(HTTP_CODE);
-#endif
-	/* CURLINFO_TOTAL_TIME				=	CURLINFO_DOUBLE	+3, */
-	INFO(TOTAL_TIME);
-	/* CURLINFO_NAMELOOKUP_TIME			=	CURLINFO_DOUBLE	+4, */
-	INFO(NAMELOOKUP_TIME);
-	/* CURLINFO_CONNECT_TIME			=	CURLINFO_DOUBLE	+5, */
-	INFO(CONNECT_TIME);
-	/* CURLINFO_PRETRANSFER_TIME		=	CURLINFO_DOUBLE	+6, */
-	INFO(PRETRANSFER_TIME);
-	/* CURLINFO_SIZE_UPLOAD				=	CURLINFO_DOUBLE	+7, */
-	INFO(SIZE_UPLOAD);
-	/* CURLINFO_SIZE_DOWNLOAD			=	CURLINFO_DOUBLE	+8, */
-	INFO(SIZE_DOWNLOAD);
-	/* CURLINFO_SPEED_DOWNLOAD			=	CURLINFO_DOUBLE	+9, */
-	INFO(SPEED_DOWNLOAD);
-	/* CURLINFO_SPEED_UPLOAD			=	CURLINFO_DOUBLE	+10, */
-	INFO(SPEED_UPLOAD);
-	/* CURLINFO_HEADER_SIZE				=	CURLINFO_LONG	+11, */
-	INFO(HEADER_SIZE);
-	/* CURLINFO_REQUEST_SIZE			=	CURLINFO_LONG	+12, */
-	INFO(REQUEST_SIZE);
-	/* CURLINFO_SSL_VERIFYRESULT		=	CURLINFO_LONG	+13, */
-	INFO(SSL_VERIFYRESULT);
-	/* CURLINFO_FILETIME				=	CURLINFO_LONG	+14, */
-	INFO(FILETIME);
-	/* CURLINFO_CONTENT_LENGTH_DOWNLOAD	=	CURLINFO_DOUBLE	+15, */
-	INFO(CONTENT_LENGTH_DOWNLOAD);
-	/* CURLINFO_CONTENT_LENGTH_UPLOAD	=	CURLINFO_DOUBLE	+16, */
-	INFO(CONTENT_LENGTH_UPLOAD);
-	/* CURLINFO_STARTTRANSFER_TIME		=	CURLINFO_DOUBLE	+17, */
-	INFO(STARTTRANSFER_TIME);
-	/* CURLINFO_CONTENT_TYPE			=	CURLINFO_STRING	+18, */
-	INFO(CONTENT_TYPE);
-	/* CURLINFO_REDIRECT_TIME			=	CURLINFO_DOUBLE	+19, */
-	INFO(REDIRECT_TIME);
-	/* CURLINFO_REDIRECT_COUNT			=	CURLINFO_LONG	+20, */
-	INFO(REDIRECT_COUNT);
-	/* CURLINFO_PRIVATE					=	CURLINFO_STRING	+21, */
-	INFO(PRIVATE);
-	/* CURLINFO_HTTP_CONNECTCODE		=	CURLINFO_LONG	+22, */
-	INFO(HTTP_CONNECTCODE);
-#if LIBCURL_VERSION_NUM > 0x070a07
-	/* CURLINFO_HTTPAUTH_AVAIL			=	CURLINFO_LONG	+23, */
-	INFO(HTTPAUTH_AVAIL);
-	/* CURLINFO_PROXYAUTH_AVAIL			=	CURLINFO_LONG	+24, */
-	INFO(PROXYAUTH_AVAIL);
-#endif
-#undef INFO
-}
-/* }}} */
-
-#endif
-/* }}} HAVE_CURL */
-
 /* {{{ Day/Month/TZ checks for http_parse_date()
 	Originally by libcurl, Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al. */
 static int check_day(char *day, size_t len)
@@ -784,8 +251,8 @@ static int check_tzone(char *tzone)
 }
 /* }}} */
 
-/* static char *pretty_key(char *, int, int, int) */
-static char *pretty_key(char *key, int key_len, int uctitle, int xhyphen)
+/* char *pretty_key(char *, int, int, int) */
+char *pretty_key(char *key, int key_len, int uctitle, int xhyphen)
 {
 	if (key && key_len) {
 		int i, wasalpha;
@@ -1014,8 +481,8 @@ PHP_HTTP_API time_t _http_parse_date(const char *date)
 }
 /* }}} */
 
-/* {{{ inline char *http_etag(void *, size_t, http_send_mode) */
-PHP_HTTP_API inline char *_http_etag(const void *data_ptr, const size_t data_len,
+/* {{{ char *http_etag(void *, size_t, http_send_mode) */
+PHP_HTTP_API char *_http_etag(const void *data_ptr, const size_t data_len,
 	const http_send_mode data_mode TSRMLS_DC)
 {
 	char ssb_buf[128] = {0};
@@ -1058,8 +525,8 @@ PHP_HTTP_API inline char *_http_etag(const void *data_ptr, const size_t data_len
 }
 /* }}} */
 
-/* {{{ inline http_lmod(void *, http_send_mode) */
-PHP_HTTP_API inline time_t _http_lmod(const void *data_ptr, const http_send_mode data_mode TSRMLS_DC)
+/* {{{ time_t http_lmod(void *, http_send_mode) */
+PHP_HTTP_API time_t _http_lmod(const void *data_ptr, const http_send_mode data_mode TSRMLS_DC)
 {
 	switch (data_mode)
 	{
@@ -1091,39 +558,39 @@ PHP_HTTP_API inline time_t _http_lmod(const void *data_ptr, const http_send_mode
 }
 /* }}} */
 
-/* {{{inline int http_is_range_request(void) */
-PHP_HTTP_API inline int _http_is_range_request(TSRMLS_D)
+/* {{{ int http_is_range_request(void) */
+PHP_HTTP_API int _http_is_range_request(TSRMLS_D)
 {
 	return zend_hash_exists(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER]),
-		"HTTP_RANGE", strlen("HTTP_RANGE") + 1);
+		"HTTP_RANGE", sizeof("HTTP_RANGE"));
 }
 /* }}} */
 
-/* {{{ inline STATUS http_send_status(int) */
-PHP_HTTP_API inline STATUS _http_send_status(const int status TSRMLS_DC)
+/* {{{ STATUS http_send_status(int) */
+PHP_HTTP_API STATUS _http_send_status(const int status TSRMLS_DC)
 {
 	int s = status;
 	return sapi_header_op(SAPI_HEADER_SET_STATUS, (void *) s TSRMLS_CC);
 }
 /* }}} */
 
-/* {{{ inline STATUS http_send_header(char *) */
-PHP_HTTP_API inline STATUS _http_send_header(const char *header TSRMLS_DC)
+/* {{{ STATUS http_send_header(char *) */
+PHP_HTTP_API STATUS _http_send_header(const char *header TSRMLS_DC)
 {
 	return http_send_status_header(0, header);
 }
 /* }}} */
 
-/* {{{ inline STATUS http_send_status_header(int, char *) */
-PHP_HTTP_API inline STATUS _http_send_status_header(const int status, const char *header TSRMLS_DC)
+/* {{{ STATUS http_send_status_header(int, char *) */
+PHP_HTTP_API STATUS _http_send_status_header(const int status, const char *header TSRMLS_DC)
 {
 	sapi_header_line h = {(char *) header, strlen(header), status};
 	return sapi_header_op(SAPI_HEADER_REPLACE, &h TSRMLS_CC);
 }
 /* }}} */
 
-/* {{{ inline zval *http_get_server_var(char *) */
-PHP_HTTP_API inline zval *_http_get_server_var(const char *key TSRMLS_DC)
+/* {{{ zval *http_get_server_var(char *) */
+PHP_HTTP_API zval *_http_get_server_var(const char *key TSRMLS_DC)
 {
 	zval **var;
 	if (SUCCESS == zend_hash_find(
@@ -1481,7 +948,7 @@ PHP_HTTP_API char *_http_absolute_uri(const char *url,
 	if ((PTR = strchr(URI, '\r')) || (PTR = strchr(URI, '\n'))) {
 		PTR = 0;
 	}
-	
+
 	return URI;
 }
 /* }}} */
@@ -1526,10 +993,7 @@ PHP_HTTP_API char *_http_negotiate_q(const char *entry, const zval *supported,
 		}
 
 		/* walk through the supported array */
-		for (	zend_hash_internal_pointer_reset(Z_ARRVAL_P(supported));
-				SUCCESS == zend_hash_get_current_data(
-					Z_ARRVAL_P(supported), (void **) &zsupp);
-				zend_hash_move_forward(Z_ARRVAL_P(supported))) {
+		FOREACH_VAL(supported, zsupp) {
 			if (!strcasecmp(Z_STRVAL_PP(zsupp), Z_STRVAL_PP(zentry))) {
 				add_assoc_double(zentries, Z_STRVAL_PP(zsupp), qual);
 				break;
@@ -1567,13 +1031,13 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(zval *zranges,
 	HTTP_GSC(zrange, "HTTP_RANGE", RANGE_NO);
 	range = Z_STRVAL_P(zrange);
 
-	if (strncmp(range, "bytes=", strlen("bytes="))) {
+	if (strncmp(range, "bytes=", sizeof("bytes=") - 1)) {
 		php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Range header misses bytes=");
 		return RANGE_NO;
 	}
 
 	ptr = &begin;
-	range += strlen("bytes=");
+	range += sizeof("bytes=") - 1;
 
 	do {
 		switch (c = *(range++))
@@ -1962,7 +1426,7 @@ PHP_HTTP_API STATUS _http_split_response_ex( char *response,
 	char *body = NULL;
 	char *header = response;
 
-	while ((response - header + 4) < response_len) {
+	while (0 < (response_len - (response - header + 4))) {
 		if (	(*response++ == '\r') &&
 				(*response++ == '\n') &&
 				(*response++ == '\r') &&
@@ -1995,8 +1459,8 @@ PHP_HTTP_API STATUS _http_parse_headers(char *header, int header_len, zval *arra
 	if (!strncmp(header, "HTTP/1.", 7)) {
 		char *end = strstr(header, HTTP_CRLF);
 		add_assoc_stringl(array, "Status",
-			header + strlen("HTTP/1.x "),
-			end - (header + strlen("HTTP/1.x ")), 1);
+			header + sizeof("HTTP/1.x ") - 1,
+			end - (header + sizeof("HTTP/1.x ") - 1), 1);
 		header = end + 2;
 	}
 
@@ -2051,12 +1515,11 @@ PHP_HTTP_API STATUS _http_parse_headers(char *header, int header_len, zval *arra
 /* {{{ void http_get_request_headers(zval *) */
 PHP_HTTP_API void _http_get_request_headers(zval *array TSRMLS_DC)
 {
-    char *key;
+    char *key = NULL;
+    long idx = 0;
 
-    for (   zend_hash_internal_pointer_reset(HTTP_SERVER_VARS);
-            zend_hash_get_current_key(HTTP_SERVER_VARS, &key, NULL, 0) != HASH_KEY_NON_EXISTANT;
-            zend_hash_move_forward(HTTP_SERVER_VARS)) {
-        if (!strncmp(key, "HTTP_", 5)) {
+    FOREACH_HASH_KEY(HTTP_SERVER_VARS, key, idx) {
+        if (key && !strncmp(key, "HTTP_", 5)) {
             zval **header;
             zend_hash_get_current_data(HTTP_SERVER_VARS, (void **) &header);
             add_assoc_stringl(array, pretty_key(key + 5, strlen(key) - 5, 1, 1), Z_STRVAL_PP(header), Z_STRLEN_PP(header), 1);
@@ -2065,186 +1528,47 @@ PHP_HTTP_API void _http_get_request_headers(zval *array TSRMLS_DC)
 }
 /* }}} */
 
-/* {{{ HAVE_CURL */
-#ifdef HTTP_HAVE_CURL
-
-/* {{{ STATUS http_get(char *, HashTable *, HashTable *, char **, size_t *) */
-PHP_HTTP_API STATUS _http_get(const char *URL, HashTable *options,
-	HashTable *info, char **data, size_t *data_len TSRMLS_DC)
+/* {{{ STATUS http_urlencode_hash_ex(HashTable *, int, char **, size_t *) */
+PHP_HTTP_API STATUS _http_urlencode_hash_ex(HashTable *hash, int override_argsep,
+	char *pre_encoded_data, size_t pre_encoded_len,
+	char **encoded_data, size_t *encoded_len TSRMLS_DC)
 {
-	STATUS rs;
-	CURL *ch = curl_easy_init();
+	smart_str qstr = {0};
 
-	if (!ch) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize curl");
-		return FAILURE;
+	if (override_argsep) {
+		HTTP_URL_ARGSEP_OVERRIDE;
 	}
 
-	rs = http_get_ex(ch, URL, options, info, data, data_len);
-	curl_easy_cleanup(ch);
-	return rs;
-}
-/* }}} */
-
-/* {{{ STATUS http_get_ex(CURL *, char *, HashTable *, HashTable *, char **, size_t *) */
-PHP_HTTP_API STATUS _http_get_ex(CURL *ch, const char *URL, HashTable *options,
-	HashTable *info, char **data, size_t *data_len TSRMLS_DC)
-{
-	http_curl_initbuf(CURLBUF_EVRY);
-	http_curl_setopts(ch, URL, options);
-	curl_easy_setopt(ch, CURLOPT_NOBODY, 0);
-	curl_easy_setopt(ch, CURLOPT_POST, 0);
-
-	if (CURLE_OK != curl_easy_perform(ch)) {
-		http_curl_freebuf(CURLBUF_EVRY);
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
-		return FAILURE;
-	}
-	if (info) {
-		http_curl_getinfo(ch, info);
+	if (pre_encoded_len && pre_encoded_data) {
+		smart_str_appendl(&qstr, pre_encoded_data, pre_encoded_len);
 	}
-	http_curl_movebuf(CURLBUF_EVRY, data, data_len);
-	return SUCCESS;
-}
 
-/* {{{ STATUS http_head(char *, HashTable *, HashTable *, char **data, size_t *) */
-PHP_HTTP_API STATUS _http_head(const char *URL, HashTable *options,
-	HashTable *info, char **data, size_t *data_len TSRMLS_DC)
-{
-	STATUS rs;
-	CURL *ch = curl_easy_init();
-
-	if (!ch) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize curl");
+	if (SUCCESS != php_url_encode_hash_ex(hash, &qstr, NULL, 0, NULL, 0, NULL, 0, NULL TSRMLS_CC)) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't encode query data");
+		if (qstr.c) {
+			efree(qstr.c);
+		}
+		if (override_argsep) {
+			HTTP_URL_ARGSEP_RESTORE;
+		}
 		return FAILURE;
 	}
 
-	rs = http_head_ex(ch, URL, options, info, data, data_len);
-	curl_easy_cleanup(ch);
-	return rs;
-}
-/* }}} */
-
-/* {{{ STATUS http_head_ex(CURL *, char *, HashTable *, HashTable *, char **data, size_t *) */
-PHP_HTTP_API STATUS _http_head_ex(CURL *ch, const char *URL, HashTable *options,
-	HashTable *info, char **data, size_t *data_len TSRMLS_DC)
-{
-	http_curl_initbuf(CURLBUF_HDRS);
-	http_curl_setopts(ch, URL, options);
-	curl_easy_setopt(ch, CURLOPT_NOBODY, 1);
-	curl_easy_setopt(ch, CURLOPT_POST, 0);
-
-	if (CURLE_OK != curl_easy_perform(ch)) {
-		http_curl_freebuf(CURLBUF_HDRS);
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
-		return FAILURE;
-	}
-	if (info) {
-		http_curl_getinfo(ch, info);
+	if (override_argsep) {
+		HTTP_URL_ARGSEP_RESTORE;
 	}
-	http_curl_movebuf(CURLBUF_HDRS, data, data_len);
-	return SUCCESS;
-}
 
-/* {{{ STATUS http_post_data(char *, char *, size_t, HashTable *, HashTable *, char **, size_t *) */
-PHP_HTTP_API STATUS _http_post_data(const char *URL, char *postdata,
-	size_t postdata_len, HashTable *options, HashTable *info, char **data,
-	size_t *data_len TSRMLS_DC)
-{
-	STATUS rs;
-	CURL *ch = curl_easy_init();
+	smart_str_0(&qstr);
 
-	if (!ch) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize curl");
-		return FAILURE;
+	*encoded_data = qstr.c;
+	if (encoded_len) {
+		*encoded_len  = qstr.len;
 	}
-	rs = http_post_data_ex(ch, URL, postdata, postdata_len, options, info, data, data_len);
-	curl_easy_cleanup(ch);
-	return rs;
-}
-/* }}} */
 
-/* {{{ STATUS http_post_data_ex(CURL *, char *, char *, size_t, HashTable *, HashTable *, char **, size_t *) */
-PHP_HTTP_API STATUS _http_post_data_ex(CURL *ch, const char *URL, char *postdata,
-	size_t postdata_len, HashTable *options, HashTable *info, char **data,
-	size_t *data_len TSRMLS_DC)
-{
-	http_curl_initbuf(CURLBUF_EVRY);
-	http_curl_setopts(ch, URL, options);
-	curl_easy_setopt(ch, CURLOPT_POST, 1);
-	curl_easy_setopt(ch, CURLOPT_POSTFIELDS, postdata);
-	curl_easy_setopt(ch, CURLOPT_POSTFIELDSIZE, postdata_len);
-
-	if (CURLE_OK != curl_easy_perform(ch)) {
-		http_curl_freebuf(CURLBUF_EVRY);
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
-		return FAILURE;
-	}
-	if (info) {
-		http_curl_getinfo(ch, info);
-	}
-	http_curl_movebuf(CURLBUF_EVRY, data, data_len);
 	return SUCCESS;
 }
 /* }}} */
 
-/* {{{ STATUS http_post_array_ex(CURL *, char *, HashTable *, HashTable *, HashTable *, char **, size_t *) */
-PHP_HTTP_API STATUS _http_post_array_ex(CURL *ch, const char *URL, HashTable *postarray,
-	HashTable *options, HashTable *info, char **data, size_t *data_len TSRMLS_DC)
-{
-	smart_str qstr = {0};
-	STATUS status;
-
-	HTTP_URL_ARGSEP_OVERRIDE;
-	if (php_url_encode_hash_ex(postarray, &qstr, NULL,0,NULL,0,NULL,0,NULL TSRMLS_CC) != SUCCESS) {
-		if (qstr.c) {
-			efree(qstr.c);
-		}
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not encode post data");
-		HTTP_URL_ARGSEP_RESTORE;
-		return FAILURE;
-	}
-	smart_str_0(&qstr);
-	HTTP_URL_ARGSEP_RESTORE;
-
-	if (ch) {
-		status = http_post_data_ex(ch, URL, qstr.c, qstr.len, options, info, data, data_len);
-	} else {
-		status = http_post_data(URL, qstr.c, qstr.len, options, info, data, data_len);
-	}
-	
-	if (qstr.c) {
-		efree(qstr.c);
-	}
-	return status;
-}
-/* }}} */
-
-/* {{{ STATUS http_post_curldata_ex(CURL *, char *, curl_httppost *, HashTable *, HashTable *, char **, size_t *) */
-PHP_HTTP_API STATUS _http_post_curldata_ex(CURL *ch, const char *URL, 
-	struct curl_httppost *curldata,	HashTable *options, HashTable *info, 
-	char **data, size_t *data_len TSRMLS_DC)
-{
-	http_curl_initbuf(CURLBUF_EVRY);
-	http_curl_setopts(ch, URL, options);
-	curl_easy_setopt(ch, CURLOPT_POST, 1);
-	curl_easy_setopt(ch, CURLOPT_HTTPPOST, curldata);
-
-	if (CURLE_OK != curl_easy_perform(ch)) {
-		http_curl_freebuf(CURLBUF_EVRY);
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
-		return FAILURE;
-	}
-	if (info) {
-		http_curl_getinfo(ch, info);
-	}
-	http_curl_movebuf(CURLBUF_EVRY, data, data_len);
-	return SUCCESS;}
-/* }}} */
-
-#endif
-/* }}} HAVE_CURL */
-
 /* {{{ STATUS http_auth_header(char *, char*) */
 PHP_HTTP_API STATUS _http_auth_header(const char *type, const char *realm TSRMLS_DC)
 {
@@ -2289,6 +1613,170 @@ PHP_HTTP_API STATUS _http_auth_credentials(char **user, char **pass TSRMLS_DC)
 }
 /* }}} */
 
+#ifndef ZEND_ENGINE_2
+/* {{{ php_url_encode_hash
+	Author: Sarah Golemon <pollita@php.net> */
+PHP_HTTP_API STATUS php_url_encode_hash_ex(HashTable *ht, smart_str *formstr,
+				const char *num_prefix, int num_prefix_len,
+				const char *key_prefix, int key_prefix_len,
+				const char *key_suffix, int key_suffix_len,
+				zval *type TSRMLS_DC)
+{
+	char *arg_sep = NULL, *key = NULL, *ekey, *newprefix, *p;
+	int arg_sep_len, key_len, ekey_len, key_type, newprefix_len;
+	ulong idx;
+	zval **zdata = NULL, *copyzval;
+
+	if (!ht) {
+		return FAILURE;
+	}
+
+	if (ht->nApplyCount > 0) {
+		/* Prevent recursion */
+		return SUCCESS;
+	}
+
+	arg_sep = INI_STR("arg_separator.output");
+	if (!arg_sep || !strlen(arg_sep)) {
+		arg_sep = HTTP_URL_ARGSEP_DEFAULT;
+	}
+	arg_sep_len = strlen(arg_sep);
+
+	for (zend_hash_internal_pointer_reset(ht);
+		(key_type = zend_hash_get_current_key_ex(ht, &key, &key_len, &idx, 0, NULL)) != HASH_KEY_NON_EXISTANT;
+		zend_hash_move_forward(ht)
+	) {
+		if (key_type == HASH_KEY_IS_STRING && key_len && key[key_len-1] == '\0') {
+			/* We don't want that trailing NULL */
+			key_len -= 1;
+		}
+
+#ifdef ZEND_ENGINE_2
+		/* handling for private & protected object properties */
+		if (key && *key == '\0' && type != NULL) {
+			char *tmp;
+
+			zend_object *zobj = zend_objects_get_address(type TSRMLS_CC);
+			if (zend_check_property_access(zobj, key TSRMLS_CC) != SUCCESS) {
+				/* private or protected property access outside of the class */
+				continue;
+			}
+			zend_unmangle_property_name(key, &tmp, &key);
+			key_len = strlen(key);
+		}
+#endif
+
+		if (zend_hash_get_current_data_ex(ht, (void **)&zdata, NULL) == FAILURE || !zdata || !(*zdata)) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error traversing form data array.");
+			return FAILURE;
+		}
+		if (Z_TYPE_PP(zdata) == IS_ARRAY || Z_TYPE_PP(zdata) == IS_OBJECT) {
+			if (key_type == HASH_KEY_IS_STRING) {
+				ekey = php_url_encode(key, key_len, &ekey_len);
+				newprefix_len = key_suffix_len + ekey_len + key_prefix_len + 1;
+				newprefix = emalloc(newprefix_len + 1);
+				p = newprefix;
+
+				if (key_prefix) {
+					memcpy(p, key_prefix, key_prefix_len);
+					p += key_prefix_len;
+				}
+
+				memcpy(p, ekey, ekey_len);
+				p += ekey_len;
+				efree(ekey);
+
+				if (key_suffix) {
+					memcpy(p, key_suffix, key_suffix_len);
+					p += key_suffix_len;
+				}
+
+				*(p++) = '[';
+				*p = '\0';
+			} else {
+				/* Is an integer key */
+				ekey_len = spprintf(&ekey, 12, "%ld", idx);
+				newprefix_len = key_prefix_len + num_prefix_len + ekey_len + key_suffix_len + 1;
+				newprefix = emalloc(newprefix_len + 1);
+				p = newprefix;
+
+				if (key_prefix) {
+					memcpy(p, key_prefix, key_prefix_len);
+					p += key_prefix_len;
+				}
+
+				memcpy(p, num_prefix, num_prefix_len);
+				p += num_prefix_len;
+
+				memcpy(p, ekey, ekey_len);
+				p += ekey_len;
+				efree(ekey);
+
+				if (key_suffix) {
+					memcpy(p, key_suffix, key_suffix_len);
+					p += key_suffix_len;
+				}
+				*(p++) = '[';
+				*p = '\0';
+			}
+			ht->nApplyCount++;
+			php_url_encode_hash_ex(HASH_OF(*zdata), formstr, NULL, 0, newprefix, newprefix_len, "]", 1, (Z_TYPE_PP(zdata) == IS_OBJECT ? *zdata : NULL) TSRMLS_CC);
+			ht->nApplyCount--;
+			efree(newprefix);
+		} else if (Z_TYPE_PP(zdata) == IS_NULL || Z_TYPE_PP(zdata) == IS_RESOURCE) {
+			/* Skip these types */
+			continue;
+		} else {
+			if (formstr->len) {
+				smart_str_appendl(formstr, arg_sep, arg_sep_len);
+			}
+			/* Simple key=value */
+			smart_str_appendl(formstr, key_prefix, key_prefix_len);
+			if (key_type == HASH_KEY_IS_STRING) {
+				ekey = php_url_encode(key, key_len, &ekey_len);
+				smart_str_appendl(formstr, ekey, ekey_len);
+				efree(ekey);
+			} else {
+				/* Numeric key */
+				if (num_prefix) {
+					smart_str_appendl(formstr, num_prefix, num_prefix_len);
+				}
+				ekey_len = spprintf(&ekey, 12, "%ld", idx);
+				smart_str_appendl(formstr, ekey, ekey_len);
+				efree(ekey);
+			}
+			smart_str_appendl(formstr, key_suffix, key_suffix_len);
+			smart_str_appendl(formstr, "=", 1);
+			switch (Z_TYPE_PP(zdata)) {
+				case IS_STRING:
+					ekey = php_url_encode(Z_STRVAL_PP(zdata), Z_STRLEN_PP(zdata), &ekey_len);
+					break;
+				case IS_LONG:
+				case IS_BOOL:
+					ekey_len = spprintf(&ekey, 12, "%ld", Z_LVAL_PP(zdata));
+					break;
+				case IS_DOUBLE:
+					ekey_len = spprintf(&ekey, 48, "%.*G", (int) EG(precision), Z_DVAL_PP(zdata));
+					break;
+				default:
+					/* fall back on convert to string */
+					MAKE_STD_ZVAL(copyzval);
+					*copyzval = **zdata;
+					zval_copy_ctor(copyzval);
+					convert_to_string_ex(&copyzval);
+					ekey = php_url_encode(Z_STRVAL_P(copyzval), Z_STRLEN_P(copyzval), &ekey_len);
+					zval_ptr_dtor(&copyzval);
+			}
+			smart_str_appendl(formstr, ekey, ekey_len);
+			efree(ekey);
+		}
+	}
+
+	return SUCCESS;
+}
+/* }}} */
+#endif /* !ZEND_ENDGINE_2 */
+
 /* }}} public API */
 
 /*
@@ -2298,4 +1786,4 @@ PHP_HTTP_API STATUS _http_auth_credentials(char **user, char **pass TSRMLS_DC)
  * End:
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
- */
+ */
\ No newline at end of file