X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_encoding_api.c;h=8ce0280ca22c5e0911d2e5115674f972b47ba27f;hp=f732d43ad2ccbecadbdd4f11324069804735e997;hb=ad5f896b03adaa073134a00108a9cdf00720673a;hpb=1382fe5a3ed5209ab05745ca95495885e85ff2a0

diff --git a/http_encoding_api.c b/http_encoding_api.c
index f732d43..8ce0280 100644
--- a/http_encoding_api.c
+++ b/http_encoding_api.c
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -35,6 +35,11 @@ PHP_MINIT_FUNCTION(http_encoding)
 	HTTP_LONG_CONSTANT("HTTP_DEFLATE_STRATEGY_HUFF", HTTP_DEFLATE_STRATEGY_HUFF);
 	HTTP_LONG_CONSTANT("HTTP_DEFLATE_STRATEGY_RLE", HTTP_DEFLATE_STRATEGY_RLE);
 	HTTP_LONG_CONSTANT("HTTP_DEFLATE_STRATEGY_FIXED", HTTP_DEFLATE_STRATEGY_FIXED);
+	
+	HTTP_LONG_CONSTANT("HTTP_ENCODING_STREAM_FLUSH_NONE", HTTP_ENCODING_STREAM_FLUSH_NONE);
+	HTTP_LONG_CONSTANT("HTTP_ENCODING_STREAM_FLUSH_SYNC", HTTP_ENCODING_STREAM_FLUSH_SYNC);
+	HTTP_LONG_CONSTANT("HTTP_ENCODING_STREAM_FLUSH_FULL", HTTP_ENCODING_STREAM_FLUSH_FULL);
+	
 	return SUCCESS;
 }
 
