X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_api.c;h=9943cd8f49cf55a516ff9bb3f49edd16b017bcef;hp=b36a32d3a090abdaeacde9cacbe8be1740f37a80;hb=39feb7a7e30bb4b393a6f76aa2f35d4e9275523e;hpb=b46d0197c4402e76c2608ba972e1d05db22a321a

diff --git a/http_api.c b/http_api.c
index b36a32d..9943cd8 100644
--- a/http_api.c
+++ b/http_api.c
@@ -22,6 +22,7 @@
 
 #include "SAPI.h"
 #include "ext/standard/url.h"
+#include "ext/standard/head.h"
 
 #include "php_http.h"
 #include "php_http_std_defs.h"
@@ -36,6 +37,13 @@
 
 #include <ctype.h>
 
+#ifdef HTTP_HAVE_MAGIC
+#	if defined(PHP_WIN32) && !defined(USE_MAGIC_DLL) && !defined(USE_MAGIC_STATIC)
+#		define USE_MAGIC_STATIC
+#	endif
+#	include <magic.h>
+#endif
+
 ZEND_EXTERN_MODULE_GLOBALS(http);
 
 /* char *pretty_key(char *, size_t, zend_bool, zend_bool) */
@@ -78,7 +86,7 @@ STATUS _http_parse_key_list(const char *list, HashTable *items, char separator,
 	int vallen = 0, keylen = 0, done = 0;
 	zval array;
 
-	Z_ARRVAL(array) = items;
+	INIT_ZARR(array, items);
 
 	if (!(val = strchr(list, '='))) {
 		return FAILURE;
@@ -157,24 +165,21 @@ STATUS _http_parse_key_list(const char *list, HashTable *items, char separator,
 /* }}} */
 
 /* {{{ void http_error(long, long, char*) */
-void _http_error_ex(long type, long code, const char *format, ...)
+void _http_error_ex(long type TSRMLS_DC, long code, const char *format, ...)
 {
 	va_list args;
-	TSRMLS_FETCH();
-
+	
 	va_start(args, format);
-	if (type == E_THROW) {
 #ifdef ZEND_ENGINE_2
+	if ((type == E_THROW) || (PG(error_handling) == EH_THROW)) {
 		char *message;
+		
 		vspprintf(&message, 0, format, args);
 		zend_throw_exception(http_exception_get_for_code(code), message, code TSRMLS_CC);
-#else
-		type = E_WARNING;
+		efree(message);
+	} else
 #endif
-	}
-	if (type != E_THROW) {
-		php_verror(NULL, "", type, format, args TSRMLS_CC);
-	}
+	php_verror(NULL, "", type, format, args TSRMLS_CC);
 	va_end(args);
 }
 /* }}} */
@@ -190,11 +195,11 @@ void _http_log_ex(char *file, const char *ident, const char *message TSRMLS_DC)
 	strftime(datetime, sizeof(datetime), "%Y-%m-%d %H:%M:%S", php_localtime_r(&now, &nowtm));
 
 #define HTTP_LOG_WRITE(file, type, msg) \
-	if (file && strlen(file)) { \
+	if (file && *file) { \
 	 	php_stream *log = php_stream_open_wrapper(file, "ab", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL); \
 		 \
 		if (log) { \
-			php_stream_printf(log TSRMLS_CC, "%s [%12s] %32s <%s>%s", datetime, type, msg, SG(request_info).request_uri, PHP_EOL); \
+			php_stream_printf(log TSRMLS_CC, "%s\t[%s]\t%s\t<%s>%s", datetime, type, msg, SG(request_info).request_uri, PHP_EOL); \
 			php_stream_close(log); \
 		} \
 	 \
@@ -217,7 +222,7 @@ STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header
 		}
 	}
 	
-	if (body) {
+	if (php_header(TSRMLS_C) && body) {
 		PHPWRITE(body, strlen(body));
 	}
 	
@@ -225,6 +230,8 @@ STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header
 	{
 		case 301:	http_log(HTTP_G(log).redirect, "301-REDIRECT", header);			break;
 		case 302:	http_log(HTTP_G(log).redirect, "302-REDIRECT", header);			break;
+		case 303:	http_log(HTTP_G(log).redirect, "303-REDIRECT", header);			break;
+		case 307:	http_log(HTTP_G(log).redirect, "307-REDIRECT", header);			break;
 		case 304:	http_log(HTTP_G(log).cache, "304-CACHE", header);				break;
 		case 405:	http_log(HTTP_G(log).allowed_methods, "405-ALLOWED", header);	break;
 		default:	http_log(NULL, header, body);									break;
@@ -292,24 +299,28 @@ PHP_HTTP_API const char *_http_chunked_decode(const char *encoded, size_t encode
 {
 	const char *e_ptr;
 	char *d_ptr;
+	long rest;
 	
 	*decoded_len = 0;
 	*decoded = ecalloc(1, encoded_len);
 	d_ptr = *decoded;
 	e_ptr = encoded;
 
-	while (((e_ptr - encoded) - encoded_len) > 0) {
-		size_t chunk_len = 0, EOL_len = 0;
-		int eol_mismatch = 0;
+	while ((rest = encoded + encoded_len - e_ptr) > 0) {
+		long chunk_len = 0;
+		int EOL_len = 0, eol_mismatch = 0;
 		char *n_ptr;
 
 		chunk_len = strtol(e_ptr, &n_ptr, 16);
 
 		/* check if:
 		 * - we could not read in chunk size
+		 * - we got a negative chunk size
+		 * - chunk size is greater then remaining size
 		 * - chunk size is not followed by (CR)LF|NUL
 		 */
-		if ((n_ptr == e_ptr) || (*n_ptr && (eol_mismatch = n_ptr != http_locate_eol(e_ptr, &EOL_len)))) {
+		if (	(n_ptr == e_ptr) ||	(chunk_len < 0) || (chunk_len > rest) || 
+				(*n_ptr && (eol_mismatch = (n_ptr != http_locate_eol(e_ptr, &EOL_len))))) {
 			/* don't fail on apperently not encoded data */
 			if (e_ptr == encoded) {
 				memcpy(*decoded, encoded, encoded_len);
@@ -328,7 +339,6 @@ PHP_HTTP_API const char *_http_chunked_decode(const char *encoded, size_t encode
 					http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Invalid chunk size: '%s' at pos %d", error, n_ptr - encoded);
 					efree(error);
 				}
-
 				return NULL;
 			}
 		} else {
@@ -350,6 +360,63 @@ PHP_HTTP_API const char *_http_chunked_decode(const char *encoded, size_t encode
 }
 /* }}} */
 
+/* {{{ 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
+	/*	magic_load() fails if MAGIC_MIME is set because it 
+		cowardly adds .mime to the file name */
+	struct magic_set *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:
+				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:
  * tab-width: 4