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

diff --git a/http_filter_api.c b/http_filter_api.c
index 1836b27..35cff1c 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"
 
@@ -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;
@@ -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));
 	}
@@ -329,7 +325,19 @@ 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) {
+			out_avail = 1;
+			NEW_BUCKET(encoded, encoded_len);
+			efree(encoded);
+		}
+	}
+	
+	if (flags & PSFS_FLAG_FLUSH_CLOSE) {
 		char *encoded = NULL;
 		size_t encoded_len = 0;
 		
@@ -382,7 +390,19 @@ 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) {
+			out_avail = 1;
+			NEW_BUCKET(decoded, decoded_len);
+			efree(decoded);
+		}
+	}
+	
+	if (flags & PSFS_FLAG_FLUSH_CLOSE) {
 		char *decoded = NULL;
 		size_t decoded_len = 0;