X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_filter_api.c;h=19260ee860e2deaa9e65fd93d301ffc408a5b27f;hp=1836b27d6b259cb362d3189985420932c15b5207;hb=e37040ebf8a470c77c7ae3498ee582ca20db259c;hpb=a19f558421040b5396b3d76e6c4878d7eda85aba

diff --git a/http_filter_api.c b/http_filter_api.c
index 1836b27..19260ee 100644
--- a/http_filter_api.c
+++ b/http_filter_api.c
@@ -6,16 +6,12 @@
     | 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"
 
@@ -78,7 +74,7 @@ PHP_MINIT_FUNCTION(http_filter)
 		php_stream_bucket_append(buckets_out, __buck TSRMLS_CC); \
 	}
 
-typedef struct {
+typedef struct _http_chunked_decode_filter_buffer_t {
 	phpstr	buffer;
 	ulong	hexlen;
 } HTTP_FILTER_BUFFER(chunked_decode);
@@ -131,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;
@@ -169,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) {
@@ -210,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));
@@ -269,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));
 	}
@@ -317,8 +313,10 @@ static HTTP_FILTER_FUNCTION(deflate)
 			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);
+					if (encoded_len) {
+						out_avail = 1;
+						NEW_BUCKET(encoded, encoded_len);
+					}
 					efree(encoded);
 				}
 			}
@@ -329,14 +327,30 @@ static HTTP_FILTER_FUNCTION(deflate)
 	}
 	
 	/* flush & close */
-	if (flags == PSFS_FLAG_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) {
+			if (encoded_len) {
+				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);
+			if (encoded_len) {
+				out_avail = 1;
+				NEW_BUCKET(encoded, encoded_len);
+			}
 			efree(encoded);
 		}
 	}
@@ -370,8 +384,10 @@ static HTTP_FILTER_FUNCTION(inflate)
 			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);
+					if (decoded_len) {
+						out_avail = 1;
+						NEW_BUCKET(decoded, decoded_len);
+					}
 					efree(decoded);
 				}
 			}
@@ -382,14 +398,30 @@ static HTTP_FILTER_FUNCTION(inflate)
 	}
 	
 	/* flush & close */
-	if (flags == PSFS_FLAG_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) {
+			if (decoded_len) {
+				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);
+			if (decoded_len) {
+				out_avail = 1;
+				NEW_BUCKET(decoded, decoded_len);
+			}
 			efree(decoded);
 		}
 	}
@@ -464,7 +496,7 @@ static php_stream_filter *http_filter_create(const char *name, zval *params, int
 			{
 				case IS_ARRAY:
 				case IS_OBJECT:
-					if (SUCCESS != zend_hash_find(HASH_OF(params), "flags", sizeof("flags"), (void **) &tmp)) {
+					if (SUCCESS != zend_hash_find(HASH_OF(params), "flags", sizeof("flags"), (void *) &tmp)) {
 						break;
 					}
 				default: