X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_filter_api.c;h=02467decdb2844570151a79883d83d10ad9a89ca;hp=444e3d067ffb530c829b820845f9ec139eab5ce9;hb=669d2e6a8bdc642b6b52693f4593f199ddd7e8d2;hpb=edc84b40eb2c5be04492fa98fec5833a030782eb

diff --git a/http_filter_api.c b/http_filter_api.c
index 444e3d0..02467de 100644
--- a/http_filter_api.c
+++ b/http_filter_api.c
@@ -6,22 +6,20 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
 
-#ifdef HAVE_CONFIG_H
-#	include "config.h"
-#endif
-
+#define HTTP_WANT_ZLIB
 #include "php_http.h"
 
 #ifdef ZEND_ENGINE_2
 
 #include "php_streams.h"
 #include "php_http_api.h"
+#include "php_http_encoding_api.h"
 #include "php_http_filter_api.h"
 
 PHP_MINIT_FUNCTION(http_filter)
@@ -34,11 +32,6 @@ PHP_MINIT_FUNCTION(http_filter)
 	-
 */
 
-typedef struct {
-	phpstr	buffer;
-	ulong	hexlen;
-} http_filter_buffer;
-
 #define HTTP_FILTER_PARAMS \
 	php_stream *stream, \
 	php_stream_filter *this, \
