X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_api.c;h=42b382807491cb545b505feabb8a81f0e4897bf5;hp=adef9a2f8afad8c9370db2dcd8b8c11a0a87d41d;hb=1bb503ce9d88c7b8b3fd483d313fc6c6ab0bf454;hpb=5f04760d51e4e25b55d12a4698b361e1e93f91a9

diff --git a/http_api.c b/http_api.c
index adef9a2..42b3828 100644
--- a/http_api.c
+++ b/http_api.c
@@ -15,21 +15,15 @@
 
 /* $Id$ */
 
+#define _WINSOCKAPI_
+#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
+
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#	include "config.h"
 #endif
 
 #include <ctype.h>
 
-#if defined(HAVE_CURL) && HAVE_CURL
-#	ifdef PHP_WIN32
-#	include <winsock2.h>
-#	include <sys/types.h>
-#	endif
-#include <curl/curl.h>
-#include <curl/easy.h>
-#endif
-
 #include "php.h"
 #include "php_version.h"
 #include "php_streams.h"
@@ -43,16 +37,31 @@
 
 #include "SAPI.h"
 
-#if (PHP_MAJOR_VERSION >= 5)
-#include "ext/standard/php_http.h"
+#ifdef ZEND_ENGINE_2
+#	include "ext/standard/php_http.h"
 #else
-#include "php_http_build_query.h"
-#include "http_build_query.c"
+	#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
+
 ZEND_DECLARE_MODULE_GLOBALS(http)
 
 /* {{{ day/month names */
@@ -128,10 +137,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);
 
@@ -139,8 +144,12 @@ 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 */
-#if defined(HAVE_CURL) && 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)
@@ -191,50 +200,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,
@@ -282,8 +247,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;
 
@@ -295,7 +259,7 @@ static STATUS _http_send_chunk(const void *data, const size_t begin,
 /* }}} */
 
 /* {{{ HAVE_CURL */
-#if defined(HAVE_CURL) && 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)
@@ -471,12 +435,9 @@ static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *opti
 	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)
+#ifdef 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;
@@ -504,19 +465,23 @@ static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *opti
 		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)) {
@@ -589,7 +554,7 @@ static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *opti
 			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, 1024, "%s: %s", header_key, Z_STRVAL_PP(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));
 			}
@@ -604,13 +569,17 @@ static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *opti
 /* {{{ static inline char *http_curl_getinfoname(CURLINFO) */
 static inline char *_http_curl_getinfoname(CURLINFO i TSRMLS_DC)
 {
-#define CASE(I) case CURLINFO_ ##I : return #I
+#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, */
@@ -647,14 +616,16 @@ static inline char *_http_curl_getinfoname(CURLINFO i TSRMLS_DC)
 		CASE(REDIRECT_TIME);
 		/* CURLINFO_REDIRECT_COUNT			=	CURLINFO_LONG	+20, */
 		CASE(REDIRECT_COUNT);
-		/* CURLINFO_PRIVATE					=	CURLINFO_STRING	+21, */
+		/* 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;
@@ -681,7 +652,7 @@ static inline void _http_curl_getinfo_ex(CURL *ch, CURLINFO i, zval *array TSRML
 			{
 				double d;
 				if (CURLE_OK == curl_easy_getinfo(ch, i, &d)) {
-					add_assoc_double(array, key, (double) d);
+					add_assoc_double(array, key, d);
 				}
 			}
 			break;
@@ -690,7 +661,7 @@ static inline void _http_curl_getinfo_ex(CURL *ch, CURLINFO i, zval *array TSRML
 			{
 				long l;
 				if (CURLE_OK == curl_easy_getinfo(ch, i, &l)) {
-					add_assoc_long(array, key, (long) l);
+					add_assoc_long(array, key, l);
 				}
 			}
 			break;
@@ -702,16 +673,18 @@ static inline void _http_curl_getinfo_ex(CURL *ch, CURLINFO i, zval *array TSRML
 /* {{{ static inline http_curl_getinfo(CURL, HashTable *) */
 static inline void _http_curl_getinfo(CURL *ch, HashTable *info TSRMLS_DC)
 {
-	zval *array;
-
-	MAKE_STD_ZVAL(array);
-	Z_ARRVAL_P(array) = info;
+	zval array;
+	Z_ARRVAL(array) = info;
 
-#define INFO(I) http_curl_getinfo_ex(ch, CURLINFO_ ##I , array)
+#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, */
@@ -752,15 +725,19 @@ static inline void _http_curl_getinfo(CURL *ch, HashTable *info TSRMLS_DC)
 	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
-	efree(array);
 }
 /* }}} */
 
+#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)
@@ -806,8 +783,44 @@ static int check_tzone(char *tzone)
 }
 /* }}} */
 
