X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_api.c;h=d0acbf3e7e6e13b68ab2814c7dd4540df3fad652;hp=91e8b37bbc2d10912ef67da5c70fdea3051d1cbe;hb=a12e8ddfaa5a94e76261f165b0c0299c87b886b1;hpb=0f65d4c86b76d8560f902f8d87b52fd38385d3cf

diff --git a/http_api.c b/http_api.c
index 91e8b37..d0acbf3 100644
--- a/http_api.c
+++ b/http_api.c
@@ -15,38 +15,35 @@
 
 /* $Id$ */
 
+#define _WINSOCKAPI_
+#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
+
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#	include "config.h"
 #endif
 
+#include <ctype.h>
+
 #include "php.h"
 #include "php_version.h"
 #include "php_streams.h"
-#include "main/snprintf.h"
+#include "snprintf.h"
 #include "ext/standard/md5.h"
 #include "ext/standard/url.h"
 #include "ext/standard/base64.h"
 #include "ext/standard/php_string.h"
+#include "ext/standard/php_smart_str.h"
 #include "ext/standard/php_lcg.h"
 
 #include "SAPI.h"
 
-#if (PHP_MAJOR_VERSION >= 5)
-#include "ext/standard/php_http.h"
-#else
-#include "php_http_build_query.h"
-#include "http_build_query.c"
+#ifdef ZEND_ENGINE_2
+#	include "ext/standard/php_http.h"
 #endif
 
 #include "php_http.h"
 #include "php_http_api.h"
-
-#include <ctype.h>
-
-#if defined(HAVE_CURL) && HAVE_CURL
-#include <curl/curl.h>
-#include <curl/easy.h>
-#endif
+#include "php_http_std_defs.h"
 
 ZEND_DECLARE_MODULE_GLOBALS(http)
 
@@ -58,7 +55,7 @@ static const char *wkdays[] = {
 	"Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"
 };
 static const char *weekdays[] = {
-	"Monday", "Tuesday", "Wednesday", 
+	"Monday", "Tuesday", "Wednesday",
 	"Thursday", "Friday", "Saturday", "Sunday"
 };
 static const char *months[] = {
@@ -123,10 +120,6 @@ static const struct time_zone {
 /* {{{ internals */
 
 static int http_sort_q(const void *a, const void *b TSRMLS_DC);
-#define http_etag(e, p, l, m) _http_etag((e), (p), (l), (m) TSRMLS_CC)
-static inline char *_http_etag(char **new_etag, const void *data_ptr, const size_t data_len, const http_send_mode data_mode TSRMLS_DC);
-#define http_is_range_request() _http_is_range_request(TSRMLS_C)
-static inline int _http_is_range_request(TSRMLS_D);
 #define http_send_chunk(d, b, e, m) _http_send_chunk((d), (b), (e), (m) TSRMLS_CC)
 static STATUS _http_send_chunk(const void *data, const size_t begin, const size_t end, const http_send_mode mode TSRMLS_DC);
 
@@ -134,30 +127,7 @@ static int check_day(char *day, size_t len);
 static int check_month(char *month);
 static int check_tzone(char *tzone);
 
-/* {{{ HAVE_CURL */
-#if defined(HAVE_CURL) && 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 *);
-#endif
-/* }}} HAVE_CURL */
+static int http_ob_stack_get(php_ob_buffer *, php_ob_buffer **);
 
 /* {{{ static int http_sort_q(const void *, const void *) */
 static int http_sort_q(const void *a, const void *b TSRMLS_DC)
@@ -178,50 +148,6 @@ static int http_sort_q(const void *a, const void *b TSRMLS_DC)
 }
 /* }}} */
 
-/* {{{ static inline char *http_etag(char **, void *, size_t, http_send_mode) */
-static inline char *_http_etag(char **new_etag, const void *data_ptr,
-	const size_t data_len, const http_send_mode data_mode TSRMLS_DC)
-{
-	char ssb_buf[127], digest[16];
-	PHP_MD5_CTX ctx;
-
-	PHP_MD5Init(&ctx);
-
-	switch (data_mode)
-	{
-		case SEND_DATA:
-			PHP_MD5Update(&ctx, data_ptr, data_len);
-		break;
-
-		case SEND_RSRC:
-			snprintf(ssb_buf, 127, "%l=%l=%l",
-				HTTP_G(ssb).sb.st_mtime,
-				HTTP_G(ssb).sb.st_ino,
-				HTTP_G(ssb).sb.st_size
-			);
-			PHP_MD5Update(&ctx, ssb_buf, strlen(ssb_buf));
-		break;
-
-		default:
-			return NULL;
-		break;
-	}
-
-	PHP_MD5Final(digest, &ctx);
-	make_digest(*new_etag, digest);
-
-	return *new_etag;
-}
-/* }}} */
-
-/* {{{ static inline int http_is_range_request(void) */
-static inline 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);
-}
-/* }}} */
-
 /* {{{ static STATUS http_send_chunk(const void *, size_t, size_t,
 	http_send_mode) */
 static STATUS _http_send_chunk(const void *data, const size_t begin,
@@ -239,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;
 				}
