X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_filter_api.c;h=fb44f026108972a26b3c3b6efb35ddab742d0309;hp=53877e2a3f08d3f4c281125009f856fc5813d46b;hb=dc7248a073febcade23e6a1a296ab1b2bb752298;hpb=391c85f10c017e1e4de656b051c1bba009ede7b3

diff --git a/http_filter_api.c b/http_filter_api.c
index 53877e2..fb44f02 100644
--- a/http_filter_api.c
+++ b/http_filter_api.c
@@ -17,6 +17,8 @@
 #endif
 #include "php.h"
 
+#ifdef ZEND_ENGINE_2
+
 #include "php_http_std_defs.h"
 #include "php_http_api.h"
 #include "php_http_filter_api.h"
@@ -25,10 +27,6 @@
 
 #include "php_streams.h"
 
-/*
- * TODO: allow use with persistent streams
- */
-
 PHP_MINIT_FUNCTION(http_filter)
 {
 	php_stream_filter_register_factory("http.*", &http_filter_factory TSRMLS_CC);
@@ -104,13 +102,17 @@ static HTTP_FILTER_FUNCTION(chunked_decode)
 				*bytes_consumed += ptr->buflen;
 			}
 		
-			phpstr_append(PHPSTR(buffer), ptr->buf, ptr->buflen);
+			if ((size_t) -1 == phpstr_append(PHPSTR(buffer), ptr->buf, ptr->buflen)) {
+				return PSFS_ERR_FATAL;
+			}
+			
 			php_stream_bucket_unlink(ptr TSRMLS_CC);
 			php_stream_bucket_delref(ptr TSRMLS_CC);
-			
 		}
 	}
-	phpstr_fix(PHPSTR(buffer));
+	if (!phpstr_fix(PHPSTR(buffer))) {
+		return PSFS_ERR_FATAL;
+	}
 
 	/* we have data in our buffer */
 	while (PHPSTR_LEN(buffer)) {
@@ -175,7 +177,7 @@ static HTTP_FILTER_FUNCTION(chunked_decode)
 				
 				/* we need eol, so we can be sure we have all hex digits */
 				phpstr_fix(PHPSTR(buffer));
-				if (eolstr = http_locate_eol(PHPSTR_VAL(buffer), &eollen)) {
+				if ((eolstr = http_locate_eol(PHPSTR_VAL(buffer), &eollen))) {
 					char *stop = NULL;
 					
 					/* read in chunk size */
@@ -191,6 +193,9 @@ static HTTP_FILTER_FUNCTION(chunked_decode)
 					phpstr_cut(PHPSTR(buffer), 0, eolstr + eollen - PHPSTR_VAL(buffer));
 					/* buffer->hexlen is 0 now or contains the size of the next chunk */
 					/* continue */
+				} else {
+					/* we have not enough data buffered to read in chunk size */
+					break;
 				}
 			}
 			/* break */
@@ -284,13 +289,8 @@ static php_stream_filter *http_filter_create(const char *name, zval *params, int
 	if (!strcasecmp(name, "http.chunked_decode")) {
 		http_filter_buffer *b = NULL;
 		
-		/* FIXXME: allow usage with persistent streams */
-		if (p) {
-			return NULL;
-		}
-		
-		if (b = pecalloc(1, sizeof(http_filter_buffer), p)) {
-			phpstr_init(PHPSTR(b));
+		if ((b = pecalloc(1, sizeof(http_filter_buffer), 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);
 			}
@@ -308,6 +308,8 @@ php_stream_filter_factory http_filter_factory = {
 	http_filter_create
 };
 
+#endif /* ZEND_ENGINE_2 */
+
 /*
  * Local variables:
  * tab-width: 4