-#endif
-/* }}} HAVE_CURL */
+/* static char *pretty_key(char *, int, int, int) */
+static 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 */
 
@@ -817,7 +830,7 @@ 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);
+	char *date = ecalloc(31, 1);
 
 	gmtime = php_gmtime_r(&t, &tmbuf);
 	snprintf(date, 30,
@@ -1000,6 +1013,91 @@ 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,
+	const http_send_mode data_mode TSRMLS_DC)
+{
+	char ssb_buf[128] = {0};
+	unsigned char digest[16];
+	PHP_MD5_CTX ctx;
+	char *new_etag = ecalloc(33, 1);
+
+	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 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)
+{
+	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 int http_is_range_request(void) */
+PHP_HTTP_API 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);
+}
+/* }}} */
+
 /* {{{ inline STATUS http_send_status(int) */
 PHP_HTTP_API inline STATUS _http_send_status(const int status TSRMLS_DC)
 {
@@ -1069,6 +1167,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(sizeof(php_ob_buffer *), count);
+
+		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)
 {
@@ -1083,12 +1225,6 @@ PHP_HTTP_API int _http_modified_match(const char *entry, const time_t t TSRMLS_D
 		chr_ptr = 0;
 	}
 	retval = (t <= http_parse_date(modified));
-#if defined(PHP_DEBUG)
-	fprintf(stderr,
-		"\nComparing Last-Modified %s(%s)==%d:\n\t%d\n\t%d\n\n",
-		get_active_function_name(TSRMLS_C), entry, retval, t,
-		http_parse_date(modified));
-#endif
 	efree(modified);
 	return retval;
 }
@@ -1115,12 +1251,6 @@ 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));
 	}
-#if defined(PHP_DEBUG)
-	fprintf(stderr,
-		"\nComparing E-Tag %s(%s)==%d:\n\t<%s>\n\t<%s>\n\n",
-		get_active_function_name(TSRMLS_C), entry, result,
-		Z_STRVAL_P(zetag), quoted_etag);
-#endif
 	efree(quoted_etag);
 	return result;
 }
@@ -1145,15 +1275,14 @@ PHP_HTTP_API STATUS _http_send_last_modified(const time_t 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);
-	efree(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)) {
@@ -1161,7 +1290,139 @@ PHP_HTTP_API STATUS _http_send_etag(const char *etag,
 	}
 	HTTP_G(etag) = estrdup(etag);
 
-	return ret;
+	etag_header = ecalloc(sizeof("ETag: \"\"") + etag_len, 1);
+	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 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(sizeof("Cache-Control: ") + cc_len, 1);
+
+	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(sizeof("Content-Type: ") + ct_len, 1);
+	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(sizeof("Content-Disposition: inline; filename=\"\"") + f_len, 1);
+		sprintf(cd_header, "Content-Disposition: inline; filename=\"%s\"", filename);
+	} else {
+		cd_header = ecalloc(sizeof("Content-Disposition: attachment; filename=\"\"") + f_len, 1);
+		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;
 }
 /* }}} */
 