@@ -153,130 +158,118 @@ PHP_HTTP_API const char *_http_encoding_dechunk(const char *encoded, size_t enco
 /* }}} */
 
 /* {{{ int http_encoding_response_start(size_t) */
-PHP_HTTP_API int _http_encoding_response_start(size_t content_length TSRMLS_DC)
+PHP_HTTP_API int _http_encoding_response_start(size_t content_length, zend_bool ignore_http_ohandler TSRMLS_DC)
 {
-	if (	php_ob_handler_used("ob_gzhandler" TSRMLS_CC) ||
-			php_ob_handler_used("zlib output compression" TSRMLS_CC)) {
+	int response = HTTP_G->send.deflate.response;
+	int ohandler = php_ob_handler_used("ob_gzhandler" TSRMLS_CC) || php_ob_handler_used("zlib output compression" TSRMLS_CC);
+	
+	if (!ohandler && !ignore_http_ohandler) {
+		ohandler = php_ob_handler_used("ob_deflatehandler" TSRMLS_CC) || php_ob_handler_used("http deflate" TSRMLS_CC);
+	}
+	
+	if (response && !ohandler) {
+#ifdef HTTP_HAVE_ZLIB
+		HashTable *selected;
+		zval zsupported;
+		
 		HTTP_G->send.deflate.encoding = 0;
-	} else {
-		if (!HTTP_G->send.deflate.encoding) {
-			/* emit a content-length header */
-			if (content_length) {
-				char cl_header_str[128];
-				size_t cl_header_len;
-				cl_header_len = snprintf(cl_header_str, lenof(cl_header_str), "Content-Length: %zu", content_length);
-				http_send_header_string_ex(cl_header_str, cl_header_len, 1);
-			}
-		} else {
-#ifndef HTTP_HAVE_ZLIB
-			HTTP_G->send.deflate.encoding = 0;
-			php_start_ob_buffer_named("ob_gzhandler", 0, 0 TSRMLS_CC);
-#else
-			HashTable *selected;
-			zval zsupported;
-			
-			INIT_PZVAL(&zsupported);
-			array_init(&zsupported);
-			add_next_index_stringl(&zsupported, "gzip", lenof("gzip"), 1);
-			add_next_index_stringl(&zsupported, "x-gzip", lenof("x-gzip"), 1);
-			add_next_index_stringl(&zsupported, "deflate", lenof("deflate"), 1);
-			
-			HTTP_G->send.deflate.encoding = 0;
+		
+		INIT_PZVAL(&zsupported);
+		array_init(&zsupported);
+		add_next_index_stringl(&zsupported, "gzip", lenof("gzip"), 1);
+		add_next_index_stringl(&zsupported, "x-gzip", lenof("x-gzip"), 1);
+		add_next_index_stringl(&zsupported, "deflate", lenof("deflate"), 1);
+		
+		if ((selected = http_negotiate_encoding(&zsupported))) {
+			STATUS hs = FAILURE;
+			char *encoding = NULL;
+			ulong idx;
 			
-			if ((selected = http_negotiate_encoding(&zsupported))) {
-				STATUS hs = FAILURE;
-				char *encoding = NULL;
-				ulong idx;
-				
-				if (HASH_KEY_IS_STRING == zend_hash_get_current_key(selected, &encoding, &idx, 0) && encoding) {
-					if (!strcmp(encoding, "gzip") || !strcmp(encoding, "x-gzip")) {
-						if (SUCCESS == (hs = http_send_header_string("Content-Encoding: gzip"))) {
-							HTTP_G->send.deflate.encoding = HTTP_ENCODING_GZIP;
-						}
-					} else if (!strcmp(encoding, "deflate")) {
-						if (SUCCESS == (hs = http_send_header_string("Content-Encoding: deflate"))) {
-							HTTP_G->send.deflate.encoding = HTTP_ENCODING_DEFLATE;
-						}
+			if (HASH_KEY_IS_STRING == zend_hash_get_current_key(selected, &encoding, &idx, 0) && encoding) {
+				if (!strcmp(encoding, "gzip") || !strcmp(encoding, "x-gzip")) {
+					if (SUCCESS == (hs = http_send_header_string("Content-Encoding: gzip"))) {
+						HTTP_G->send.deflate.encoding = HTTP_ENCODING_GZIP;
 					}
-					if (SUCCESS == hs) {
-						http_send_header_string("Vary: Accept-Encoding");
+				} else if (!strcmp(encoding, "deflate")) {
+					if (SUCCESS == (hs = http_send_header_string("Content-Encoding: deflate"))) {
+						HTTP_G->send.deflate.encoding = HTTP_ENCODING_DEFLATE;
 					}
 				}
-				
-				zend_hash_destroy(selected);
-				FREE_HASHTABLE(selected);
+				if (SUCCESS == hs) {
+					http_send_header_string("Vary: Accept-Encoding");
+				}
 			}
 			
-			zval_dtor(&zsupported);
-			return HTTP_G->send.deflate.encoding;
-#endif
+			zend_hash_destroy(selected);
+			FREE_HASHTABLE(selected);
 		}
+		
+		zval_dtor(&zsupported);
+#else
+		HTTP_G->send.deflate.encoding = 0;
+		php_start_ob_buffer_named("ob_gzhandler", 0, 0 TSRMLS_CC);
+#endif /* HTTP_HAVE_ZLIB */
+	} else if (content_length && !ohandler) {
+		/* emit a content-length header */
+		phpstr header;
+
+		phpstr_init(&header);
+		phpstr_appendf(&header, "Content-Length: %zu", content_length);
+		phpstr_fix(&header);
+		http_send_header_string_ex(PHPSTR_VAL(&header), PHPSTR_LEN(&header), 1);
+		phpstr_dtor(&header);
+	} else {
+		HTTP_G->send.deflate.encoding = 0;
 	}
-	return 0;
+	
+	return HTTP_G->send.deflate.encoding;
 }
 /* }}} */
 
 #ifdef HTTP_HAVE_ZLIB
 
-/* {{{ */
-#define HTTP_DEFLATE_LEVEL_SET(flags, level) \
-	switch (flags & 0xf) \
-	{ \
-		default: \
-			if ((flags & 0xf) < 10) { \
-				level = flags & 0xf; \
-				break; \
-			} \
-		case HTTP_DEFLATE_LEVEL_DEF: \
-			level = Z_DEFAULT_COMPRESSION; \
-		break; \
-	}
+/* {{{ inline int http_inflate_rounds */
+static inline int http_inflate_rounds(z_stream *Z, int flush, char **buf, size_t *len)
+{
+	int status = 0, round = 0;
+	phpstr buffer;
 	
-#define HTTP_DEFLATE_WBITS_SET(flags, wbits) \
-	switch (flags & 0xf0) \
-	{ \
-		case HTTP_DEFLATE_TYPE_GZIP: \
-			wbits = HTTP_WINDOW_BITS_GZIP; \
-		break; \
-		case HTTP_DEFLATE_TYPE_RAW: \
-			wbits = HTTP_WINDOW_BITS_RAW; \
-		break; \
-		default: \
-			wbits = HTTP_WINDOW_BITS_ZLIB; \
-		break; \
-	}
-
-#define HTTP_INFLATE_WBITS_SET(flags, wbits) \
-	if (flags & HTTP_INFLATE_TYPE_RAW) { \
-		wbits = HTTP_WINDOW_BITS_RAW; \
-	} else { \
-		wbits = HTTP_WINDOW_BITS_ANY; \
-	}
-
-#define HTTP_DEFLATE_STRATEGY_SET(flags, strategy) \
-	switch (flags & 0xf00) \
-	{ \
-		case HTTP_DEFLATE_STRATEGY_FILT: \
-			strategy = Z_FILTERED; \
-		break; \
-		case HTTP_DEFLATE_STRATEGY_HUFF: \
-			strategy = Z_HUFFMAN_ONLY; \
-		break; \
-		case HTTP_DEFLATE_STRATEGY_RLE: \
-			strategy = Z_RLE; \
-		break; \
-		case HTTP_DEFLATE_STRATEGY_FIXED: \
-			strategy = Z_FIXED; \
-		break; \
-		default: \
-			strategy = Z_DEFAULT_STRATEGY; \
-		break; \
+	*buf = NULL;
+	*len = 0;
+	
+	phpstr_init_ex(&buffer, Z->avail_in, PHPSTR_INIT_PREALLOC);
+	
+	do {
+		if (PHPSTR_NOMEM == phpstr_resize_ex(&buffer, buffer.size, 0, 1)) {
+			status = Z_MEM_ERROR;
+		} else {
+			Z->avail_out = buffer.free;
+			Z->next_out = (Bytef *) buffer.data + buffer.used;
+#if 0
+			fprintf(stderr, "\n%3d: %3d PRIOR: size=%7lu,\tfree=%7lu,\tused=%7lu,\tavail_in=%7lu,\tavail_out=%7lu\n", round, status, buffer.size, buffer.free, buffer.used, Z->avail_in, Z->avail_out);
+#endif
+			status = inflate(Z, flush);
+			
+			buffer.used += buffer.free - Z->avail_out;
+			buffer.free = Z->avail_out;
+#if 0
+			fprintf(stderr, "%3d: %3d AFTER: size=%7lu,\tfree=%7lu,\tused=%7lu,\tavail_in=%7lu,\tavail_out=%7lu\n", round, status, buffer.size, buffer.free, buffer.used, Z->avail_in, Z->avail_out);
+#endif
+			HTTP_INFLATE_BUFFER_SIZE_ALIGN(buffer.size);
+		}
+	} while ((Z_BUF_ERROR == status || (Z_OK == status && Z->avail_in)) && ++round < HTTP_INFLATE_ROUNDS);
+	
+	if (status == Z_OK || status == Z_STREAM_END) {
+		phpstr_shrink(&buffer);
+		phpstr_fix(&buffer);
+		*buf = buffer.data;
+		*len = buffer.used;
+	} else {
+		phpstr_dtor(&buffer);
 	}
-
-#define HTTP_WINDOW_BITS_ZLIB	0x0000000f
-#define HTTP_WINDOW_BITS_GZIP	0x0000001f
-#define HTTP_WINDOW_BITS_ANY	0x0000002f
-#define HTTP_WINDOW_BITS_RAW	-0x000000f
+	
+	return status;
+}
 /* }}} */
 
 /* {{{ STATUS http_encoding_deflate(int, char *, size_t, char **, size_t *) */
@@ -325,49 +318,38 @@ PHP_HTTP_API STATUS _http_encoding_deflate(int flags, const char *data, size_t d
 /* {{{ STATUS http_encoding_inflate(char *, size_t, char **, size_t) */
 PHP_HTTP_API STATUS _http_encoding_inflate(const char *data, size_t data_len, char **decoded, size_t *decoded_len ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC)
 {
-	int status, round = 0, wbits = HTTP_WINDOW_BITS_ANY;
 	z_stream Z;
-	phpstr buffer;
+	int status, wbits = HTTP_WINDOW_BITS_ANY;
 	
 	memset(&Z, 0, sizeof(z_stream));
-	*decoded = NULL;
-	*decoded_len = 0;
 	
-	phpstr_init_ex(&buffer, data_len << 2, PHPSTR_INIT_PREALLOC);
-	buffer.size = data_len;
-	
-retry_inflate:			
+retry_raw_inflate:
 	status = inflateInit2(&Z, wbits);
 	if (Z_OK == status) {
 		Z.next_in = (Bytef *) data;
 		Z.avail_in = data_len;
 		
-		do {
-			phpstr_resize(&buffer, data_len << 2);
-
-			do {
-				Z.avail_out = (buffer.free -= Z.total_out - buffer.used);
-				Z.next_out = (Bytef *) buffer.data + (buffer.used = Z.total_out);
-				status = inflate(&Z, Z_NO_FLUSH);
-			} while (Z_OK == status);
-		} while (Z_BUF_ERROR == status && ++round < HTTP_INFLATE_ROUNDS);
-		
-		if (Z_DATA_ERROR == status && HTTP_WINDOW_BITS_ANY == wbits) {
-			/* raw deflated data? */
-			inflateEnd(&Z);
-			wbits = HTTP_WINDOW_BITS_RAW;
-			goto retry_inflate;
+		switch (status = http_inflate_rounds(&Z, Z_NO_FLUSH, decoded, decoded_len)) {
+			case Z_STREAM_END:
+				inflateEnd(&Z);
+				return SUCCESS;
+
+			case Z_OK:
+				status = Z_DATA_ERROR;
+				break;
+			
+			case Z_DATA_ERROR:
+				/* raw deflated data? */
+				if (HTTP_WINDOW_BITS_ANY == wbits) {
+					inflateEnd(&Z);
+					wbits = HTTP_WINDOW_BITS_RAW;
+					goto retry_raw_inflate;
+				}
 		}
-		
 		inflateEnd(&Z);
-		
-		if (Z_STREAM_END == status) {
-			*decoded_len = Z.total_out;
-			*decoded = erealloc_rel(buffer.data, *decoded_len + 1);
-			(*decoded)[*decoded_len] = '\0';
-			return SUCCESS;
-		} else {
-			phpstr_dtor(&buffer);
+
+		if (decoded_len && *decoded) {
+			efree(*decoded);
 		}
 	}
 	
@@ -457,19 +439,21 @@ PHP_HTTP_API STATUS _http_encoding_deflate_stream_update(http_encoding_stream *s
 	s->stream.avail_out = *encoded_len;
 	s->stream.next_out = (Bytef *) *encoded;
 	
-	switch (status = deflate(&s->stream, Z_NO_FLUSH))
-	{
+	switch (status = deflate(&s->stream, HTTP_ENCODING_STREAM_FLUSH_FLAG(s->flags))) {
 		case Z_OK:
 		case Z_STREAM_END:
 			/* cut processed chunk off the buffer */
-			phpstr_cut(PHPSTR(s->stream.opaque), 0, PHPSTR_LEN(s->stream.opaque) - s->stream.avail_in);
+			if (s->stream.avail_in) {
+				phpstr_cut(PHPSTR(s->stream.opaque), 0, PHPSTR_LEN(s->stream.opaque) - s->stream.avail_in);
+			} else {
+				phpstr_reset(PHPSTR(s->stream.opaque));
+			}
 			
 			/* size buffer down to actual size */
 			*encoded_len -= s->stream.avail_out;
 			*encoded = erealloc_rel(*encoded, *encoded_len + 1);
 			(*encoded)[*encoded_len] = '\0';
 			return SUCCESS;
-		break;
 	}
 	
 	STR_SET(*encoded, NULL);
@@ -482,55 +466,36 @@ PHP_HTTP_API STATUS _http_encoding_deflate_stream_update(http_encoding_stream *s
 /* {{{ STATUS http_encoding_inflate_stream_update(http_encoding_stream *, char *, size_t, char **, size_t *) */
 PHP_HTTP_API STATUS _http_encoding_inflate_stream_update(http_encoding_stream *s, const char *data, size_t data_len, char **decoded, size_t *decoded_len ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC)
 {
-	int status, round = 0;
+	int status;
 	
 	/* append input to buffer */
 	phpstr_append(PHPSTR(s->stream.opaque), data, data_len);
 	
-	/* for realloc() */
-	*decoded = NULL;
-	*decoded_len = data_len << 1;
-	
-	/* inflate */
-	do {
-		*decoded_len <<= 1;
-		*decoded = erealloc_rel(*decoded, *decoded_len);
-		
 retry_raw_inflate:
-		s->stream.next_in = (Bytef *) PHPSTR_VAL(s->stream.opaque);
-		s->stream.avail_in = PHPSTR_LEN(s->stream.opaque);
+	s->stream.next_in = (Bytef *) PHPSTR_VAL(s->stream.opaque);
+	s->stream.avail_in = PHPSTR_LEN(s->stream.opaque);
 	
-		s->stream.next_out = (Bytef *) *decoded;
-		s->stream.avail_out = *decoded_len;
-		
-		switch (status = inflate(&s->stream, Z_NO_FLUSH))
-		{
-			case Z_OK:
-			case Z_STREAM_END:
-				/* cut off */
+	switch (status = http_inflate_rounds(&s->stream, HTTP_ENCODING_STREAM_FLUSH_FLAG(s->flags), decoded, decoded_len)) {
+		case Z_OK:
+		case Z_STREAM_END:
+			/* cut off */
+			if (s->stream.avail_in) {
 				phpstr_cut(PHPSTR(s->stream.opaque), 0, PHPSTR_LEN(s->stream.opaque) - s->stream.avail_in);
-				
-				/* size down */
-				*decoded_len -= s->stream.avail_out;
-				*decoded = erealloc_rel(*decoded, *decoded_len + 1);
-				(*decoded)[*decoded_len] = '\0';
-				return SUCCESS;
-			break;
-			
-			case Z_DATA_ERROR:
-				/* raw deflated data ? */
-				if (!(s->flags & HTTP_INFLATE_TYPE_RAW) && !s->stream.total_out) {
-					inflateEnd(&s->stream);
-					s->flags |= HTTP_INFLATE_TYPE_RAW;
-					inflateInit2(&s->stream, HTTP_WINDOW_BITS_RAW);
-					goto retry_raw_inflate;
-				}
-			break;
-		}
-	} while (Z_BUF_ERROR == status && ++round < HTTP_INFLATE_ROUNDS);
+			} else {
+				phpstr_reset(PHPSTR(s->stream.opaque));
+			}
+			return SUCCESS;
+		
+		case Z_DATA_ERROR:
+			/* raw deflated data ? */
+			if (!(s->flags & HTTP_INFLATE_TYPE_RAW) && !s->stream.total_out) {
+				inflateEnd(&s->stream);
+				s->flags |= HTTP_INFLATE_TYPE_RAW;
+				inflateInit2(&s->stream, HTTP_WINDOW_BITS_RAW);
+				goto retry_raw_inflate;
+			}
+	}
 	
-	STR_SET(*decoded, NULL);
-	*decoded_len = 0;
 	http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Failed to update inflate stream: %s", zError(status));
 	return FAILURE;
 }
@@ -549,15 +514,13 @@ PHP_HTTP_API STATUS _http_encoding_deflate_stream_flush(http_encoding_stream *s,
 	s->stream.avail_out = *encoded_len;
 	s->stream.next_out = (Bytef *) *encoded;
 	
-	switch (status = deflate(&s->stream, Z_SYNC_FLUSH))
-	{
+	switch (status = deflate(&s->stream, Z_FULL_FLUSH)) {
 		case Z_OK:
 		case Z_STREAM_END:
 			*encoded_len = HTTP_DEFLATE_BUFFER_SIZE - s->stream.avail_out;
 			*encoded = erealloc_rel(*encoded, *encoded_len + 1);
 			(*encoded)[*encoded_len] = '\0';
 			return SUCCESS;
-		break;
 	}
 	
 	STR_SET(*encoded, NULL);
@@ -618,6 +581,12 @@ PHP_HTTP_API STATUS _http_encoding_inflate_stream_finish(http_encoding_stream *s
 {
 	int status;
 	
+	if (!PHPSTR_LEN(s->stream.opaque)) {
+		*decoded = NULL;
+		*decoded_len = 0;
+		return SUCCESS;
+	}
+	
 	*decoded_len = (PHPSTR_LEN(s->stream.opaque) + 1) * HTTP_INFLATE_ROUNDS;
 	*decoded = emalloc_rel(*decoded_len);
 	
@@ -699,6 +668,8 @@ PHP_HTTP_API void _http_encoding_inflate_stream_free(http_encoding_stream **s TS
 /* {{{ void http_ob_deflatehandler(char *, uint, char **, uint *, int) */
 void _http_ob_deflatehandler(char *output, uint output_len, char **handled_output, uint *handled_output_len, int mode TSRMLS_DC)
 {
+	int encoding;
+	
 	*handled_output = NULL;
 	*handled_output_len = 0;
 	
@@ -710,21 +681,21 @@ void _http_ob_deflatehandler(char *output, uint output_len, char **handled_outpu
 			return;
 		}
 		
-		HTTP_G->send.deflate.encoding = !0;
+		HTTP_G->send.deflate.response = 1;
+		encoding = http_encoding_response_start(0, 1);
+		HTTP_G->send.deflate.response = 0;
 		
-		switch (http_encoding_response_start(0))
-		{
+		switch (encoding) {
 			case HTTP_ENCODING_GZIP:
 				flags = HTTP_DEFLATE_TYPE_GZIP;
-			break;
+				break;
 			
 			case HTTP_ENCODING_DEFLATE:
 				flags = HTTP_DEFLATE_TYPE_ZLIB;
-			break;
+				break;
 			
 			default:
 				goto deflate_passthru_plain;
-			break;
 		}
 		
 		flags |= (HTTP_G->send.deflate.start_flags &~ 0xf0);
@@ -732,7 +703,12 @@ void _http_ob_deflatehandler(char *output, uint output_len, char **handled_outpu
 	}
 	
 	if (HTTP_G->send.deflate.stream) {
-		http_encoding_deflate_stream_update((http_encoding_stream *) HTTP_G->send.deflate.stream, output, output_len, handled_output, handled_output_len);
+		if (output_len) {
+			size_t tmp_len;
+			
+			http_encoding_deflate_stream_update((http_encoding_stream *) HTTP_G->send.deflate.stream, output, output_len, handled_output, &tmp_len);
+			*handled_output_len = tmp_len;
+		}
 		
 		if (mode & PHP_OUTPUT_HANDLER_END) {
 			char *remaining = NULL;
@@ -769,7 +745,12 @@ void _http_ob_inflatehandler(char *output, uint output_len, char **handled_outpu
 	}
 	
 	if (HTTP_G->send.inflate.stream) {
-		http_encoding_inflate_stream_update((http_encoding_stream *) HTTP_G->send.inflate.stream, output, output_len, handled_output, handled_output_len);
+		if (output_len) {
+			size_t tmp_len;
+			
+			http_encoding_inflate_stream_update((http_encoding_stream *) HTTP_G->send.inflate.stream, output, output_len, handled_output, &tmp_len);
+			*handled_output_len = tmp_len;
+		}
 		
 		if (mode & PHP_OUTPUT_HANDLER_END) {
 			char *remaining = NULL;