@@ -254,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;
@@ -269,8 +195,7 @@ static STATUS _http_send_chunk(const void *data, const size_t begin,
 		break;
 
 		case SEND_DATA:
-			return len == php_body_write(
-				Z_STRVAL_P((zval *) data) + begin, len TSRMLS_CC)
+			return len == php_body_write(((char *)data) + begin, len TSRMLS_CC)
 				? SUCCESS : FAILURE;
 		break;
 
@@ -281,286 +206,8 @@ static STATUS _http_send_chunk(const void *data, const size_t begin,
 }
 /* }}} */
 
-/* {{{ HAVE_CURL */
-#if defined(HAVE_CURL) && 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)
-	curl_easy_setopt(ch, CURLOPT_NOSIGNAL, 1);
-#endif
-#if defined(PHP_DEBUG)
-	curl_easy_setopt(ch, CURLOPT_VERBOSE, 1);
-#endif
-
-	if ((!options) || (1 > zend_hash_num_elements(options))) {
-		return;
-	}
-
-	/* redirects */
-	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));
-		}
-		/* auth method */
-		if (zoption = http_curl_getopt1(options, "proxyauthtype", IS_LONG)) {
-			curl_easy_setopt(ch, CURLOPT_PROXYAUTH, Z_LVAL_P(zoption));
-		}
-	}
-
-	/* auth */
-	if (zoption = http_curl_getopt1(options, "httpauth", IS_STRING)) {
-		curl_easy_setopt(ch, CURLOPT_USERPWD, Z_STRVAL_P(zoption));
-	}
-	if (zoption = http_curl_getopt1(options, "httpauthtype", IS_LONG)) {
-		curl_easy_setopt(ch, CURLOPT_HTTPAUTH, Z_LVAL_P(zoption));
-	}
-
-	/* compress */
-	if (zoption = http_curl_getopt2(options, "compress", IS_LONG, IS_BOOL)) {
-		/* empty string enables deflate and gzip */
-		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 */
-	if (zoption = http_curl_getopt1(options, "useragent", IS_STRING)) {
-		curl_easy_setopt(ch, CURLOPT_USERAGENT, Z_STRVAL_P(zoption));
-	}
-
-	/* cookies */
-	if (zoption = http_curl_getopt1(options, "cookies", IS_ARRAY)) {
-		zval cookies, glue;
-		ZVAL_STRINGL(&glue, "; ", 2, 0);
-		php_implode(&glue, zoption, &cookies);
-		if (Z_STRVAL(cookies)) {
-			curl_easy_setopt(ch, CURLOPT_COOKIE, Z_STRVAL(cookies));
-		}
-	}
-
-	/* 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 */
-	if (zoption = http_curl_getopt1(options, "headers", IS_ARRAY)) {
-		zval **header;
-		struct curl_slist *headers = NULL;
-		zend_hash_internal_pointer_reset(Z_ARRVAL_P(zoption));
-		while (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &header)) {
-			headers = curl_slist_append(headers, Z_STRVAL_PP(header));
-			zend_hash_move_forward(Z_ARRVAL_P(zoption));
-		}
-		if (headers) {
-			curl_easy_setopt(ch, CURLOPT_HTTPHEADER, headers);
-		}
-	}
-}
-/* }}} */
-
-#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)
 {
 	int i;
@@ -602,6 +249,46 @@ static int check_tzone(char *tzone)
 	}
 	return -1;
 }
+/* }}} */
+
+/* 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;
+		if (wasalpha = isalpha(key[0])) {
+			key[0] = uctitle ? toupper(key[0]) : tolower(key[0]);
+		}
+		for (i = 1; i < key_len; i++) {
+			if (isalpha(key[i])) {
+				key[i] = ((!wasalpha) && uctitle) ? toupper(key[i]) : tolower(key[i]);
+				wasalpha = 1;
+			} else {
+				if (xhyphen && (key[i] == '_')) {
+					key[i] = '-';
+				}
+				wasalpha = 0;
+			}
+		}
+	}
+	return key;
+}
+/* }}} */
+
+/* {{{ static STATUS http_ob_stack_get(php_ob_buffer *, php_ob_buffer **) */
+static STATUS http_ob_stack_get(php_ob_buffer *o, php_ob_buffer **s)
+{
+	static int i = 0;
+	php_ob_buffer *b = emalloc(sizeof(php_ob_buffer));
+	b->handler_name = estrdup(o->handler_name);
+	b->buffer = estrndup(o->buffer, o->text_length);
+	b->text_length = o->text_length;
+	b->chunk_size = o->chunk_size;
+	b->erase = o->erase;
+	s[i++] = b;
+	return SUCCESS;
+}
+/* }}} */
 
 /* }}} internals */
 
@@ -611,25 +298,28 @@ static int check_tzone(char *tzone)
 PHP_HTTP_API char *_http_date(time_t t TSRMLS_DC)
 {
 	struct tm *gmtime, tmbuf;
-	char *date = ecalloc(1, 30);
-
-	gmtime = php_gmtime_r(&t, &tmbuf);
-	snprintf(date, 30,
-		"%s, %02d %s %04d %02d:%02d:%02d GMT",
-		days[gmtime->tm_wday], gmtime->tm_mday,
-		months[gmtime->tm_mon], gmtime->tm_year + 1900,
-		gmtime->tm_hour, gmtime->tm_min, gmtime->tm_sec
-	);
-	return date;
+
+	if (gmtime = php_gmtime_r(&t, &tmbuf)) {
+		char *date = ecalloc(1, 31);
+		snprintf(date, 30,
+			"%s, %02d %s %04d %02d:%02d:%02d GMT",
+			days[gmtime->tm_wday], gmtime->tm_mday,
+			months[gmtime->tm_mon], gmtime->tm_year + 1900,
+			gmtime->tm_hour, gmtime->tm_min, gmtime->tm_sec
+		);
+		return date;
+	}
+
+	return NULL;
 }
 /* }}} */
 
-/* time_t http_parse_date(char *)
+/* {{{ time_t http_parse_date(char *)
 	Originally by libcurl, Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al. */
-PHP_HTTP_API time_t http_parse_date(const char *date)
+PHP_HTTP_API time_t _http_parse_date(const char *date)
 {
 	time_t t = 0;
-	int tz_offset = -1, year = -1, month = -1, monthday = -1, weekday = -1, 
+	int tz_offset = -1, year = -1, month = -1, monthday = -1, weekday = -1,
 		hours = -1, minutes = -1, seconds = -1;
 	struct tm tm;
 	enum assume_next dignext = DATE_MDAY;
@@ -657,14 +347,14 @@ PHP_HTTP_API time_t http_parse_date(const char *date)
 					found = 1;
 				}
 			}
-			
+
 			if (!found && (month == -1)) {
 				month = check_month(buf);
 				if (month != -1) {
 					found = 1;
 				}
 			}
-			
+
 			if (!found && (tz_offset == -1)) {
 				/* this just must be a time zone string */
 				tz_offset = check_tzone(buf);
@@ -672,7 +362,7 @@ PHP_HTTP_API time_t http_parse_date(const char *date)
 					found = 1;
 				}
 			}
-			
+
 			if (!found) {
 				return -1; /* bad string */
 			}
@@ -682,7 +372,8 @@ PHP_HTTP_API time_t http_parse_date(const char *date)
 			/* a digit */
 			int val;
 			char *end;