@@ -1311,7 +1572,7 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(zval *zranges,
 
 	if (strncmp(range, "bytes=", strlen("bytes="))) {
 		php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Range header misses bytes=");
-		return RANGE_ERR;
+		return RANGE_NO;
 	}
 
 	ptr = &begin;
@@ -1417,7 +1678,7 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(zval *zranges,
 			break;
 
 			default:
-				return RANGE_ERR;
+				return RANGE_NO;
 			break;
 		}
 	} while (c != 0);
@@ -1429,16 +1690,17 @@ 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)
 {
-	zval **zrange;
+	int c;
 	long **begin, **end;
-	char range_header[255], multi_header[68] = "Content-Type: multipart/byteranges; boundary=", bound[23], preface[1024];
-	int i, c;
+	zval **zrange;
 
 	/* Send HTTP 206 Partial Content */
 	http_send_status(206);
 
 	/* single range */
 	if ((c = zend_hash_num_elements(Z_ARRVAL_P(zranges))) == 1) {
+		char range_header[256] = {0};
+
 		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);
@@ -1452,37 +1714,52 @@ PHP_HTTP_API STATUS _http_send_ranges(zval *zranges, const void *data, const siz
 	}
 
 	/* multi range */
+	else {
+		int i;
+		char bound[23] = {0}, preface[1024] = {0},
+			multi_header[68] = "Content-Type: multipart/byteranges; boundary=";
+
+		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 */
+		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(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
+			);
 
-		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);
-	}
+			php_body_write(preface, strlen(preface) TSRMLS_CC);
+			http_send_chunk(data, **begin, **end + 1, mode);
+		}
 
-	/* write boundary once more */
-	php_body_write("\r\n", 1 TSRMLS_CC);
-	php_body_write(bound, strlen(bound) TSRMLS_CC);
+		/* write boundary once more */
+		php_body_write(HTTP_CRLF, 2 TSRMLS_CC);
+		php_body_write(bound, strlen(bound) TSRMLS_CC);
 
-	return SUCCESS;
+		return SUCCESS;
+	}
 }
 /* }}} */
 
@@ -1490,7 +1767,6 @@ PHP_HTTP_API STATUS _http_send_ranges(zval *zranges, const void *data, const siz
 PHP_HTTP_API STATUS _http_send(const void *data_ptr, const size_t data_size,
 	const http_send_mode data_mode TSRMLS_DC)
 {
-	char *new_etag = NULL;
 	int is_range_request = http_is_range_request();
 
 	if (!data_ptr) {
@@ -1499,24 +1775,23 @@ PHP_HTTP_API STATUS _http_send(const void *data_ptr, const size_t data_size,
 
 	/* etag handling */
 	if (HTTP_G(etag_started)) {
-		new_etag = (char *) emalloc(33);
-
-		/* never ever use the output to compute the ETag if http_send() is used */
+		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 ((!is_range_request) && 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);
 	}
 
 	/* send 304 Not Modified if last-modified matches*/
@@ -1583,7 +1858,7 @@ PHP_HTTP_API STATUS _http_send_data(const zval *zdata TSRMLS_DC)
 		return FAILURE;
 	}
 
-	return http_send(zdata, Z_STRLEN_P(zdata), SEND_DATA);
+	return http_send(Z_STRVAL_P(zdata), Z_STRLEN_P(zdata), SEND_DATA);
 }
 /* }}} */
 
@@ -1627,7 +1902,7 @@ PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded,
 	char *d_ptr;
 
 	*decoded_len = 0;
-	*decoded = (char *) ecalloc(1, encoded_len);
+	*decoded = (char *) ecalloc(encoded_len, 1);
 	d_ptr = *decoded;
 	e_ptr = encoded;
 
@@ -1647,8 +1922,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) {
@@ -1657,20 +1946,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;
@@ -1680,15 +1958,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 ((response - header + 4) < response_len) {
 		if (	(*response++ == '\r') &&
 				(*response++ == '\n') &&
 				(*response++ == '\r') &&
@@ -1704,52 +1981,101 @@ PHP_HTTP_API void _http_split_response(const zval *zresponse, zval *zheaders,
 		Z_TYPE_P(zbody) = IS_NULL;
 	}
 
-	/* check for HTTP status - FIXXME: strchr() */
+	return http_parse_headers(header, body ? body - header : response_len, zheaders);
+}
+/* }}} */
+
+/* {{{ STATUS http_parse_headers(char *, long, zval *) */
+PHP_HTTP_API STATUS _http_parse_headers(char *header, int header_len, zval *array TSRMLS_DC)
+{
+	char *colon = NULL, *line = NULL, *begin = header;
+
+	if (header_len < 2) {
+		return FAILURE;
+	}
+
+	/* status code */
 	if (!strncmp(header, "HTTP/1.", 7)) {
-		char *end = strchr(header, '\r');
-		add_assoc_stringl(zheaders, "Status",
+		char *end = strstr(header, HTTP_CRLF);
+		add_assoc_stringl(array, "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')) {
+	line = header;
+
+	while (header_len >= (line - begin)) {
+		int value_len = 0;
+
+		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')))) {
+
+					/* skip empty key */
+					if (header != colon) {
 						char *key = estrndup(header, colon - header);
-						add_assoc_stringl(zheaders, key,
-							colon + 2, line - colon - 3, 1);
+						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);
-
-						colon = NULL;
-						header += line - header + 1;
 					}
-				break;
 
-				case ':':
-					if (!colon) {
-						colon = line - 1;
-					}
-				break;
-			}
+					colon = NULL;
+					value_len = 0;
+					header += line - header;
+				}
+			break;
+
+			case ':':
+				if (!colon) {
+					colon = line - 1;
+				}
+			break;
 		}
 	}
+	return SUCCESS;
+}
+/* }}} */
+
+/* {{{ void http_get_request_headers(zval *) */
+PHP_HTTP_API void _http_get_request_headers(zval *array TSRMLS_DC)
+{
+    char *key;
+
+    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)) {
+            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);
+        }
+    }
 }
 /* }}} */
 
 /* {{{ HAVE_CURL */