@@ -58,6 +51,8 @@ typedef struct {
 	http_filter_ ##filter
 #define HTTP_FILTER_FUNCTION(filter) \
 	php_stream_filter_status_t HTTP_FILTER_FUNC(filter)(HTTP_FILTER_PARAMS)
+#define HTTP_FILTER_BUFFER(filter) \
+	http_filter_ ##filter## _buffer
 
 #define NEW_BUCKET(data, length) \
 	{ \
@@ -79,11 +74,22 @@ typedef struct {
 		php_stream_bucket_append(buckets_out, __buck TSRMLS_CC); \
 	}
 
+typedef struct _http_chunked_decode_filter_buffer_t {
+	phpstr	buffer;
+	ulong	hexlen;
+} HTTP_FILTER_BUFFER(chunked_decode);
+
+#ifdef HTTP_HAVE_ZLIB
+typedef http_encoding_stream HTTP_FILTER_BUFFER(deflate);
+typedef http_encoding_stream HTTP_FILTER_BUFFER(inflate);
+#endif /* HTTP_HAVE_ZLIB */
+
+
 static HTTP_FILTER_FUNCTION(chunked_decode)
 {
 	int out_avail = 0;
 	php_stream_bucket *ptr, *nxt;
-	http_filter_buffer *buffer = (http_filter_buffer *) (this->abstract);
+	HTTP_FILTER_BUFFER(chunked_decode) *buffer = (HTTP_FILTER_BUFFER(chunked_decode) *) (this->abstract);
 	
 	if (bytes_consumed) {
 		*bytes_consumed = 0;
@@ -121,7 +127,7 @@ static HTTP_FILTER_FUNCTION(chunked_decode)
 			if (PHPSTR_LEN(buffer) < buffer->hexlen) {
 			
 				/* flush anyway? */
-				if (flags == PSFS_FLAG_FLUSH_INC) {
+				if (flags & PSFS_FLAG_FLUSH_INC) {
 				
 					/* flush all data (should only be chunk data) */
 					out_avail = 1;
@@ -159,8 +165,8 @@ static HTTP_FILTER_FUNCTION(chunked_decode)
 			
 			/* ignore preceeding CRLFs (too loose?) */
 			while (off < PHPSTR_LEN(buffer) && (
-					PHPSTR_VAL(buffer)[off] == 0xa || 
-					PHPSTR_VAL(buffer)[off] == 0xd)) {
+					PHPSTR_VAL(buffer)[off] == '\n' || 
+					PHPSTR_VAL(buffer)[off] == '\r')) {
 				++off;
 			}
 			if (off) {
@@ -200,7 +206,7 @@ static HTTP_FILTER_FUNCTION(chunked_decode)
 	}
 	
 	/* flush before close, but only if we are already waiting for more data */
-	if (flags == PSFS_FLAG_FLUSH_CLOSE && buffer->hexlen && PHPSTR_LEN(buffer)) {
+	if ((flags & PSFS_FLAG_FLUSH_CLOSE) && buffer->hexlen && PHPSTR_LEN(buffer)) {
 		out_avail = 1;
 		NEW_BUCKET(PHPSTR_VAL(buffer), PHPSTR_LEN(buffer));
 		phpstr_reset(PHPSTR(buffer));
@@ -212,7 +218,7 @@ static HTTP_FILTER_FUNCTION(chunked_decode)
 
 static HTTP_FILTER_DESTRUCTOR(chunked_decode)
 {
-	http_filter_buffer *b = (http_filter_buffer *) (this->abstract);
+	HTTP_FILTER_BUFFER(chunked_decode) *b = (HTTP_FILTER_BUFFER(chunked_decode) *) (this->abstract);
 	
 	phpstr_dtor(PHPSTR(b));
 	pefree(b, this->is_persistent);
@@ -259,7 +265,7 @@ static HTTP_FILTER_FUNCTION(chunked_encode)
 	}
 	
 	/* terminate with "0" */
-	if (flags == PSFS_FLAG_FLUSH_CLOSE) {
+	if (flags & PSFS_FLAG_FLUSH_CLOSE) {
 		out_avail = 1;
 		NEW_BUCKET("0" HTTP_CRLF, lenof("0" HTTP_CRLF));
 	}
@@ -279,14 +285,173 @@ static HTTP_FILTER_OPS(chunked_encode) = {
 	"http.chunked_encode"
 };
 
+#ifdef HTTP_HAVE_ZLIB
+
+static HTTP_FILTER_FUNCTION(deflate)
+{
+	int out_avail = 0;
+	php_stream_bucket *ptr, *nxt;
+	HTTP_FILTER_BUFFER(inflate) *buffer = (HTTP_FILTER_BUFFER(deflate) *) this->abstract;
+	
+	if (bytes_consumed) {
+		*bytes_consumed = 0;
+	}
+	
+	/* new data available? */
+	if (buckets_in->head) {
+		
+		/* fetch available bucket data */
+		for (ptr = buckets_in->head; ptr; ptr = nxt) {
+			char *encoded = NULL;
+			size_t encoded_len = 0;
+			
+			nxt = ptr->next;
+			if (bytes_consumed) {
+				*bytes_consumed += ptr->buflen;
+			}
+			
+			if (ptr->buflen) {
+				http_encoding_deflate_stream_update(buffer, ptr->buf, ptr->buflen, &encoded, &encoded_len);
+				if (encoded) {
+					out_avail = 1;
+					NEW_BUCKET(encoded, encoded_len);
+					efree(encoded);
+				}
+			}
+			
+			php_stream_bucket_unlink(ptr TSRMLS_CC);
+			php_stream_bucket_delref(ptr TSRMLS_CC);
+		}
+	}
+	
+	/* flush & close */
+	if (flags & PSFS_FLAG_FLUSH_INC) {
+		char *encoded = NULL;
+		size_t encoded_len = 0;
+		
+		http_encoding_deflate_stream_flush(buffer, &encoded, &encoded_len);
+		if (encoded) {
+			out_avail = 1;
+			NEW_BUCKET(encoded, encoded_len);
+			efree(encoded);
+		}
+	}
+	
+	if (flags & PSFS_FLAG_FLUSH_CLOSE) {
+		char *encoded = NULL;
+		size_t encoded_len = 0;
+		
+		http_encoding_deflate_stream_finish(buffer, &encoded, &encoded_len);
+		if (encoded) {
+			out_avail = 1;
+			NEW_BUCKET(encoded, encoded_len);
+			efree(encoded);
+		}
+	}
+	
+	return out_avail ? PSFS_PASS_ON : PSFS_FEED_ME;
+}
+
+static HTTP_FILTER_FUNCTION(inflate)
+{
+	int out_avail = 0;
+	php_stream_bucket *ptr, *nxt;
+	HTTP_FILTER_BUFFER(inflate) *buffer = (HTTP_FILTER_BUFFER(inflate) *) this->abstract;
+	
+	if (bytes_consumed) {
+		*bytes_consumed = 0;
+	}
+	
+	/* new data available? */
+	if (buckets_in->head) {
+		
+		/* fetch available bucket data */
+		for (ptr = buckets_in->head; ptr; ptr = nxt) {
+			char *decoded = NULL;
+			size_t decoded_len = 0;
+			
+			nxt = ptr->next;
+			if (bytes_consumed) {
+				*bytes_consumed += ptr->buflen;
+			}
+			
+			if (ptr->buflen) {
+				http_encoding_inflate_stream_update(buffer, ptr->buf, ptr->buflen, &decoded, &decoded_len);
+				if (decoded) {
+					out_avail = 1;
+					NEW_BUCKET(decoded, decoded_len);
+					efree(decoded);
+				}
+			}
+			
+			php_stream_bucket_unlink(ptr TSRMLS_CC);
+			php_stream_bucket_delref(ptr TSRMLS_CC);
+		}
+	}
+	
+	/* flush & close */
+	if (flags & PSFS_FLAG_FLUSH_INC) {
+		char *decoded = NULL;
+		size_t decoded_len = 0;
+		
+		http_encoding_inflate_stream_flush(buffer, &decoded, &decoded_len);
+		if (decoded) {
+			out_avail = 1;
+			NEW_BUCKET(decoded, decoded_len);
+			efree(decoded);
+		}
+	}
+	
+	if (flags & PSFS_FLAG_FLUSH_CLOSE) {
+		char *decoded = NULL;
+		size_t decoded_len = 0;
+		
+		http_encoding_inflate_stream_finish(buffer, &decoded, &decoded_len);
+		if (decoded) {
+			out_avail = 1;
+			NEW_BUCKET(decoded, decoded_len);
+			efree(decoded);
+		}
+	}
+	
+	return out_avail ? PSFS_PASS_ON : PSFS_FEED_ME;
+}
+
+static HTTP_FILTER_DESTRUCTOR(deflate)
+{
+	HTTP_FILTER_BUFFER(deflate) *buffer = (HTTP_FILTER_BUFFER(deflate) *) this->abstract;
+	http_encoding_deflate_stream_free(&buffer);
+}
+
+static HTTP_FILTER_DESTRUCTOR(inflate)
+{
+	HTTP_FILTER_BUFFER(inflate) *buffer = (HTTP_FILTER_BUFFER(inflate) *) this->abstract;
+	http_encoding_inflate_stream_free(&buffer);
+}
+
+static HTTP_FILTER_OPS(deflate) = {
+	HTTP_FILTER_FUNC(deflate),
+	HTTP_FILTER_DTOR(deflate),
+	"http.deflate"
+};
+
+static HTTP_FILTER_OPS(inflate) = {
+	HTTP_FILTER_FUNC(inflate),
+	HTTP_FILTER_DTOR(inflate),
+	"http.inflate"
+};
+
+#endif /* HTTP_HAVE_ZLIB */
+
 static php_stream_filter *http_filter_create(const char *name, zval *params, int p TSRMLS_DC)
 {
+	zval **tmp = &params;
 	php_stream_filter *f = NULL;
 	
 	if (!strcasecmp(name, "http.chunked_decode")) {
-		http_filter_buffer *b = NULL;
+		HTTP_FILTER_BUFFER(chunked_decode) *b = NULL;
 		
-		if ((b = pecalloc(1, sizeof(http_filter_buffer), p))) {
+		if ((b = pecalloc(1, sizeof(HTTP_FILTER_BUFFER(chunked_decode)), p))) {
 			phpstr_init_ex(PHPSTR(b), 4096, p ? PHPSTR_INIT_PERSISTENT : 0);
 			if (!(f = php_stream_filter_alloc(&HTTP_FILTER_OP(chunked_decode), b, p))) {
 				pefree(b, p);
@@ -296,6 +461,48 @@ static php_stream_filter *http_filter_create(const char *name, zval *params, int
 	
 	if (!strcasecmp(name, "http.chunked_encode")) {
 		f = php_stream_filter_alloc(&HTTP_FILTER_OP(chunked_encode), NULL, p);
+#ifdef HTTP_HAVE_ZLIB
+	} else
+	
+	if (!strcasecmp(name, "http.inflate")) {
+		int flags = p ? HTTP_ENCODING_STREAM_PERSISTENT : 0;
+		HTTP_FILTER_BUFFER(inflate) *b = NULL;
+		
+		if ((b = http_encoding_inflate_stream_init(NULL, flags))) {
+			if (!(f = php_stream_filter_alloc(&HTTP_FILTER_OP(inflate), b, p))) {
+				http_encoding_inflate_stream_free(&b);
+			}
+		}
+	} else
+	
+	if (!strcasecmp(name, "http.deflate")) {
+		int flags = p ? HTTP_ENCODING_STREAM_PERSISTENT : 0;
+		HTTP_FILTER_BUFFER(deflate) *b = NULL;
+		
+		if (params) {
+			switch (Z_TYPE_P(params))
+			{
+				case IS_ARRAY:
+				case IS_OBJECT:
+					if (SUCCESS != zend_hash_find(HASH_OF(params), "flags", sizeof("flags"), (void *) &tmp)) {
+						break;
+					}
+				default:
+				{
+					zval *orig = *tmp;
+					
+					convert_to_long_ex(tmp);
+					flags |= (Z_LVAL_PP(tmp) & 0x0fffffff);
+					if (orig != *tmp) zval_ptr_dtor(tmp);
+				}
+			}
+		}
+		if ((b = http_encoding_deflate_stream_init(NULL, flags))) {
+			if (!(f = php_stream_filter_alloc(&HTTP_FILTER_OP(deflate), b, p))) {
+				http_encoding_deflate_stream_free(&b);
+			}
+		}
+#endif /* HTTP_HAVE_ZLIB */
 	}
 	
 	return f;