-			if((seconds == -1) && (3 == sscanf(date, "%02d:%02d:%02d", &hours, &minutes, &seconds))) {
+			if ((seconds == -1) &&
+				(3 == sscanf(date, "%02d:%02d:%02d", &hours, &minutes, &seconds))) {
 				/* time stamp! */
 				date += 8;
 				found = 1;
@@ -690,7 +381,8 @@ PHP_HTTP_API time_t http_parse_date(const char *date)
 			else {
 				val = (int) strtol(date, &end, 10);
 
-				if ((tz_offset == -1) && ((end - date) == 4) && (val < 1300) &&	(indate < date) && ((date[-1] == '+' || date[-1] == '-'))) {
+				if ((tz_offset == -1) && ((end - date) == 4) && (val < 1300) &&
+					(indate < date) && ((date[-1] == '+' || date[-1] == '-'))) {
 					/* four digits and a value less than 1300 and it is preceeded with
 					a plus or minus. This is a time zone indication. */
 					found = 1;
@@ -786,7 +478,7 @@ PHP_HTTP_API time_t http_parse_date(const char *date)
 		if((delta > 0) && (t + delta < t)) {
 			return -1; /* time_t overflow */
 		}
-		
+
 		t += delta;
 	}
 
@@ -794,35 +486,97 @@ PHP_HTTP_API time_t http_parse_date(const char *date)
 }
 /* }}} */
 
-/* {{{ inline STATUS http_send_status(int) */
-PHP_HTTP_API inline STATUS _http_send_status(const int status TSRMLS_DC)
+/* {{{ 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)
 {
-	int s = status;
-	return sapi_header_op(SAPI_HEADER_SET_STATUS, (void *) s TSRMLS_CC);
+	char ssb_buf[128] = {0};
+	unsigned char digest[16];
+	PHP_MD5_CTX ctx;
+	char *new_etag = ecalloc(1, 33);
+
+	PHP_MD5Init(&ctx);
+
+	switch (data_mode)
+	{
+		case SEND_DATA:
+			PHP_MD5Update(&ctx, data_ptr, data_len);
+		break;
+
+		case SEND_RSRC:
+			if (!HTTP_G(ssb).sb.st_ino) {
+				if (php_stream_stat((php_stream *) data_ptr, &HTTP_G(ssb))) {
+					return NULL;
+				}
+			}
+			snprintf(ssb_buf, 127, "%ld=%ld=%ld",
+				HTTP_G(ssb).sb.st_mtime,
+				HTTP_G(ssb).sb.st_ino,
+				HTTP_G(ssb).sb.st_size
+			);
+			PHP_MD5Update(&ctx, ssb_buf, strlen(ssb_buf));
+		break;
+
+		default:
+			efree(new_etag);
+			return NULL;
+		break;
+	}
+
+	PHP_MD5Final(digest, &ctx);
+	make_digest(new_etag, digest);
+
+	return new_etag;
 }
 /* }}} */
 
-/* {{{ inline STATUS http_send_header(char *) */
-PHP_HTTP_API inline STATUS _http_send_header(const char *header 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)
 {
-	return http_send_status_header(0, header);
+	switch (data_mode)
+	{
+		case SEND_DATA:
+		{
+			return time(NULL);
+		}
+
+		case SEND_RSRC:
+		{
+			if (!HTTP_G(ssb).sb.st_mtime) {
+				if (php_stream_stat((php_stream *) data_ptr, &HTTP_G(ssb))) {
+					return 0;
+				}
+			}
+			return HTTP_G(ssb).sb.st_mtime;
+		}
+
+		default:
+		{
+			if (!HTTP_G(ssb).sb.st_mtime) {
+				if(php_stream_stat_path(Z_STRVAL_P((zval *) data_ptr), &HTTP_G(ssb))) {
+					return 0;
+				}
+			}
+			return HTTP_G(ssb).sb.st_mtime;
+		}
+	}
 }
 /* }}} */
 
-/* {{{ 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(
-			Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER]),
+			HTTP_SERVER_VARS,
 			(char *) key, strlen(key) + 1, (void **) &var)) {
 		return *var;
 	}
@@ -845,12 +599,16 @@ PHP_HTTP_API void _http_ob_etaghandler(char *output, uint output_len,
 
 	if (mode & PHP_OUTPUT_HANDLER_END) {
 		PHP_MD5Final(digest, &HTTP_G(etag_md5));
-		make_digest(etag, digest);
 
-		if (http_etag_match("HTTP_IF_NONE_MATCH", etag)) {
-			http_send_status(304);
-		} else {
-			http_send_etag(etag, 32);
+		/* just do that if desired */
+		if (HTTP_G(etag_started)) {
+			make_digest(etag, digest);
+
+			if (http_etag_match("HTTP_IF_NONE_MATCH", etag)) {
+				http_send_status(304);
+			} else {
+				http_send_etag(etag, 32);
+			}
 		}
 	}
 
@@ -859,6 +617,50 @@ PHP_HTTP_API void _http_ob_etaghandler(char *output, uint output_len,
 }
 /* }}} */
 
+/* {{{ STATUS http_start_ob_handler(php_output_handler_func_t, char *, uint, zend_bool) */
+PHP_HTTP_API STATUS _http_start_ob_handler(php_output_handler_func_t handler_func,
+	char *handler_name, uint chunk_size, zend_bool erase TSRMLS_DC)
+{
+	php_ob_buffer **stack;
+	int count, i;
+
+	if (count = OG(ob_nesting_level)) {
+		stack = ecalloc(count, sizeof(php_ob_buffer *));
+
+		if (count > 1) {
+			zend_stack_apply_with_argument(&OG(ob_buffers), ZEND_STACK_APPLY_BOTTOMUP,
+				(int (*)(void *elem, void *)) http_ob_stack_get, stack);
+		}
+
+		if (count > 0) {
+			http_ob_stack_get(&OG(active_ob_buffer), stack);
+		}
+
+		while (OG(ob_nesting_level)) {
+			php_end_ob_buffer(0, 0 TSRMLS_CC);
+		}
+	}
+
+	php_ob_set_internal_handler(handler_func, chunk_size, handler_name, erase TSRMLS_CC);
+
+	for (i = 0; i < count; i++) {
+		php_ob_buffer *s = stack[i];
+		if (strcmp(s->handler_name, "default output handler")) {
+			php_start_ob_buffer_named(s->handler_name, s->chunk_size, s->erase TSRMLS_CC);
+		}
+		php_body_write(s->buffer, s->text_length TSRMLS_CC);
+		efree(s->handler_name);
+		efree(s->buffer);
+		efree(s);
+	}
+	if (count) {
+		efree(stack);
+	}
+
+	return SUCCESS;
+}
+/* }}} */
+
 /* {{{ int http_modified_match(char *, int) */
 PHP_HTTP_API int _http_modified_match(const char *entry, const time_t t TSRMLS_DC)
 {
@@ -899,20 +701,26 @@ PHP_HTTP_API int _http_etag_match(const char *entry, const char *etag TSRMLS_DC)
 	} else {
 		result = (NULL != strstr(Z_STRVAL_P(zetag), quoted_etag));
 	}
-
 	efree(quoted_etag);
 	return result;
 }
 /* }}} */
 
 /* {{{ STATUS http_send_last_modified(int) */
-PHP_HTTP_API STATUS _http_send_last_modified(const int t TSRMLS_DC)
+PHP_HTTP_API STATUS _http_send_last_modified(const time_t t TSRMLS_DC)
 {
-	char modified[96] = "Last-Modified: ", *date;
-	date = http_date(t);
-	strcat(modified, date);
-	efree(date);
-	return http_send_header(modified);
+	char *date = NULL;
+	if (date = http_date(t)) {
+		char modified[96] = "Last-Modified: ";
+		strcat(modified, date);
+		efree(date);
+
+		/* remember */
+		HTTP_G(lmod) = t;
+
+		return http_send_header(modified);
+	}
+	return FAILURE;
 }
 /* }}} */
 
@@ -920,16 +728,154 @@ PHP_HTTP_API STATUS _http_send_last_modified(const int t TSRMLS_DC)
 PHP_HTTP_API STATUS _http_send_etag(const char *etag,
 	const int etag_len TSRMLS_DC)
 {
-	STATUS ret;
-	int header_len;
+	STATUS status;
 	char *etag_header;
 
-	header_len = strlen("ETag: \"\"") + etag_len + 1;
-	etag_header = (char *) emalloc(header_len);
-	snprintf(etag_header, header_len, "ETag: \"%s\"", etag);
-	ret = http_send_header(etag_header);
+	if (!etag_len){
+		php_error_docref(NULL TSRMLS_CC,E_ERROR,
+			"Attempt to send empty ETag (previous: %s)\n", HTTP_G(etag));
+		return FAILURE;
+	}
+
+	/* remember */
+	if (HTTP_G(etag)) {
+		efree(HTTP_G(etag));
+	}
+	HTTP_G(etag) = estrdup(etag);
+
+	etag_header = ecalloc(1, sizeof("ETag: \"\"") + etag_len);
+	sprintf(etag_header, "ETag: \"%s\"", etag);
+	if (SUCCESS != (status = http_send_header(etag_header))) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't send '%s' header", etag_header);
+	}
 	efree(etag_header);
-	return ret;
+	return status;
+}
+/* }}} */
+
+/* {{{ STATUS http_send_cache_control(char *, size_t) */
+PHP_HTTP_API STATUS _http_send_cache_control(const char *cache_control,
+	const size_t cc_len TSRMLS_DC)
+{
+	STATUS status;
+	char *cc_header = ecalloc(1, sizeof("Cache-Control: ") + cc_len);
+
+	sprintf(cc_header, "Cache-Control: %s", cache_control);
+	if (SUCCESS != (status = http_send_header(cc_header))) {
+		php_error_docref(NULL TSRMLS_CC, E_NOTICE,
+			"Could not send '%s' header", cc_header);
+	}
+	efree(cc_header);
+	return status;
+}
+/* }}} */
+
+/* {{{ STATUS http_send_content_type(char *, size_t) */
+PHP_HTTP_API STATUS _http_send_content_type(const char *content_type,
+	const size_t ct_len TSRMLS_DC)
+{
+	STATUS status;
+	char *ct_header;
+
+	if (!strchr(content_type, '/')) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING,
+			"Content-Type '%s' doesn't seem to consist of a primary and a secondary part",
+			content_type);
+		return FAILURE;
+	}
+
+	/* remember for multiple ranges */
+	if (HTTP_G(ctype)) {
+		efree(HTTP_G(ctype));
+	}
+	HTTP_G(ctype) = estrndup(content_type, ct_len);
+
+	ct_header = ecalloc(1, sizeof("Content-Type: ") + ct_len);
+	sprintf(ct_header, "Content-Type: %s", content_type);
+
+	if (SUCCESS != (status = http_send_header(ct_header))) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING,
+			"Couldn't send '%s' header", ct_header);
+	}
+	efree(ct_header);
+	return status;
+}
+/* }}} */
+
+/* {{{ STATUS http_send_content_disposition(char *, size_t, zend_bool) */
+PHP_HTTP_API STATUS _http_send_content_disposition(const char *filename,
+	const size_t f_len, const int send_inline TSRMLS_DC)
+{
+	STATUS status;
+	char *cd_header;
+
+	if (send_inline) {
+		cd_header = ecalloc(1, sizeof("Content-Disposition: inline; filename=\"\"") + f_len);
+		sprintf(cd_header, "Content-Disposition: inline; filename=\"%s\"", filename);
+	} else {
+		cd_header = ecalloc(1, sizeof("Content-Disposition: attachment; filename=\"\"") + f_len);
+		sprintf(cd_header, "Content-Disposition: attachment; filename=\"%s\"", filename);
+	}
+
+	if (SUCCESS != (status = http_send_header(cd_header))) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't send '%s' header", cd_header);
+	}
+	efree(cd_header);
+	return status;
+}
+/* }}} */
+
+/* {{{ STATUS http_cache_last_modified(time_t, time_t, char *, size_t) */
+PHP_HTTP_API STATUS _http_cache_last_modified(const time_t last_modified,
+	const time_t send_modified, const char *cache_control, const size_t cc_len TSRMLS_DC)
+{
+	if (cc_len) {
+		http_send_cache_control(cache_control, cc_len);
+	}
+
+	if (http_modified_match("HTTP_IF_MODIFIED_SINCE", last_modified)) {
+		if (SUCCESS == http_send_status(304)) {
+			zend_bailout();
+		} else {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not send 304 Not Modified");
+			return FAILURE;
+		}
+	}
+	return http_send_last_modified(send_modified);
+}
+/* }}} */
+
+/* {{{ STATUS http_cache_etag(char *, size_t, char *, size_t) */
+PHP_HTTP_API STATUS _http_cache_etag(const char *etag, const size_t etag_len,
+	const char *cache_control, const size_t cc_len TSRMLS_DC)
+{
+	if (cc_len) {
+		http_send_cache_control(cache_control, cc_len);
+	}
+
+	if (etag_len) {
+		http_send_etag(etag, etag_len);
+		if (http_etag_match("HTTP_IF_NONE_MATCH", etag)) {
+			if (SUCCESS == http_send_status(304)) {
+				zend_bailout();
+			} else {
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not send 304 Not Modified");
+				return FAILURE;
+			}
+		}
+	}
+
+	/* if no etag is given and we didn't already start ob_etaghandler -- start it */
+	if (!HTTP_G(etag_started)) {
+		if (SUCCESS == http_start_ob_handler(_http_ob_etaghandler, "ob_etaghandler", 4096, 1)) {
+			HTTP_G(etag_started) = 1;
+			return SUCCESS;
+		} else {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not start ob_etaghandler");
+			return FAILURE;
+		}
+	}
+	return SUCCESS;
 }
 /* }}} */
 
