X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_send_api.c;h=93271dbd68ac407689eb09bd9b3f50881ddae0a9;hp=9318efd738dd354bf25cb15c69281bc6af328445;hb=669d2e6a8bdc642b6b52693f4593f199ddd7e8d2;hpb=cf9967800843ea01e77b374b4d78fad4bc18a3f6

diff --git a/http_send_api.c b/http_send_api.c
index 9318efd..93271db 100644
--- a/http_send_api.c
+++ b/http_send_api.c
@@ -1,190 +1,262 @@
 /*
-   +----------------------------------------------------------------------+
-   | PECL :: http                                                         |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license, that  |
-   | is bundled with this package in the file LICENSE, and is available   |
-   | through the world-wide-web at http://www.php.net/license/3_0.txt.    |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 2004-2005 Michael Wallner <mike@php.net>               |
-   +----------------------------------------------------------------------+
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
 
-#ifdef HAVE_CONFIG_H
-#	include "config.h"
-#endif
+#define HTTP_WANT_SAPI
+#define HTTP_WANT_ZLIB
+#define HTTP_WANT_MAGIC
+#include "php_http.h"
 
-#include "php.h"
 #include "php_streams.h"
 #include "ext/standard/php_lcg.h"
-#include "SAPI.h"
 
-#include "php_http.h"
-#include "php_http_std_defs.h"
 #include "php_http_api.h"
-#include "php_http_send_api.h"
-#include "php_http_headers_api.h"
-#include "php_http_date_api.h"
 #include "php_http_cache_api.h"
+#include "php_http_date_api.h"
+#include "php_http_encoding_api.h"
+#include "php_http_headers_api.h"
+#include "php_http_send_api.h"
 
-ZEND_EXTERN_MODULE_GLOBALS(http);
+#define http_flush(d, l) _http_flush(NULL, (d), (l) TSRMLS_CC)
+/* {{{ static inline void http_flush() */
+static inline void _http_flush(void *nothing, const char *data, size_t data_len TSRMLS_DC)
+{
+	PHPWRITE(data, data_len);
+	php_end_ob_buffer(1, 1 TSRMLS_CC);
+	sapi_flush(TSRMLS_C);
+	
+#define HTTP_MSEC(s) (s * 1000)
+#define HTTP_USEC(s) (HTTP_MSEC(s) * 1000)
+#define HTTP_NSEC(s) (HTTP_USEC(s) * 1000)
+#define HTTP_NANOSEC (1000 * 1000 * 1000)
+#define HTTP_DIFFSEC (0.001)
+
+	if (HTTP_G->send.throttle_delay >= HTTP_DIFFSEC) {
+#if defined(PHP_WIN32)
+		Sleep((DWORD) HTTP_MSEC(HTTP_G->send.throttle_delay));
+#elif defined(HAVE_USLEEP)
+		usleep(HTTP_USEC(HTTP_G->send.throttle_delay));
+#elif defined(HAVE_NANOSLEEP)
+		struct timespec req, rem;
+
+		req.tv_sec = (time_t) HTTP_G->send.throttle_delay;
+		req.tv_nsec = HTTP_NSEC(HTTP_G->send.throttle_delay) % HTTP_NANOSEC;
+
+		while (nanosleep(&req, &rem) && (errno == EINTR) && (HTTP_NSEC(rem.tv_sec) + rem.tv_nsec) > HTTP_NSEC(HTTP_DIFFSEC))) {
+			req.tv_sec = rem.tv_sec;
+			req.tv_nsec = rem.tv_nsec;
+		}
+#endif
+	}
+}
+/* }}} */
 