-#if defined(HAVE_CURL) && 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 rs;
 	CURL *ch = curl_easy_init();
 
 	if (!ch) {
@@ -1757,11 +2083,22 @@ PHP_HTTP_API STATUS _http_get(const char *URL, HashTable *options,
 		return FAILURE;
 	}
 
+	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)) {
-		curl_easy_cleanup(ch);
 		http_curl_freebuf(CURLBUF_EVRY);
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
 		return FAILURE;
@@ -1769,18 +2106,15 @@ PHP_HTTP_API STATUS _http_get(const char *URL, HashTable *options,
 	if (info) {
 		http_curl_getinfo(ch, info);
 	}
-	curl_easy_cleanup(ch);
-
 	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) {
@@ -1788,12 +2122,22 @@ PHP_HTTP_API STATUS _http_head(const char *URL, HashTable *options,
 		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)) {
-		curl_easy_cleanup(ch);
 		http_curl_freebuf(CURLBUF_HDRS);
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
 		return FAILURE;
@@ -1801,26 +2145,33 @@ PHP_HTTP_API STATUS _http_head(const char *URL, HashTable *options,
 	if (info) {
 		http_curl_getinfo(ch, info);
 	}
-	curl_easy_cleanup(ch);
-
 	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();
 
 	if (!ch) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize curl");
 		return FAILURE;
 	}
+	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);
@@ -1828,7 +2179,6 @@ PHP_HTTP_API STATUS _http_post_data(const char *URL, char *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;
@@ -1836,10 +2186,7 @@ PHP_HTTP_API STATUS _http_post_data(const char *URL, char *postdata,
 	if (info) {
 		http_curl_getinfo(ch, info);
 	}
-	curl_easy_cleanup(ch);
-
 	http_curl_movebuf(CURLBUF_EVRY, data, data_len);
-
 	return SUCCESS;
 }
 /* }}} */
@@ -1871,12 +2218,12 @@ PHP_HTTP_API STATUS _http_post_array(const char *URL, HashTable *postarray,
 #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);
 }
 /* }}} */