@@ -937,7 +883,7 @@ PHP_HTTP_API STATUS _http_send_etag(const char *etag,
 PHP_HTTP_API char *_http_absolute_uri(const char *url,
 	const char *proto TSRMLS_DC)
 {
-	char URI[HTTP_URI_MAXLEN + 1], *PTR, *proto_ptr, *host, *path;
+	char *proto_ptr, *host, *path, *PTR, *URI = ecalloc(1, HTTP_URI_MAXLEN + 1);
 	zval *zhost;
 
 	if (!url || !strlen(url)) {
@@ -949,10 +895,11 @@ PHP_HTTP_API char *_http_absolute_uri(const char *url,
 	/* Mess around with already absolute URIs */
 	else if (proto_ptr = strstr(url, "://")) {
 		if (!proto || !strncmp(url, proto, strlen(proto))) {
-			return estrdup(url);
+			strncpy(URI, url, HTTP_URI_MAXLEN);
+			return URI;
 		} else {
 			snprintf(URI, HTTP_URI_MAXLEN, "%s%s", proto, proto_ptr + 3);
-			return estrdup(URI);
+			return URI;
 		}
 	}
 
@@ -983,16 +930,11 @@ PHP_HTTP_API char *_http_absolute_uri(const char *url,
 	}
 
 	/* strip everything after a new line */
-	PTR = URI;
-	while (*PTR != 0) {
-		if (*PTR == '\n' || *PTR == '\r') {
-			*PTR = 0;
-			break;
-		}
-		PTR++;
+	if ((PTR = strchr(URI, '\r')) || (PTR = strchr(URI, '\n'))) {
+		PTR = 0;
 	}
 
-	return estrdup(URI);
+	return URI;
 }
 /* }}} */
 
@@ -1032,14 +974,11 @@ PHP_HTTP_API char *_http_negotiate_q(const char *entry, const zval *supported,
 		if (NULL != (q_ptr = strrchr(Z_STRVAL_PP(zentry), ';'))) {
 			qual = strtod(q_ptr + 3, NULL);
 		} else {
-			qual = 1000.0 - 1;
+			qual = 1000.0 - i;
 		}
 
 		/* 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;
@@ -1066,24 +1005,24 @@ PHP_HTTP_API char *_http_negotiate_q(const char *entry, const zval *supported,
 }
 /* }}} */
 
-/* {{{ http_range_status http_get_request_ranges(zval *zranges, size_t) */
-PHP_HTTP_API http_range_status _http_get_request_ranges(zval *zranges,
+/* {{{ http_range_status http_get_request_ranges(HashTable *ranges, size_t) */
+PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges,
 	const size_t length TSRMLS_DC)
 {
-	zval *zrange, *zentry, **zentries;
+	zval *zrange;
 	char *range, c;
 	long begin = -1, end = -1, *ptr;
 
 	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_ERR;
+		return RANGE_NO;
 	}
 
 	ptr = &begin;
-	range += strlen("bytes=");
+	range += sizeof("bytes=") - 1;
 
 	do {
 		switch (c = *(range++))
@@ -1118,6 +1057,10 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(zval *zranges,
 				ptr = &end;
 			break;
 
+			case ' ':
+				/* IE - ignore for now */
+			break;
+
 			case 0:
 			case ',':
 
@@ -1166,21 +1109,22 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(zval *zranges,
 						break;
 					}
 				}
-
-				zentry = (zval *) zentries++;
-				MAKE_STD_ZVAL(zentry);
-				array_init(zentry);
-				add_index_long(zentry, 0, begin);
-				add_index_long(zentry, 1, end);
-				add_next_index_zval(zranges, zentry);
-
-				begin = -1;
-				end = -1;
-				ptr = &begin;
+				{
+					zval *zentry;
+					MAKE_STD_ZVAL(zentry);
+					array_init(zentry);
+					add_index_long(zentry, 0, begin);
+					add_index_long(zentry, 1, end);
+					zend_hash_next_index_insert(ranges, &zentry, sizeof(zval *), NULL);
+
+					begin = -1;
+					end = -1;
+					ptr = &begin;
+				}
 			break;
 
 			default:
-				return RANGE_ERR;
+				return RANGE_NO;
 			break;
 		}
 	} while (c != 0);
@@ -1189,136 +1133,158 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(zval *zranges,
 }
 /* }}} */
 
-/* {{{ STATUS http_send_ranges(zval *, void *, size_t, http_send_mode) */
-PHP_HTTP_API STATUS _http_send_ranges(zval *zranges, const void *data, const size_t size, const http_send_mode mode TSRMLS_DC)
+/* {{{ STATUS http_send_ranges(HashTable *, void *, size_t, http_send_mode) */
+PHP_HTTP_API STATUS _http_send_ranges(HashTable *ranges, const void *data, const size_t size, const http_send_mode mode TSRMLS_DC)
 {
+	long **begin, **end;
 	zval **zrange;
-	long b, e, **begin, **end;
-	char range_header[255], multi_header[68] = "Content-Type: multipart/byteranges; boundary=", bound[23], preface[1024];
-	int i, c;
-
-	/* Send HTTP 206 Partial Content */
-	http_send_status(206);
 
 	/* single range */
-	if ((c = zend_hash_num_elements(Z_ARRVAL_P(zranges))) == 1) {
-		zend_hash_index_find(Z_ARRVAL_P(zranges), 0, (void **) &zrange);
-		zend_hash_index_find(Z_ARRVAL_PP(zrange), 0, (void **) &begin);
-		zend_hash_index_find(Z_ARRVAL_PP(zrange), 1, (void **) &end);
+	if (zend_hash_num_elements(ranges) == 1) {
+		char range_header[256] = {0};
 
-		/* so zranges can be freed */
-		b = **begin;
-		e = **end;
+		if (SUCCESS != zend_hash_index_find(ranges, 0, (void **) &zrange) ||
+			SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(zrange), 0, (void **) &begin) ||
+			SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(zrange), 1, (void **) &end)) {
+			return FAILURE;
+		}
 
-		/* free zranges */
-		zval_dtor(zranges);
-		efree(zranges);
+		/* Send HTTP 206 Partial Content */
+		http_send_status(206);
 
 		/* send content range header */
-		snprintf(range_header, 255, "Content-Range: bytes %d-%d/%d", b, e, size);
+		snprintf(range_header, 255, "Content-Range: bytes %d-%d/%d", **begin, **end, size);
 		http_send_header(range_header);
 
 		/* send requested chunk */
-		return http_send_chunk(data, b, e + 1, mode);
+		return http_send_chunk(data, **begin, **end + 1, mode);
 	}
 
 	/* multi range */
+	else {
+		char bound[23] = {0}, preface[1024] = {0},
+			multi_header[68] = "Content-Type: multipart/byteranges; boundary=";
+
+		/* Send HTTP 206 Partial Content */
+		http_send_status(206);
+
+		/* send multipart/byteranges header */
+		snprintf(bound, 22, "--%d%0.9f", time(NULL), php_combined_lcg(TSRMLS_C));
+		strncat(multi_header, bound + 2, 21);
+		http_send_header(multi_header);
+
+		/* send each requested chunk */
+		FOREACH_HASH_VAL(ranges, zrange) {
+			if (SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(zrange), 0, (void **) &begin) ||
+				SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(zrange), 1, (void **) &end)) {
+				break;
+			}
 
-	snprintf(bound, 23, "--%d%0.9f", time(NULL), php_combined_lcg(TSRMLS_C));
-	strncat(multi_header, bound + 2, 21);
-	http_send_header(multi_header);
-
-	/* send each requested chunk */
-	for (	i = 0,	zend_hash_internal_pointer_reset(Z_ARRVAL_P(zranges));
-			i < c;
-			i++,	zend_hash_move_forward(Z_ARRVAL_P(zranges))) {
-		if (	HASH_KEY_NON_EXISTANT == zend_hash_get_current_data(
-					Z_ARRVAL_P(zranges), (void **) &zrange) ||
-				SUCCESS != zend_hash_index_find(
-					Z_ARRVAL_PP(zrange), 0, (void **) &begin) ||
-				SUCCESS != zend_hash_index_find(
-					Z_ARRVAL_PP(zrange), 1, (void **) &end)) {
-			break;
+			snprintf(preface, 1023,
+				HTTP_CRLF "%s"
+				HTTP_CRLF "Content-Type: %s"
+				HTTP_CRLF "Content-Range: bytes %ld-%ld/%ld"
+				HTTP_CRLF
+				HTTP_CRLF,
+
+				bound,
+				HTTP_G(ctype) ? HTTP_G(ctype) : "application/x-octetstream",
+				**begin,
+				**end,
+				size
+			);
+
+			php_body_write(preface, strlen(preface) TSRMLS_CC);
+			http_send_chunk(data, **begin, **end + 1, mode);
 		}
 
-		snprintf(preface, 1024,
-			"\r\n%s\r\nContent-Type: %s\r\nContent-Range: bytes %d-%d/%d\r\n\r\n", bound,
-			HTTP_G(ctype) ? HTTP_G(ctype) : "application/x-octetstream",
-			**begin, **end, size);
-		php_body_write(preface, strlen(preface) TSRMLS_CC);
-		http_send_chunk(data, **begin, **end + 1, mode);
+		/* write boundary once more */
+		php_body_write(HTTP_CRLF, sizeof(HTTP_CRLF) - 1 TSRMLS_CC);
+		php_body_write(bound, strlen(bound) TSRMLS_CC);
+		php_body_write("--", 2 TSRMLS_CC);
 
+		return SUCCESS;
 	}
-
-	/* free zranges */
-	zval_dtor(zranges);
-	efree(zranges);
-
-	/* write boundary once more */
-	php_body_write("\n", 1 TSRMLS_CC);
-	php_body_write(bound, strlen(bound) TSRMLS_CC);
-
-	return SUCCESS;
 }
 /* }}} */
 
-/* {{{ STATUS http_send(void *, sizezo_t, http_send_mode) */
+/* {{{ STATUS http_send(void *, size_t, http_send_mode) */
 PHP_HTTP_API STATUS _http_send(const void *data_ptr, const size_t data_size,
 	const http_send_mode data_mode TSRMLS_DC)
 {
-	zval *zranges = NULL;
+	int is_range_request = http_is_range_request();
 
 	if (!data_ptr) {
 		return FAILURE;
 	}
+	if (!data_size) {
+		return SUCCESS;
+	}
 
-	/* never ever use the output to compute the ETag if http_send() is used */
+	/* etag handling */
 	if (HTTP_G(etag_started)) {
-		char *new_etag = (char *) emalloc(33);
-
+		char *etag;
+		/* interrupt */
+		HTTP_G(etag_started) = 0;
+		/* never ever use the output to compute the ETag if http_send() is used */
 		php_end_ob_buffer(0, 0 TSRMLS_CC);
-		if (NULL == http_etag(&new_etag, data_ptr, data_size, data_mode)) {
-			efree(new_etag);
+		if (!(etag = http_etag(data_ptr, data_size, data_mode))) {
 			return FAILURE;
 		}
 
 		/* send 304 Not Modified if etag matches */
-		if (http_etag_match("HTTP_IF_NONE_MATCH", new_etag)) {
-			efree(new_etag);
+		if ((!is_range_request) && http_etag_match("HTTP_IF_NONE_MATCH", etag)) {
+			efree(etag);
 			return http_send_status(304);
 		}
 
-		http_send_etag(new_etag, 32);
-		efree(new_etag);
+		http_send_etag(etag, 32);
+		efree(etag);
 	}
 
-	if (http_is_range_request()) {
+	/* send 304 Not Modified if last-modified matches*/
+    if ((!is_range_request) && http_modified_match("HTTP_IF_MODIFIED_SINCE", HTTP_G(lmod))) {
+        return http_send_status(304);
+    }
 
-		MAKE_STD_ZVAL(zranges);
-		array_init(zranges);
+	if (is_range_request) {
 
-		switch (http_get_request_ranges(zranges, data_size))
-		{
-			case RANGE_NO:
-				zval_dtor(zranges);
-				efree(zranges);
-				/* go ahead and send all */
-			break;
+		/* only send ranges if entity hasn't changed */
+		if (
+			((!zend_hash_exists(HTTP_SERVER_VARS, "HTTP_IF_MATCH", 13)) ||
+			http_etag_match("HTTP_IF_MATCH", HTTP_G(etag)))
+			&&
+			((!zend_hash_exists(HTTP_SERVER_VARS, "HTTP_IF_UNMODIFIED_SINCE", 25)) ||
+			http_modified_match("HTTP_IF_UNMODIFIED_SINCE", HTTP_G(lmod)))
+		) {
 
-			case RANGE_OK:
-				return http_send_ranges(zranges, data_ptr, data_size, data_mode);
-			break;
+			STATUS result = FAILURE;
+			HashTable ranges;
+			zend_hash_init(&ranges, 0, NULL, ZVAL_PTR_DTOR, 0);
 
-			case RANGE_ERR:
-				zval_dtor(zranges);
-				efree(zranges);
-				http_send_status(416);
-				return FAILURE;
-			break;
+			switch (http_get_request_ranges(&ranges, data_size))
+			{
+				case RANGE_NO:
+					zend_hash_destroy(&ranges);
+					/* go ahead and send all */
+				break;
 
-			default:
-				return FAILURE;
-			break;
+				case RANGE_OK:
+					result = http_send_ranges(&ranges, data_ptr, data_size, data_mode);
+					zend_hash_destroy(&ranges);
+					return result;
+				break;
+
+				case RANGE_ERR:
+					zend_hash_destroy(&ranges);
+					http_send_status(416);
+					return FAILURE;
+				break;
+
+				default:
+					return FAILURE;
+				break;
+			}
 		}
 	}
 	/* send all */
@@ -1326,49 +1292,23 @@ PHP_HTTP_API STATUS _http_send(const void *data_ptr, const size_t data_size,
 }
 /* }}} */
 
-/* {{{ STATUS http_send_data(zval *) */
-PHP_HTTP_API STATUS _http_send_data(const zval *zdata TSRMLS_DC)
-{
-	if (!Z_STRLEN_P(zdata)) {
-		return SUCCESS;
-	}
-	if (!Z_STRVAL_P(zdata)) {
-		return FAILURE;
-	}
-
-	return http_send((void *) zdata, Z_STRLEN_P(zdata), SEND_DATA);
-}
-/* }}} */
-
 /* {{{ STATUS http_send_stream(php_stream *) */
-PHP_HTTP_API STATUS _http_send_stream(const php_stream *file TSRMLS_DC)
+PHP_HTTP_API STATUS _http_send_stream_ex(php_stream *file,
+	zend_bool close_stream TSRMLS_DC)
 {
-	if (php_stream_stat((php_stream *) file, &HTTP_G(ssb))) {
-		return FAILURE;
-	}
-
-	return http_send((void *) file, HTTP_G(ssb).sb.st_size, SEND_RSRC);
-}
-/* }}} */
-
-/* {{{ STATUS http_send_file(zval *) */
-PHP_HTTP_API STATUS _http_send_file(const zval *zfile TSRMLS_DC)
-{
-	php_stream *file;
-	STATUS ret;
+	STATUS status;
 
-	if (!Z_STRLEN_P(zfile)) {
+	if ((!file) || php_stream_stat(file, &HTTP_G(ssb))) {
 		return FAILURE;
 	}
 
-	if (!(file = php_stream_open_wrapper(Z_STRVAL_P(zfile), "rb",
-			REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL))) {
-		return FAILURE;
+	status = http_send(file, HTTP_G(ssb).sb.st_size, SEND_RSRC);
+
+	if (close_stream) {
+		php_stream_close(file);
 	}
 
-	ret = http_send_stream(file);
-	php_stream_close(file);
-	return ret;
+	return status;
 }
 /* }}} */
 
@@ -1380,7 +1320,7 @@ PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded,
 	char *d_ptr;
 
 	*decoded_len = 0;
-	*decoded = (char *) ecalloc(1, encoded_len);
+	*decoded = ecalloc(1, encoded_len);
 	d_ptr = *decoded;
 	e_ptr = encoded;
 
@@ -1400,8 +1340,22 @@ PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded,
 			hex_len[i++] = *e_ptr++;
 		}
 
+		/* reached the end */
+		if (!strcmp(hex_len, "0")) {
+			break;
+		}
+
+		/* new line */
+		if (strncmp(e_ptr, HTTP_CRLF, 2)) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING,
+				"Invalid character (expected 0x0D 0x0A; got: %x %x)",
+				*e_ptr, *(e_ptr + 1));
+			efree(*decoded);
+			return FAILURE;
+		}
+
 		/* hex to long */
-		if (strcmp(hex_len, "0")) {
+		{
 			char *error = NULL;
 			chunk_len = strtol(hex_len, &error, 16);
 			if (error == hex_len) {
@@ -1410,20 +1364,9 @@ PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded,
 				efree(*decoded);
 				return FAILURE;
 			}
-		} else {
-			break;
-		}
-
-		/* new line */
-		if (*e_ptr++ != '\r' || *e_ptr++ != '\n') {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING,
-				"Invalid character (expected 0x0A, 0x0D; got: %x)",
-				*(e_ptr - 1));
-			efree(*decoded);
-			return FAILURE;
 		}
 
-		memcpy(d_ptr, e_ptr, chunk_len);
+		memcpy(d_ptr, e_ptr += 2, chunk_len);
 		d_ptr += chunk_len;
 		e_ptr += chunk_len + 2;
 		*decoded_len += chunk_len;
@@ -1433,15 +1376,14 @@ PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded,
 }
 /* }}} */
 
-/* {{{ proto void http_split_response(zval *, zval *, zval *) */
-PHP_HTTP_API void _http_split_response(const zval *zresponse, zval *zheaders,
-	zval *zbody TSRMLS_DC)
+/* {{{ proto STATUS http_split_response_ex(char *, size_t, zval *, zval *) */
+PHP_HTTP_API STATUS _http_split_response_ex(char *response,
+	size_t response_len, zval *zheaders, zval *zbody TSRMLS_DC)
 {
-	char *header, *response, *body = NULL;
-	long response_len = Z_STRLEN_P(zresponse);
-	header = response = Z_STRVAL_P(zresponse);
+	char *body = NULL;
+	char *header = response;
 
-	while ((response - Z_STRVAL_P(zresponse) + 3) < response_len) {
+	while (0 < (response_len - (response - header + 4))) {
 		if (	(*response++ == '\r') &&
 				(*response++ == '\n') &&
 				(*response++ == '\r') &&
@@ -1457,170 +1399,139 @@ PHP_HTTP_API void _http_split_response(const zval *zresponse, zval *zheaders,
 		Z_TYPE_P(zbody) = IS_NULL;
 	}
 
-	/* check for HTTP status - FIXXME: strchr() */
-	if (!strncmp(header, "HTTP/1.", 7)) {
-		char *end = strchr(header, '\r');
-		add_assoc_stringl(zheaders, "Status",
-			header + strlen("HTTP/1.x "),
-			end - (header + strlen("HTTP/1.x ")), 1);
-		header = end + 2;
-	}
-	/* split headers */
-	{
-		char *colon = NULL, *line = header;
-
-		while (	(line - Z_STRVAL_P(zresponse) + 3) <
-				(body - Z_STRVAL_P(zresponse))) {
-			switch (*line++)
-			{
-				case '\r':
-					if (colon && (*line == '\n')) {
-						char *key = estrndup(header, colon - header);
-						add_assoc_stringl(zheaders, key,
-							colon + 2, line - colon - 3, 1);
-						efree(key);
-
-						colon = NULL;
-						header += line - header + 1;
-					}
-				break;
-
-				case ':':
-					if (!colon) {
-						colon = line - 1;
-					}
-				break;
-			}
-		}
-	}
+	return http_parse_headers(header, body ? body - header : response_len, zheaders);
 }
 /* }}} */
 
-/* {{{ HAVE_CURL */
-#if defined(HAVE_CURL) && HAVE_CURL
-
-/* {{{ STATUS http_get(char *, HashTable *, char **, size_t *) */
-PHP_HTTP_API STATUS _http_get(const char *URL, HashTable *options,
-	char **data, size_t *data_len TSRMLS_DC)
+/* {{{ STATUS http_parse_headers(char *, long, zval *) */
+PHP_HTTP_API STATUS _http_parse_headers(char *header, int header_len, zval *array TSRMLS_DC)
 {
-	CURL *ch = curl_easy_init();
+	char *colon = NULL, *line = NULL, *begin = header;
 
-	if (!ch) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize curl");
+	if (header_len < 2) {
 		return FAILURE;
 	}
 
-	http_curl_initbuf(CURLBUF_EVRY);
-	http_curl_setopts(ch, URL, options);
-
-	if (CURLE_OK != curl_easy_perform(ch)) {
-		curl_easy_cleanup(ch);
-		http_curl_freebuf(CURLBUF_EVRY);
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
-		return FAILURE;
+	/* status code */
+	if (!strncmp(header, "HTTP/1.", 7)) {
+		char *end = strstr(header, HTTP_CRLF);
+		add_assoc_stringl(array, "Status",
+			header + sizeof("HTTP/1.x ") - 1,
+			end - (header + sizeof("HTTP/1.x ") - 1), 1);
+		header = end + 2;
 	}
-	curl_easy_cleanup(ch);
 
-	http_curl_movebuf(CURLBUF_EVRY, data, data_len);
+	line = header;
 
-	return SUCCESS;
-}
-/* }}} */
+	while (header_len >= (line - begin)) {
+		int value_len = 0;
 
-/* {{{ STATUS http_head(char *, HashTable *, char **data, size_t *) */
-PHP_HTTP_API STATUS _http_head(const char *URL, HashTable *options,
-	char **data, size_t *data_len TSRMLS_DC)
-{
-	CURL *ch = curl_easy_init();
+		switch (*line++)
+		{
+			case 0:
+				--value_len; /* we don't have CR so value length is one char less */
+			case '\n':
+				if (colon && ((!(*line - 1)) || ((*line != ' ') && (*line != '\t')))) {
 
-	if (!ch) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize curl");
-		return FAILURE;
-	}
+					/* skip empty key */
+					if (header != colon) {
+						char *key = estrndup(header, colon - header);
+						value_len += line - colon - 1;
+
+						/* skip leading ws */
+						while (isspace(*(++colon))) --value_len;
+						/* skip trailing ws */
+						while (isspace(colon[value_len - 1])) --value_len;
+
+						if (value_len < 1) {
+							/* hm, empty header? */
+							add_assoc_stringl(array, key, "", 0, 1);
+						} else {
+							add_assoc_stringl(array, key, colon, value_len, 1);
+						}
+						efree(key);
+					}
 
-	http_curl_initbuf(CURLBUF_HDRS);
-	http_curl_setopts(ch, URL, options);
-	curl_easy_setopt(ch, CURLOPT_NOBODY, 1);
+					colon = NULL;
+					value_len = 0;
+					header += line - header;
+				}
+			break;
 
-	if (CURLE_OK != curl_easy_perform(ch)) {
-		curl_easy_cleanup(ch);
-		http_curl_freebuf(CURLBUF_HDRS);
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
-		return FAILURE;
+			case ':':
+				if (!colon) {
+					colon = line - 1;
+				}
+			break;
+		}
 	}
-	curl_easy_cleanup(ch);
-
-	http_curl_movebuf(CURLBUF_HDRS, data, data_len);
-
 	return SUCCESS;
 }
 /* }}} */
 
-/* {{{ STATUS http_post_data(char *, char *, size_t, HashTable *, char **, size_t *) */
-PHP_HTTP_API STATUS _http_post_data(const char *URL, char *postdata,
-	size_t postdata_len, HashTable *options, char **data,
-	size_t *data_len TSRMLS_DC)
+/* {{{ void http_get_request_headers(zval *) */
+PHP_HTTP_API void _http_get_request_headers(zval *array TSRMLS_DC)
 {
-	CURL *ch = curl_easy_init();
-
-	if (!ch) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize curl");
-		return FAILURE;
-	}
-
-	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)) {
-		curl_easy_cleanup(ch);
-		http_curl_freebuf(CURLBUF_EVRY);
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
-		return FAILURE;
-	}
-	curl_easy_cleanup(ch);
-
-	http_curl_movebuf(CURLBUF_EVRY, data, data_len);
-
-	return SUCCESS;
+    char *key = NULL;
+    long idx = 0;
+
+    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);
+        }
+    }
 }
 /* }}} */
 
-/* {{{ STATUS http_post_array(char *, HashTable *, HashTable *, char **, size_t *) */
-PHP_HTTP_API STATUS _http_post_array(const char *URL, HashTable *postarray,
-	HashTable *options, 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)
 {
 	smart_str qstr = {0};
-	STATUS status;
 
-	if (php_url_encode_hash_ex(postarray, &qstr, NULL,0,NULL,0,NULL,0,NULL TSRMLS_CC) != SUCCESS) {
+	if (override_argsep) {
+		HTTP_URL_ARGSEP_OVERRIDE;
+	}
+
+	if (pre_encoded_len && pre_encoded_data) {
+		smart_str_appendl(&qstr, pre_encoded_data, pre_encoded_len);
+	}
+
+	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);
 		}
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not encode post data");
+		if (override_argsep) {
+			HTTP_URL_ARGSEP_RESTORE;
+		}
 		return FAILURE;
 	}
+
+	if (override_argsep) {
+		HTTP_URL_ARGSEP_RESTORE;
+	}
+
 	smart_str_0(&qstr);
 
-	status = http_post_data(URL, qstr.c, qstr.len, options, data, data_len);
-	if (qstr.c) {
-		efree(qstr.c);
+	*encoded_data = qstr.c;
+	if (encoded_len) {
+		*encoded_len  = qstr.len;
 	}
-	return status;
+
+	return SUCCESS;
 }
 /* }}} */
 
-#endif
-/* }}} HAVE_CURL */
-
-/* {{{ void http_auth_header(char *, char*) */
-PHP_HTTP_API void _http_auth_header(const char *type, const char *realm TSRMLS_DC)
+/* {{{ STATUS http_auth_header(char *, char*) */
+PHP_HTTP_API STATUS _http_auth_header(const char *type, const char *realm TSRMLS_DC)
 {
-	char realm_header[1024];
-	snprintf(realm_header, 1024, "WWW-Authenticate: %s realm=\"%s\"", type, realm);
-	http_send_status_header(401, realm_header);
+	char realm_header[1024] = {0};
+	snprintf(realm_header, 1023, "WWW-Authenticate: %s realm=\"%s\"", type, realm);
+	return http_send_status_header(401, realm_header);
 }
 /* }}} */
 
@@ -1659,6 +1570,170 @@ PHP_HTTP_API STATUS _http_auth_credentials(char **user, char **pass TSRMLS_DC)
 }
 /* }}} */
 
+#ifndef ZEND_ENGINE_2
+/* {{{ php_url_encode_hash
+	Author: Sara 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 */
 
 /*
@@ -1669,3 +1744,4 @@ PHP_HTTP_API STATUS _http_auth_credentials(char **user, char **pass TSRMLS_DC)
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
  */
+