-#define http_send_chunk(d, b, e, m) _http_send_chunk((d), (b), (e), (m) TSRMLS_CC)
-/* {{{ static STATUS http_send_chunk(const void *, size_t, size_t, http_send_mode) */
-static STATUS _http_send_chunk(const void *data, size_t begin, size_t end, http_send_mode mode TSRMLS_DC)
+/* {{{ http_send_response_start */
+#define http_send_response_start(b, cl) _http_send_response_start((b), (cl) TSRMLS_CC)
+static inline void _http_send_response_start(void **buffer, size_t content_length TSRMLS_DC)
 {
-	long len = end - begin;
+	int encoding;
+	
+	if ((encoding = http_encoding_response_start(content_length))) {
+#ifdef HTTP_HAVE_ZLIB
+		*buffer = http_encoding_deflate_stream_init(NULL, 
+			(encoding == HTTP_ENCODING_GZIP) ? 
+				HTTP_DEFLATE_TYPE_GZIP : HTTP_DEFLATE_TYPE_ZLIB);
+#endif
+	}
+}
+/* }}} */
 
+/* {{{ http_send_response_data_plain */
+#define http_send_response_data_plain(b, d, dl) _http_send_response_data_plain((b), (d), (dl) TSRMLS_CC)
+static inline void _http_send_response_data_plain(void **buffer, const char *data, size_t data_len TSRMLS_DC)
+{
+	if (HTTP_G->send.deflate.encoding) {
+#ifdef HTTP_HAVE_ZLIB
+		char *encoded;
+		size_t encoded_len;
+		http_encoding_stream *s = *((http_encoding_stream **) buffer);
+		
+		http_encoding_deflate_stream_update(s, data, data_len, &encoded, &encoded_len);
+		phpstr_chunked_output((phpstr **) &s->storage, encoded, encoded_len, HTTP_G->send.buffer_size, _http_flush, NULL TSRMLS_CC);
+		efree(encoded);
+#else
+		http_error(HE_ERROR, HTTP_E_RESPONSE, "Attempt to send GZIP response despite being able to do so; please report this bug");
+#endif
+	} else {
+		phpstr_chunked_output((phpstr **) buffer, data, data_len, HTTP_G->send.buffer_size, _http_flush, NULL TSRMLS_CC);
+	}
+}
+/* }}} */
+
+/* {{{ http_send_response_data_fetch */
+#define http_send_response_data_fetch(b, d, l, m, s, e) _http_send_response_data_fetch((b), (d), (l), (m), (s), (e) TSRMLS_CC)
+static inline void _http_send_response_data_fetch(void **buffer, const void *data, size_t data_len, http_send_mode mode, size_t begin, size_t end TSRMLS_DC)
+{
+	char *buf;
+	long got, len = end - begin;
+	
 	switch (mode)
 	{
 		case SEND_RSRC:
 		{
-			char *buf;
-			size_t read = 0;
 			php_stream *s = (php_stream *) data;
 
-			if (php_stream_seek(s, begin, SEEK_SET)) {
-				return FAILURE;
-			}
-
-			buf = (char *) ecalloc(1, HTTP_SENDBUF_SIZE);
-			/* read into buf and write out */
-			while ((len -= HTTP_SENDBUF_SIZE) >= 0) {
-				if (!(read = php_stream_read(s, buf, HTTP_SENDBUF_SIZE))) {
-					efree(buf);
-					return FAILURE;
-				}
-				if (read - php_body_write(buf, read TSRMLS_CC)) {
-					efree(buf);
-					return FAILURE;
-				}
-				/* ob_flush() && flush() */
-				php_end_ob_buffer(1, 1 TSRMLS_CC);
-				sapi_flush(TSRMLS_C);
-			}
-
-			/* read & write left over */
-			if (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;
-					}
-				} else {
-					efree(buf);
-					return FAILURE;
+			if (SUCCESS == php_stream_seek(s, begin, SEEK_SET)) {
+				buf = emalloc(HTTP_SENDBUF_SIZE);
+				
+				while (len > 0) {
+					got = php_stream_read(s, buf, MIN(len, HTTP_SENDBUF_SIZE));
+					http_send_response_data_plain(buffer, buf, got);
+					len -= got;
 				}
-				/* ob_flush() & flush() */
-				php_end_ob_buffer(1, 1 TSRMLS_CC);
-				sapi_flush(TSRMLS_C);
+				
+				efree(buf);
 			}
-			efree(buf);
-			return SUCCESS;
 		}
+		break;
 
 		case SEND_DATA:
 		{
-			char *s = (char *) data + begin;
-
-			while ((len -= HTTP_SENDBUF_SIZE) >= 0) {
-				if (HTTP_SENDBUF_SIZE - php_body_write(s, HTTP_SENDBUF_SIZE TSRMLS_CC)) {
-					return FAILURE;
-				}
-				s += HTTP_SENDBUF_SIZE;
-				/* ob_flush() & flush() */
-				php_end_ob_buffer(1, 1 TSRMLS_CC);
-				sapi_flush(TSRMLS_C);
-			}
-
-			/* write left over */
-			if (len) {
-				if (HTTP_SENDBUF_SIZE + len - php_body_write(s, HTTP_SENDBUF_SIZE + len TSRMLS_CC)) {
-						return FAILURE;
-				}
-				/* ob_flush() & flush() */
-				php_end_ob_buffer(1, 1 TSRMLS_CC);
-				sapi_flush(TSRMLS_C);
+			buf = (char *) data + begin;
+			
+			while (len > 0) {
+				got = MIN(len, HTTP_SENDBUF_SIZE);
+				http_send_response_data_plain(buffer, buf, got);
+				len -= got;
+				buf += got;
 			}
-			return SUCCESS;
 		}
-
-		default:
-			return FAILURE;
 		break;
+
+		EMPTY_SWITCH_DEFAULT_CASE();
 	}
 }
 /* }}} */
 
+/* {{{ http_send_response_finish */
+#define http_send_response_finish(b) _http_send_response_finish((b) TSRMLS_CC)
+static inline void _http_send_response_finish(void **buffer TSRMLS_DC)
+{
+	if (HTTP_G->send.deflate.encoding) {
+#ifdef HTTP_HAVE_ZLIB
+		char *encoded = NULL;
+		size_t encoded_len = 0;
+		http_encoding_stream *s = *((http_encoding_stream **) buffer);
+		
+		http_encoding_deflate_stream_finish(s, &encoded, &encoded_len);
+		phpstr_chunked_output((phpstr **) &s->storage, encoded, encoded_len, 0, _http_flush, NULL TSRMLS_CC);
+		http_encoding_deflate_stream_free(&s);
+		STR_FREE(encoded);
+#else
+		http_error(HE_ERROR, HTTP_E_RESPONSE, "Attempt to send GZIP response despite being able to do so; please report this bug");
+#endif
+	} else {
+		phpstr_chunked_output((phpstr **) buffer, NULL, 0, 0, _http_flush, NULL TSRMLS_CC);
+	}
+}
+/* }}} */
+
+/* {{{ */
+PHP_MINIT_FUNCTION(http_send)
+{
+	HTTP_LONG_CONSTANT("HTTP_REDIRECT", HTTP_REDIRECT);
+	HTTP_LONG_CONSTANT("HTTP_REDIRECT_PERM", HTTP_REDIRECT_PERM);
+	HTTP_LONG_CONSTANT("HTTP_REDIRECT_FOUND", HTTP_REDIRECT_FOUND);
+	HTTP_LONG_CONSTANT("HTTP_REDIRECT_POST", HTTP_REDIRECT_POST);
+	HTTP_LONG_CONSTANT("HTTP_REDIRECT_PROXY", HTTP_REDIRECT_PROXY);
+	HTTP_LONG_CONSTANT("HTTP_REDIRECT_TEMP", HTTP_REDIRECT_TEMP);
+	
+	return SUCCESS;
+}
+/* }}} */
+
+
+/* {{{ STATUS http_send_header(char *, char *, zend_bool) */
+PHP_HTTP_API STATUS _http_send_header_ex(const char *name, size_t name_len, const char *value, size_t value_len, zend_bool replace, char **sent_header TSRMLS_DC)
+{
+	STATUS ret;
+	size_t header_len = sizeof(": ") + name_len + value_len + 1;
+	char *header = emalloc(header_len + 1);
+
+	header[header_len] = '\0';
+	header_len = snprintf(header, header_len, "%s: %s", name, value);
+	ret = http_send_header_string_ex(header, header_len, replace);
+	if (sent_header) {
+		*sent_header = header;
+	} else {
+		efree(header);
+	}
+	return ret;
+}
+/* }}} */
 
 /* {{{ STATUS http_send_status_header(int, char *) */
-PHP_HTTP_API STATUS _http_send_status_header(int status, const char *header TSRMLS_DC)
+PHP_HTTP_API STATUS _http_send_status_header_ex(int status, const char *header, size_t header_len, zend_bool replace TSRMLS_DC)
 {
 	STATUS ret;
-	sapi_header_line h = {(char *) header, strlen(header), status};
-	if (SUCCESS != (ret = sapi_header_op(SAPI_HEADER_REPLACE, &h TSRMLS_CC))) {
-		http_error_ex(E_WARNING, HTTP_E_HEADER, "Could not send header: %s (%d)", header, status);
+	sapi_header_line h = {(char *) header, header_len, status};
+	if (SUCCESS != (ret = sapi_header_op(replace ? SAPI_HEADER_REPLACE : SAPI_HEADER_ADD, &h TSRMLS_CC))) {
+		http_error_ex(HE_WARNING, HTTP_E_HEADER, "Could not send header: %s (%d)", header, status);
 	}
 	return ret;
 }
 /* }}} */
 
 /* {{{ STATUS http_send_last_modified(int) */
-PHP_HTTP_API STATUS _http_send_last_modified(time_t t TSRMLS_DC)
+PHP_HTTP_API STATUS _http_send_last_modified_ex(time_t t, char **sent_header TSRMLS_DC)
 {
-	char *date = NULL;
-	if (date = http_date(t)) {
-		char modified[96] = "Last-Modified: ";
-		strcat(modified, date);
-		efree(date);
-
-		/* remember */
-		HTTP_G(lmod) = t;
+	STATUS ret;
+	char *date = http_date(t);
 
-		return http_send_header(modified);
+	if (!date) {
+		return FAILURE;
 	}
-	return FAILURE;
+
+	ret = http_send_header_ex("Last-Modified", lenof("Last-Modified"), date, strlen(date), 1, sent_header);
+	efree(date);
+
+	/* remember */
+	HTTP_G->send.last_modified = t;
+
+	return ret;
 }
 /* }}} */
 
 /* {{{ STATUS http_send_etag(char *, size_t) */
-PHP_HTTP_API STATUS _http_send_etag(const char *etag, size_t etag_len TSRMLS_DC)
+PHP_HTTP_API STATUS _http_send_etag_ex(const char *etag, size_t etag_len, char **sent_header TSRMLS_DC)
 {
 	STATUS status;
 	char *etag_header;
+	size_t etag_header_len;
 
 	if (!etag_len){
-		http_error_ex(E_WARNING, HTTP_E_HEADER, "Attempt to send empty ETag (previous: %s)\n", HTTP_G(etag));
+		http_error_ex(HE_WARNING, HTTP_E_HEADER, "Attempt to send empty ETag (previous: %s)\n", HTTP_G->send.unquoted_etag);
 		return FAILURE;
 	}
 
+	etag_header_len = spprintf(&etag_header, 0, "ETag: \"%s\"", etag);
+	status = http_send_header_string_ex(etag_header, etag_header_len, 1);
+	
 	/* 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);
-	status = http_send_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, size_t cc_len TSRMLS_DC)
-{
-	STATUS status;
-	char *cc_header = ecalloc(1, sizeof("Cache-Control: ") + cc_len);
+	STR_SET(HTTP_G->send.unquoted_etag, estrndup(etag, etag_len));
 
-	sprintf(cc_header, "Cache-Control: %s", cache_control);
-	status = http_send_header(cc_header);
-	efree(cc_header);
+	if (sent_header) {
+		*sent_header = etag_header;
+	} else {
+		efree(etag_header);
+	}
+	
 	return status;
 }
 /* }}} */
@@ -192,25 +264,13 @@ PHP_HTTP_API STATUS _http_send_cache_control(const char *cache_control, size_t c
 /* {{{ STATUS http_send_content_type(char *, size_t) */
 PHP_HTTP_API STATUS _http_send_content_type(const char *content_type, size_t ct_len TSRMLS_DC)
 {
-	STATUS status;
-	char *ct_header;
-
-	if (!strchr(content_type, '/')) {
-		http_error_ex(E_WARNING, HTTP_E_PARAM, "Content-Type '%s' doesn't seem to consist of a primary and a secondary part", content_type);
-		return FAILURE;
-	}
+	HTTP_CHECK_CONTENT_TYPE(content_type, return FAILURE);
 
 	/* remember for multiple ranges */
-	if (HTTP_G(ctype)) {
-		efree(HTTP_G(ctype));
-	}
-	HTTP_G(ctype) = estrndup(content_type, ct_len);
+	STR_FREE(HTTP_G->send.content_type);
+	HTTP_G->send.content_type = estrndup(content_type, ct_len);
 
-	ct_header = ecalloc(1, sizeof("Content-Type: ") + ct_len);
-	sprintf(ct_header, "Content-Type: %s", content_type);
-	status = http_send_header(ct_header);
-	efree(ct_header);
-	return status;
+	return http_send_header_ex("Content-Type", lenof("Content-Type"), content_type, ct_len, 1, NULL);
 }
 /* }}} */
 
@@ -228,167 +288,179 @@ PHP_HTTP_API STATUS _http_send_content_disposition(const char *filename, size_t
 		sprintf(cd_header, "Content-Disposition: attachment; filename=\"%s\"", filename);
 	}
 
-	status = http_send_header(cd_header);
+	status = http_send_header_string(cd_header);
 	efree(cd_header);
 	return status;
 }
 /* }}} */
 
-/* {{{ STATUS http_send_ranges(HashTable *, void *, size_t, http_send_mode) */
-PHP_HTTP_API STATUS _http_send_ranges(HashTable *ranges, const void *data, size_t size, http_send_mode mode TSRMLS_DC)
-{
-	long **begin, **end;
-	zval **zrange;
-
-	/* single range */
-	if (zend_hash_num_elements(ranges) == 1) {
-		char range_header[256] = {0};
-
-		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;
-		}
-
-		/* Send HTTP 206 Partial Content */
-		http_send_status(206);
-
-		/* send content range header */
-		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, **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(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);
-		}
-
-		/* 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;
-	}
-}
-/* }}} */
-
 /* {{{ STATUS http_send(void *, size_t, http_send_mode) */
-PHP_HTTP_API STATUS _http_send(const void *data_ptr, size_t data_size, http_send_mode data_mode TSRMLS_DC)
+PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_send_mode data_mode, zend_bool no_cache TSRMLS_DC)
 {
+	void *s = NULL;
 	HashTable ranges;
 	http_range_status range_status;
-	int cache_etag = 0;
-
+	
 	if (!data_ptr) {
 		return FAILURE;
 	}
 	if (!data_size) {
 		return SUCCESS;
 	}
-
-	/* stop on-the-fly etag generation */
-	if (cache_etag = HTTP_G(etag_started)) {
-		/* interrupt */
-		HTTP_G(etag_started) = 0;
-		/* never ever use the output to compute the ETag if http_send() is used */
-		php_end_ob_buffers(0 TSRMLS_CC);
-	}
+	
+	/* enable partial dl and resume */
+	http_send_header_string("Accept-Ranges: bytes");
 
 	zend_hash_init(&ranges, 0, NULL, ZVAL_PTR_DTOR, 0);
 	range_status = http_get_request_ranges(&ranges, data_size);
 
-	if (range_status == RANGE_ERR) {
-		zend_hash_destroy(&ranges);
-		http_send_status(416);
-		return FAILURE;
-	}
-
-	/* Range Request - only send ranges if entity hasn't changed */
-	if (	range_status == RANGE_OK &&
-			http_etag_match_ex("HTTP_IF_MATCH", HTTP_G(etag), 0) &&
-			http_modified_match_ex("HTTP_IF_UNMODIFIED_SINCE", HTTP_G(lmod), 0)) {
-		STATUS result = http_send_ranges(&ranges, data_ptr, data_size, data_mode);
-		zend_hash_destroy(&ranges);
-		return result;
-	}
-
-	zend_hash_destroy(&ranges);
-
-	/* send 304 Not Modified if etag matches */
-	if (cache_etag) {
-		char *etag = NULL;
-		int etag_match = 0;
-
-		if (!(etag = http_etag(data_ptr, data_size, data_mode))) {
+	switch (range_status)
+	{
+		case RANGE_ERR:
+		{
+			zend_hash_destroy(&ranges);
+			http_send_status(416);
 			return FAILURE;
 		}
-
-		http_send_etag(etag, 32);
-		etag_match = http_etag_match("HTTP_IF_NONE_MATCH", etag);
-		efree(etag);
-
-		if (etag_match) {
-			return http_send_status(304);
+		case RANGE_OK:
+		{
+			/* Range Request - only send ranges if entity hasn't changed */
+			if (	http_got_server_var("HTTP_IF_RANGE") &&
+					!http_match_etag("HTTP_IF_RANGE", HTTP_G->send.unquoted_etag) &&
+					!http_match_last_modified("HTTP_IF_RANGE", HTTP_G->send.last_modified)) {
+				/* fallthrough to send full entity with 200 Ok */
+				no_cache = 1;
+			} else if (	!http_match_etag_ex("HTTP_IF_MATCH", HTTP_G->send.unquoted_etag, 0) ||
+						!http_match_last_modified_ex("HTTP_IF_UNMODIFIED_SINCE", HTTP_G->send.last_modified, 0) ||
+						!http_match_last_modified_ex("HTTP_UNLESS_MODIFIED_SINCE", HTTP_G->send.last_modified, 0)) {
+				/* 412 Precondition failed */
+				zend_hash_destroy(&ranges);
+				http_send_status(412);
+				return FAILURE;
+			} else if (zend_hash_num_elements(&ranges) == 1) {
+				/* single range */
+				zval **range, **begin, **end;
+				
+				if (	SUCCESS != zend_hash_index_find(&ranges, 0, (void *) &range) ||
+						SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(range), 0, (void *) &begin) ||
+						SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(range), 1, (void *) &end)) {
+					/* this should never happen */
+					zend_hash_destroy(&ranges);
+					http_send_status(500);
+					return FAILURE;
+				} else {
+					char range_header_str[256];
+					size_t range_header_len;
+					
+					range_header_len = snprintf(range_header_str, lenof(range_header_str), "Content-Range: bytes %ld-%ld/%zu", Z_LVAL_PP(begin), Z_LVAL_PP(end), data_size);
+					http_send_status_header_ex(206, range_header_str, range_header_len, 1);
+					http_send_response_start(&s, Z_LVAL_PP(end)-Z_LVAL_PP(begin)+1);
+					http_send_response_data_fetch(&s, data_ptr, data_size, data_mode, Z_LVAL_PP(begin), Z_LVAL_PP(end) + 1);
+					http_send_response_finish(&s);
+					zend_hash_destroy(&ranges);
+					return SUCCESS;
+				}
+			} else {
+				/* multi range */
+				HashPosition pos;
+				zval **range, **begin, **end;
+				const char *content_type = HTTP_G->send.content_type;
+				char boundary_str[32], range_header_str[256];
+				size_t boundary_len, range_header_len;
+				
+				boundary_len = snprintf(boundary_str, lenof(boundary_str), "%lu%0.9f", (ulong) HTTP_GET_REQUEST_TIME(), (float) php_combined_lcg(TSRMLS_C));
+				range_header_len = snprintf(range_header_str, lenof(range_header_str), "Content-Type: multipart/byteranges; boundary=%s", boundary_str);
+				
+				http_send_status_header_ex(206, range_header_str, range_header_len, 1);
+				http_send_response_start(&s, 0);
+				
+				if (!content_type) {
+					content_type = "application/x-octetstream";
+				}
+				
+				FOREACH_HASH_VAL(pos, &ranges, range) {
+					if (	SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(range), 0, (void *) &begin) &&
+							SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(range), 1, (void *) &end)) {
+						char preface_str[512];
+						size_t preface_len;
+
+#define HTTP_RANGE_PREFACE \
+	HTTP_CRLF "--%s" \
+	HTTP_CRLF "Content-Type: %s" \
+	HTTP_CRLF "Content-Range: bytes %ld-%ld/%zu" \
+	HTTP_CRLF HTTP_CRLF
+						
+						preface_len = snprintf(preface_str, lenof(preface_str), HTTP_RANGE_PREFACE, boundary_str, content_type, Z_LVAL_PP(begin), Z_LVAL_PP(end), data_size);
+						http_send_response_data_plain(&s, preface_str, preface_len);
+						http_send_response_data_fetch(&s, data_ptr, data_size, data_mode, Z_LVAL_PP(begin), Z_LVAL_PP(end) + 1);
+					}
+				}
+				
+				http_send_response_data_plain(&s, HTTP_CRLF "--", lenof(HTTP_CRLF "--"));
+				http_send_response_data_plain(&s, boundary_str, boundary_len);
+				http_send_response_data_plain(&s, "--", lenof("--"));
+				
+				http_send_response_finish(&s);
+				zend_hash_destroy(&ranges);
+				return SUCCESS;
+			}
+		}
+		case RANGE_NO:
+		{
+			zend_hash_destroy(&ranges);
+
+			/* send 304 Not Modified if etag matches - DON'T return on ETag generation failure */
+			if (!no_cache && (http_interrupt_ob_etaghandler() || (HTTP_G->send.unquoted_etag != NULL))) {
+				char *etag = NULL;
+				
+				if (HTTP_G->send.unquoted_etag) {
+					etag = estrdup(HTTP_G->send.unquoted_etag);
+				}
+				
+				if (etag || (etag = http_etag(data_ptr, data_size, data_mode))) {
+					char *sent_header = NULL;
+					
+					http_send_etag_ex(etag, strlen(etag), &sent_header);
+					if (http_match_etag("HTTP_IF_NONE_MATCH", etag)) {
+						return http_exit_ex(304, sent_header, NULL, 0);
+					} else {
+						STR_FREE(sent_header);
+						/* no caching for Last-Modified if ETags really don't match */
+						no_cache = http_got_server_var("HTTP_IF_NONE_MATCH");
+					}
+					efree(etag);
+				}
+			}
+		
+			/* send 304 Not Modified if last modified matches */
+			if (!no_cache && http_match_last_modified("HTTP_IF_MODIFIED_SINCE", HTTP_G->send.last_modified)) {
+				char *sent_header = NULL;
+				http_send_last_modified_ex(HTTP_G->send.last_modified, &sent_header);
+				return http_exit_ex(304, sent_header, NULL, 0);
+			}
+			
+			/* send full response */
+			http_send_response_start(&s, data_size);
+			http_send_response_data_fetch(&s, data_ptr, data_size, data_mode, 0, data_size);
+			http_send_response_finish(&s);
+			return SUCCESS;
 		}
 	}
-
-	/* send 304 Not Modified if last modified matches */
-	if (http_modified_match("HTTP_IF_MODIFIED_SINCE", HTTP_G(lmod))) {
-		return http_send_status(304);
-	}
-
-	/* send full entity */
-	return http_send_chunk(data_ptr, 0, data_size, data_mode);
+	return FAILURE;
 }
 /* }}} */
 
 /* {{{ STATUS http_send_stream(php_stream *) */
-PHP_HTTP_API STATUS _http_send_stream_ex(php_stream *file, zend_bool close_stream TSRMLS_DC)
+PHP_HTTP_API STATUS _http_send_stream_ex(php_stream *file, zend_bool close_stream, zend_bool no_cache TSRMLS_DC)
 {
 	STATUS status;
+	php_stream_statbuf ssb;
 
-	if ((!file) || php_stream_stat(file, &HTTP_G(ssb))) {
+	if ((!file) || php_stream_stat(file, &ssb)) {
 		return FAILURE;
 	}
 
-	status = http_send(file, HTTP_G(ssb).sb.st_size, SEND_RSRC);
+	status = http_send_ex(file, ssb.sb.st_size, SEND_RSRC, no_cache);
 
 	if (close_stream) {
 		php_stream_close(file);
@@ -398,6 +470,68 @@ PHP_HTTP_API STATUS _http_send_stream_ex(php_stream *file, zend_bool close_strea
 }
 /* }}} */
 
+/* {{{ char *http_guess_content_type(char *magic_file, long magic_mode, void *data, size_t size, http_send_mode mode) */
+PHP_HTTP_API char *_http_guess_content_type(const char *magicfile, long magicmode, void *data_ptr, size_t data_len, http_send_mode data_mode TSRMLS_DC)
+{
+	char *ct = NULL;
+
+#ifdef HTTP_HAVE_MAGIC
+	struct magic_set *magic;
+	
+	HTTP_CHECK_OPEN_BASEDIR(magicfile, return NULL);
+	
+	/*	magic_load() fails if MAGIC_MIME is set because it 
+		cowardly adds .mime to the file name */
+	magic = magic_open(magicmode &~ MAGIC_MIME);
+	
+	if (!magic) {
+		http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Invalid magic mode: %ld", magicmode);
+	} else if (-1 == magic_load(magic, magicfile)) {
+		http_error_ex(HE_WARNING, HTTP_E_RUNTIME, "Failed to load magic database '%s' (%s)", magicfile, magic_error(magic));
+	} else {
+		const char *ctype = NULL;
+		
+		magic_setflags(magic, magicmode);
+		
+		switch (data_mode)
+		{
+			case SEND_RSRC:
+			{
+				char *buffer;
+				size_t b_len;
+				
+				b_len = php_stream_copy_to_mem(data_ptr, &buffer, 65536, 0);
+				ctype = magic_buffer(magic, buffer, b_len);
+				efree(buffer);
+			}
+			break;
+			
+			case SEND_DATA:
+				ctype = magic_buffer(magic, data_ptr, data_len);
+			break;
+			
+			default:
+				HTTP_CHECK_OPEN_BASEDIR(data_ptr, magic_close(magic); return NULL);
+				ctype = magic_file(magic, data_ptr);
+			break;
+		}
+		
+		if (ctype) {
+			ct = estrdup(ctype);
+		} else {
+			http_error_ex(HE_WARNING, HTTP_E_RUNTIME, "Failed to guess Content-Type: %s", magic_error(magic));
+		}
+	}
+	if (magic) {
+		magic_close(magic);
+	}
+#else
+	http_error(HE_WARNING, HTTP_E_RUNTIME, "Cannot guess Content-Type; libmagic not available");
+#endif
+	
+	return ct;
+}
+/* }}} */
 
 /*
  * Local variables: