X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_encoding.c;h=c3e9a3a5f618a4f119247fcfd0ce0fbdb0608a94;hp=b5094eea1ac91f16fceeb0cab955641fa9ea790f;hb=d5d03014cff8c8ca80ee7866af100d3ceae1bd8f;hpb=f8b17453289061baee75586df671c62e9cd120e1

diff --git a/src/php_http_encoding.c b/src/php_http_encoding.c
index b5094ee..c3e9a3a 100644
--- a/src/php_http_encoding.c
+++ b/src/php_http_encoding.c
@@ -12,8 +12,6 @@
 
 #include "php_http_api.h"
 
-#include <zlib.h>
-
 static inline int eol_match(char **line, int *eol_len)
 {
 	char *ptr = *line;
@@ -28,7 +26,7 @@ static inline int eol_match(char **line, int *eol_len)
 	}
 }
 
-const char *php_http_encoding_dechunk(const char *encoded, size_t encoded_len, char **decoded, size_t *decoded_len TSRMLS_DC)
+const char *php_http_encoding_dechunk(const char *encoded, size_t encoded_len, char **decoded, size_t *decoded_len)
 {
 	int eol_len = 0;
 	char *n_ptr = NULL;
@@ -50,13 +48,13 @@ const char *php_http_encoding_dechunk(const char *encoded, size_t encoded_len, c
 			 * not encoded data and return a copy
 			 */
 			if (e_ptr == encoded) {
-				php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Data does not seem to be chunked encoded");
+				php_error_docref(NULL, E_NOTICE, "Data does not seem to be chunked encoded");
 				memcpy(*decoded, encoded, encoded_len);
 				*decoded_len = encoded_len;
 				return encoded + encoded_len;
 			} else {
 				efree(*decoded);
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expected chunk size at pos %tu of %zu but got trash", n_ptr - encoded, encoded_len);
+				php_error_docref(NULL, E_WARNING, "Expected chunk size at pos %tu of %zu but got trash", n_ptr - encoded, encoded_len);
 				return NULL;
 			}
 		}
@@ -80,16 +78,16 @@ const char *php_http_encoding_dechunk(const char *encoded, size_t encoded_len, c
 		/* there should be CRLF after the chunk size, but we'll ignore SP+ too */
 		if (*n_ptr && !eol_match(&n_ptr, &eol_len)) {
 			if (eol_len == 2) {
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expected CRLF at pos %tu of %zu but got 0x%02X 0x%02X", n_ptr - encoded, encoded_len, *n_ptr, *(n_ptr + 1));
+				php_error_docref(NULL, E_WARNING, "Expected CRLF at pos %tu of %zu but got 0x%02X 0x%02X", n_ptr - encoded, encoded_len, *n_ptr, *(n_ptr + 1));
 			} else {
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expected LF at pos %tu of %zu but got 0x%02X", n_ptr - encoded, encoded_len, *n_ptr);
+				php_error_docref(NULL, E_WARNING, "Expected LF at pos %tu of %zu but got 0x%02X", n_ptr - encoded, encoded_len, *n_ptr);
 			}
 		}
 		n_ptr += eol_len;
 		
 		/* chunk size pretends more data than we actually got, so it's probably a truncated message */
 		if (chunk_len > (rest = encoded + encoded_len - n_ptr)) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Truncated message: chunk size %lu exceeds remaining data size %lu at pos %tu of %zu", chunk_len, rest, n_ptr - encoded, encoded_len);
+			php_error_docref(NULL, E_WARNING, "Truncated message: chunk size %lu exceeds remaining data size %lu at pos %tu of %zu", chunk_len, rest, n_ptr - encoded, encoded_len);
 			chunk_len = rest;
 		}
 
@@ -109,130 +107,7 @@ const char *php_http_encoding_dechunk(const char *encoded, size_t encoded_len, c
 	return e_ptr;
 }
 
-static inline int php_http_inflate_rounds(z_stream *Z, int flush, char **buf, size_t *len)
-{
-	int status = 0, round = 0;
-	php_http_buffer_t buffer;
-	
-	*buf = NULL;
-	*len = 0;
-	
-	php_http_buffer_init_ex(&buffer, Z->avail_in, PHP_HTTP_BUFFER_INIT_PREALLOC);
-	
-	do {
-		if (PHP_HTTP_BUFFER_NOMEM == php_http_buffer_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);
-			php_http_buffer_account(&buffer, 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
-			PHP_HTTP_INFLATE_BUFFER_SIZE_ALIGN(buffer.size);
-		}
-	} while ((Z_BUF_ERROR == status || (Z_OK == status && Z->avail_in)) && ++round < PHP_HTTP_INFLATE_ROUNDS);
-	
-	if (status == Z_OK || status == Z_STREAM_END) {
-		php_http_buffer_shrink(&buffer);
-		php_http_buffer_fix(&buffer);
-		*buf = buffer.data;
-		*len = buffer.used;
-	} else {
-		php_http_buffer_dtor(&buffer);
-	}
-	
-	return status;
-}
-
-ZEND_RESULT_CODE php_http_encoding_deflate(int flags, const char *data, size_t data_len, char **encoded, size_t *encoded_len TSRMLS_DC)
-{
-	int status, level, wbits, strategy;
-	z_stream Z;
-	
-	PHP_HTTP_DEFLATE_LEVEL_SET(flags, level);
-	PHP_HTTP_DEFLATE_WBITS_SET(flags, wbits);
-	PHP_HTTP_DEFLATE_STRATEGY_SET(flags, strategy);
-	
-	memset(&Z, 0, sizeof(z_stream));
-	*encoded = NULL;
-	*encoded_len = 0;
-	
-	status = deflateInit2(&Z, level, Z_DEFLATED, wbits, MAX_MEM_LEVEL, strategy);
-	if (Z_OK == status) {
-		*encoded_len = PHP_HTTP_DEFLATE_BUFFER_SIZE_GUESS(data_len);
-		*encoded = emalloc(*encoded_len);
-		
-		Z.next_in = (Bytef *) data;
-		Z.next_out = (Bytef *) *encoded;
-		Z.avail_in = data_len;
-		Z.avail_out = *encoded_len;
-		
-		status = deflate(&Z, Z_FINISH);
-		deflateEnd(&Z);
-		
-		if (Z_STREAM_END == status) {
-			/* size buffer down to actual length */
-			*encoded = erealloc(*encoded, Z.total_out + 1);
-			(*encoded)[*encoded_len = Z.total_out] = '\0';
-			return SUCCESS;
-		} else {
-			PTR_SET(*encoded, NULL);
-			*encoded_len = 0;
-		}
-	}
-	
-	php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not deflate data: %s", zError(status));
-	return FAILURE;
-}
-
-ZEND_RESULT_CODE php_http_encoding_inflate(const char *data, size_t data_len, char **decoded, size_t *decoded_len TSRMLS_DC)
-{
-	z_stream Z;
-	int status, wbits = PHP_HTTP_WINDOW_BITS_ANY;
-	
-	memset(&Z, 0, sizeof(z_stream));
-	
-retry_raw_inflate:
-	status = inflateInit2(&Z, wbits);
-	if (Z_OK == status) {
-		Z.next_in = (Bytef *) data;
-		Z.avail_in = data_len + 1; /* include the terminating NULL, see #61287 */
-		
-		switch (status = php_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 (PHP_HTTP_WINDOW_BITS_ANY == wbits) {
-					inflateEnd(&Z);
-					wbits = PHP_HTTP_WINDOW_BITS_RAW;
-					goto retry_raw_inflate;
-				}
-				break;
-		}
-		inflateEnd(&Z);
-
-		if (*decoded_len && *decoded) {
-			efree(*decoded);
-		}
-	}
-	
-	php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not inflate data: %s", zError(status));
-	return FAILURE;
-}
-
-php_http_encoding_stream_t *php_http_encoding_stream_init(php_http_encoding_stream_t *s, php_http_encoding_stream_ops_t *ops, unsigned flags TSRMLS_DC)
+php_http_encoding_stream_t *php_http_encoding_stream_init(php_http_encoding_stream_t *s, php_http_encoding_stream_ops_t *ops, unsigned flags)
 {
 	int freeme;
 
@@ -242,12 +117,11 @@ php_http_encoding_stream_t *php_http_encoding_stream_init(php_http_encoding_stre
 	memset(s, 0, sizeof(*s));
 
 	s->flags = flags;
-	TSRMLS_SET_CTX(s->ts);
 
-	if ((s->ops = ops)) {
+	if (EXPECTED(s->ops = ops)) {
 		php_http_encoding_stream_t *ss = s->ops->init(s);
 
-		if (ss) {
+		if (EXPECTED(ss)) {
 			return ss;
 		}
 	} else {
@@ -262,8 +136,6 @@ php_http_encoding_stream_t *php_http_encoding_stream_init(php_http_encoding_stre
 
 php_http_encoding_stream_t *php_http_encoding_stream_copy(php_http_encoding_stream_t *from, php_http_encoding_stream_t *to)
 {
-	TSRMLS_FETCH_FROM_CTX(from->ts);
-
 	if (from->ops->copy) {
 		php_http_encoding_stream_t *ns;
 
@@ -274,7 +146,6 @@ php_http_encoding_stream_t *php_http_encoding_stream_copy(php_http_encoding_stre
 
 		to->flags = from->flags;
 		to->ops = from->ops;
-		TSRMLS_SET_CTX(to->ts);
 
 		if ((ns = to->ops->copy(from, to))) {
 			return ns;
@@ -289,10 +160,13 @@ php_http_encoding_stream_t *php_http_encoding_stream_copy(php_http_encoding_stre
 ZEND_RESULT_CODE php_http_encoding_stream_reset(php_http_encoding_stream_t **s)
 {
 	php_http_encoding_stream_t *ss;
-	if ((*s)->ops->dtor) {
+
+	if (EXPECTED((*s)->ops->dtor)) {
 		(*s)->ops->dtor(*s);
 	}
-	if ((ss = (*s)->ops->init(*s))) {
+
+	if (EXPECTED(ss = (*s)->ops->init(*s))) {
+		ss->flags &= ~PHP_HTTP_ENCODING_STREAM_DIRTY;
 		*s = ss;
 		return SUCCESS;
 	}
@@ -301,10 +175,15 @@ ZEND_RESULT_CODE php_http_encoding_stream_reset(php_http_encoding_stream_t **s)
 
 ZEND_RESULT_CODE php_http_encoding_stream_update(php_http_encoding_stream_t *s, const char *in_str, size_t in_len, char **out_str, size_t *out_len)
 {
-	if (!s->ops->update) {
-		return FAILURE;
+	ZEND_RESULT_CODE rc = FAILURE;
+
+	if (EXPECTED(s->ops->update)) {
+		rc = s->ops->update(s, in_str, in_len, out_str, out_len);
 	}
-	return s->ops->update(s, in_str, in_len, out_str, out_len);
+
+	s->flags |= PHP_HTTP_ENCODING_STREAM_DIRTY;
+
+	return rc;
 }
 
 ZEND_RESULT_CODE php_http_encoding_stream_flush(php_http_encoding_stream_t *s, char **out_str, size_t *out_len)
@@ -320,7 +199,7 @@ ZEND_RESULT_CODE php_http_encoding_stream_flush(php_http_encoding_stream_t *s, c
 zend_bool php_http_encoding_stream_done(php_http_encoding_stream_t *s)
 {
 	if (!s->ops->done) {
-		return 0;
+		return !(s->flags & PHP_HTTP_ENCODING_STREAM_DIRTY);
 	}
 	return s->ops->done(s);
 }
@@ -330,6 +209,9 @@ ZEND_RESULT_CODE php_http_encoding_stream_finish(php_http_encoding_stream_t *s,
 	if (!s->ops->finish) {
 		*out_str = NULL;
 		*out_len = 0;
+
+		s->flags &= ~PHP_HTTP_ENCODING_STREAM_DIRTY;
+
 		return SUCCESS;
 	}
 	return s->ops->finish(s, out_str, out_len);
@@ -337,15 +219,15 @@ ZEND_RESULT_CODE php_http_encoding_stream_finish(php_http_encoding_stream_t *s,
 
 void php_http_encoding_stream_dtor(php_http_encoding_stream_t *s)
 {
-	if (s->ops->dtor) {
+	if (EXPECTED(s->ops->dtor)) {
 		s->ops->dtor(s);
 	}
 }
 
 void php_http_encoding_stream_free(php_http_encoding_stream_t **s)
 {
-	if (*s) {
-		if ((*s)->ops->dtor) {
+	if (EXPECTED(*s)) {
+		if (EXPECTED((*s)->ops->dtor)) {
 			(*s)->ops->dtor(*s);
 		}
 		pefree(*s, ((*s)->flags & PHP_HTTP_ENCODING_STREAM_PERSISTENT));
@@ -359,50 +241,6 @@ struct dechunk_ctx {
 	unsigned zeroed:1;
 };
 
-static php_http_encoding_stream_t *deflate_init(php_http_encoding_stream_t *s)
-{
-	int status, level, wbits, strategy, p = (s->flags & PHP_HTTP_ENCODING_STREAM_PERSISTENT);
-	z_streamp ctx = pecalloc(1, sizeof(z_stream), p);
-	TSRMLS_FETCH_FROM_CTX(s->ts);
-	
-	PHP_HTTP_DEFLATE_LEVEL_SET(s->flags, level);
-	PHP_HTTP_DEFLATE_WBITS_SET(s->flags, wbits);
-	PHP_HTTP_DEFLATE_STRATEGY_SET(s->flags, strategy);
-	
-	if (Z_OK == (status = deflateInit2(ctx, level, Z_DEFLATED, wbits, MAX_MEM_LEVEL, strategy))) {
-		if ((ctx->opaque = php_http_buffer_init_ex(NULL, PHP_HTTP_DEFLATE_BUFFER_SIZE, p ? PHP_HTTP_BUFFER_INIT_PERSISTENT : 0))) {
-			s->ctx = ctx;
-			return s;
-		}
-		deflateEnd(ctx);
-		status = Z_MEM_ERROR;
-	}
-	pefree(ctx, p);
-	php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to initialize deflate encoding stream: %s", zError(status));
-	return NULL;
-}
-
-static php_http_encoding_stream_t *inflate_init(php_http_encoding_stream_t *s)
-{
-	int status, wbits, p = (s->flags & PHP_HTTP_ENCODING_STREAM_PERSISTENT);
-	z_streamp ctx = pecalloc(1, sizeof(z_stream), p);
-	TSRMLS_FETCH_FROM_CTX(s->ts);
-	
-	PHP_HTTP_INFLATE_WBITS_SET(s->flags, wbits);
-	
-	if (Z_OK == (status = inflateInit2(ctx, wbits))) {
-		if ((ctx->opaque = php_http_buffer_init_ex(NULL, PHP_HTTP_DEFLATE_BUFFER_SIZE, p ? PHP_HTTP_BUFFER_INIT_PERSISTENT : 0))) {
-			s->ctx = ctx;
-			return s;
-		}
-		inflateEnd(ctx);
-		status = Z_MEM_ERROR;
-	}
-	pefree(ctx, p);
-	php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to initialize inflate stream: %s", zError(status));
-	return NULL;
-}
-
 static php_http_encoding_stream_t *dechunk_init(php_http_encoding_stream_t *s)
 {
 	struct dechunk_ctx *ctx = pecalloc(1, sizeof(*ctx), (s->flags & PHP_HTTP_ENCODING_STREAM_PERSISTENT));
@@ -418,49 +256,10 @@ static php_http_encoding_stream_t *dechunk_init(php_http_encoding_stream_t *s)
 	return s;
 }
 
-static php_http_encoding_stream_t *deflate_copy(php_http_encoding_stream_t *from, php_http_encoding_stream_t *to)
-{
-	int status, p = to->flags & PHP_HTTP_ENCODING_STREAM_PERSISTENT;
-	z_streamp from_ctx = from->ctx, to_ctx = pecalloc(1, sizeof(*to_ctx), p);
-	TSRMLS_FETCH_FROM_CTX(from->ts);
-
-	if (Z_OK == (status = deflateCopy(to_ctx, from_ctx))) {
-		if ((to_ctx->opaque = php_http_buffer_init_ex(NULL, PHP_HTTP_DEFLATE_BUFFER_SIZE, p ? PHP_HTTP_BUFFER_INIT_PERSISTENT : 0))) {
-			php_http_buffer_append(to_ctx->opaque, PHP_HTTP_BUFFER(from_ctx->opaque)->data, PHP_HTTP_BUFFER(from_ctx->opaque)->used);
-			to->ctx = to_ctx;
-			return to;
-		}
-		deflateEnd(to_ctx);
-		status = Z_MEM_ERROR;
-	}
-	php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to copy deflate encoding stream: %s", zError(status));
-	return NULL;
-}
-
-static php_http_encoding_stream_t *inflate_copy(php_http_encoding_stream_t *from, php_http_encoding_stream_t *to)
-{
-	int status, p = from->flags & PHP_HTTP_ENCODING_STREAM_PERSISTENT;
-	z_streamp from_ctx = from->ctx, to_ctx = pecalloc(1, sizeof(*to_ctx), p);
-	TSRMLS_FETCH_FROM_CTX(from->ts);
-
-	if (Z_OK == (status = inflateCopy(to_ctx, from_ctx))) {
-		if ((to_ctx->opaque = php_http_buffer_init_ex(NULL, PHP_HTTP_DEFLATE_BUFFER_SIZE, p ? PHP_HTTP_BUFFER_INIT_PERSISTENT : 0))) {
-			php_http_buffer_append(to_ctx->opaque, PHP_HTTP_BUFFER(from_ctx->opaque)->data, PHP_HTTP_BUFFER(from_ctx->opaque)->used);
-			to->ctx = to_ctx;
-			return to;
-		}
-		inflateEnd(to_ctx);
-		status = Z_MEM_ERROR;
-	}
-	php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to copy inflate encoding stream: %s", zError(status));
-	return NULL;
-}
-
 static php_http_encoding_stream_t *dechunk_copy(php_http_encoding_stream_t *from, php_http_encoding_stream_t *to)
 {
 	int p = from->flags & PHP_HTTP_ENCODING_STREAM_PERSISTENT;
 	struct dechunk_ctx *from_ctx = from->ctx, *to_ctx = pemalloc(sizeof(*to_ctx), p);
-	TSRMLS_FETCH_FROM_CTX(from->ts);
 
 	if (php_http_buffer_init_ex(&to_ctx->buffer, PHP_HTTP_BUFFER_DEFAULT_SIZE, p ? PHP_HTTP_BUFFER_INIT_PERSISTENT : 0)) {
 		to_ctx->hexlen = from_ctx->hexlen;
@@ -470,98 +269,17 @@ static php_http_encoding_stream_t *dechunk_copy(php_http_encoding_stream_t *from
 		return to;
 	}
 	pefree(to_ctx, p);
-	php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to copy inflate encoding stream: out of memory");
+	php_error_docref(NULL, E_WARNING, "Failed to copy inflate encoding stream: out of memory");
 	return NULL;
 }
 
-static ZEND_RESULT_CODE deflate_update(php_http_encoding_stream_t *s, const char *data, size_t data_len, char **encoded, size_t *encoded_len)
-{
-	int status;
-	z_streamp ctx = s->ctx;
-	TSRMLS_FETCH_FROM_CTX(s->ts);
-	
-	/* append input to our buffer */
-	php_http_buffer_append(PHP_HTTP_BUFFER(ctx->opaque), data, data_len);
-	
-	ctx->next_in = (Bytef *) PHP_HTTP_BUFFER(ctx->opaque)->data;
-	ctx->avail_in = PHP_HTTP_BUFFER(ctx->opaque)->used;
-	
-	/* deflate */
-	*encoded_len = PHP_HTTP_DEFLATE_BUFFER_SIZE_GUESS(data_len);
-	*encoded = emalloc(*encoded_len);
-	ctx->avail_out = *encoded_len;
-	ctx->next_out = (Bytef *) *encoded;
-	
-	switch (status = deflate(ctx, PHP_HTTP_ENCODING_STREAM_FLUSH_FLAG(s->flags))) {
-		case Z_OK:
-		case Z_STREAM_END:
-			/* cut processed chunk off the buffer */
-			if (ctx->avail_in) {
-				php_http_buffer_cut(PHP_HTTP_BUFFER(ctx->opaque), 0, PHP_HTTP_BUFFER(ctx->opaque)->used - ctx->avail_in);
-			} else {
-				php_http_buffer_reset(PHP_HTTP_BUFFER(ctx->opaque));
-			}
-			
-			/* size buffer down to actual size */
-			*encoded_len -= ctx->avail_out;
-			*encoded = erealloc(*encoded, *encoded_len + 1);
-			(*encoded)[*encoded_len] = '\0';
-			return SUCCESS;
-	}
-	
-	PTR_SET(*encoded, NULL);
-	*encoded_len = 0;
-	php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to update deflate stream: %s", zError(status));
-	return FAILURE;
-}
-
-static ZEND_RESULT_CODE inflate_update(php_http_encoding_stream_t *s, const char *data, size_t data_len, char **decoded, size_t *decoded_len)
-{
-	int status;
-	z_streamp ctx = s->ctx;
-	TSRMLS_FETCH_FROM_CTX(s->ts);
-	
-	/* append input to buffer */
-	php_http_buffer_append(PHP_HTTP_BUFFER(ctx->opaque), data, data_len);
-
-retry_raw_inflate:
-	ctx->next_in = (Bytef *) PHP_HTTP_BUFFER(ctx->opaque)->data;
-	ctx->avail_in = PHP_HTTP_BUFFER(ctx->opaque)->used;
-	
-	switch (status = php_http_inflate_rounds(ctx, PHP_HTTP_ENCODING_STREAM_FLUSH_FLAG(s->flags), decoded, decoded_len)) {
-		case Z_OK:
-		case Z_STREAM_END:
-			/* cut off */
-			if (ctx->avail_in) {
-				php_http_buffer_cut(PHP_HTTP_BUFFER(ctx->opaque), 0, PHP_HTTP_BUFFER(ctx->opaque)->used - ctx->avail_in);
-			} else {
-				php_http_buffer_reset(PHP_HTTP_BUFFER(ctx->opaque));
-			}
-			return SUCCESS;
-		
-		case Z_DATA_ERROR:
-			/* raw deflated data ? */
-			if (!(s->flags & PHP_HTTP_INFLATE_TYPE_RAW) && !ctx->total_out) {
-				inflateEnd(ctx);
-				s->flags |= PHP_HTTP_INFLATE_TYPE_RAW;
-				inflateInit2(ctx, PHP_HTTP_WINDOW_BITS_RAW);
-				goto retry_raw_inflate;
-			}
-			break;
-	}
-	
-	php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to update inflate stream: %s", zError(status));
-	return FAILURE;
-}
-
 static ZEND_RESULT_CODE dechunk_update(php_http_encoding_stream_t *s, const char *data, size_t data_len, char **decoded, size_t *decoded_len)
 {
 	php_http_buffer_t tmp;
 	struct dechunk_ctx *ctx = s->ctx;
-	TSRMLS_FETCH_FROM_CTX(s->ts);
 
 	if (ctx->zeroed) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Dechunk encoding stream has already reached the end of chunked input");
+		php_error_docref(NULL, E_WARNING, "Dechunk encoding stream has already reached the end of chunked input");
 		return FAILURE;
 	}
 	if ((PHP_HTTP_BUFFER_NOMEM == php_http_buffer_append(&ctx->buffer, data, data_len)) || !php_http_buffer_fix(&ctx->buffer)) {
@@ -641,7 +359,7 @@ static ZEND_RESULT_CODE dechunk_update(php_http_encoding_stream_t *s, const char
 					/*	if strtoul() stops at the beginning of the buffered data
 						there's something oddly wrong, i.e. bad input */
 					if (stop == ctx->buffer.data) {
-						php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse chunk len from '%.*s'", (int) MIN(16, ctx->buffer.used), ctx->buffer.data);
+						php_error_docref(NULL, E_WARNING, "Failed to parse chunk len from '%.*s'", (int) MIN(16, ctx->buffer.used), ctx->buffer.data);
 						php_http_buffer_dtor(&tmp);
 						return FAILURE;
 					}
@@ -682,35 +400,6 @@ static ZEND_RESULT_CODE dechunk_update(php_http_encoding_stream_t *s, const char
 	return SUCCESS;
 }
 
-static ZEND_RESULT_CODE deflate_flush(php_http_encoding_stream_t *s, char **encoded, size_t *encoded_len)
-{
-	int status;
-	z_streamp ctx = s->ctx;
-	TSRMLS_FETCH_FROM_CTX(s->ts);
-	
-	*encoded_len = PHP_HTTP_DEFLATE_BUFFER_SIZE;
-	*encoded = emalloc(*encoded_len);
-	
-	ctx->avail_in = 0;
-	ctx->next_in = NULL;
-	ctx->avail_out = *encoded_len;
-	ctx->next_out = (Bytef *) *encoded;
-	
-	switch (status = deflate(ctx, Z_FULL_FLUSH)) {
-		case Z_OK:
-		case Z_STREAM_END:
-			*encoded_len = PHP_HTTP_DEFLATE_BUFFER_SIZE - ctx->avail_out;
-			*encoded = erealloc(*encoded, *encoded_len + 1);
-			(*encoded)[*encoded_len] = '\0';
-			return SUCCESS;
-	}
-	
-	PTR_SET(*encoded, NULL);
-	*encoded_len = 0;
-	php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to flush deflate stream: %s", zError(status));
-	return FAILURE;
-}
-
 static ZEND_RESULT_CODE dechunk_flush(php_http_encoding_stream_t *s, char **decoded, size_t *decoded_len)
 {
 	struct dechunk_ctx *ctx = s->ctx;
@@ -731,127 +420,13 @@ static ZEND_RESULT_CODE dechunk_flush(php_http_encoding_stream_t *s, char **deco
 	return SUCCESS;
 }
 
-static ZEND_RESULT_CODE deflate_finish(php_http_encoding_stream_t *s, char **encoded, size_t *encoded_len)
-{
-	int status;
-	z_streamp ctx = s->ctx;
-	TSRMLS_FETCH_FROM_CTX(s->ts);
-	
-	*encoded_len = PHP_HTTP_DEFLATE_BUFFER_SIZE;
-	*encoded = emalloc(*encoded_len);
-	
-	/* deflate remaining input */
-	ctx->next_in = (Bytef *) PHP_HTTP_BUFFER(ctx->opaque)->data;
-	ctx->avail_in = PHP_HTTP_BUFFER(ctx->opaque)->used;
-	
-	ctx->avail_out = *encoded_len;
-	ctx->next_out = (Bytef *) *encoded;
-	
-	do {
-		status = deflate(ctx, Z_FINISH);
-	} while (Z_OK == status);
-	
-	if (Z_STREAM_END == status) {
-		/* cut processed input off */
-		php_http_buffer_cut(PHP_HTTP_BUFFER(ctx->opaque), 0, PHP_HTTP_BUFFER(ctx->opaque)->used - ctx->avail_in);
-		
-		/* size down */
-		*encoded_len -= ctx->avail_out;
-		*encoded = erealloc(*encoded, *encoded_len + 1);
-		(*encoded)[*encoded_len] = '\0';
-		return SUCCESS;
-	}
-	
-	PTR_SET(*encoded, NULL);
-	*encoded_len = 0;
-	php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to finish deflate stream: %s", zError(status));
-	return FAILURE;
-}
-
-static ZEND_RESULT_CODE inflate_finish(php_http_encoding_stream_t *s, char **decoded, size_t *decoded_len)
-{
-	int status;
-	z_streamp ctx = s->ctx;
-	TSRMLS_FETCH_FROM_CTX(s->ts);
-	
-	if (!PHP_HTTP_BUFFER(ctx->opaque)->used) {
-		*decoded = NULL;
-		*decoded_len = 0;
-		return SUCCESS;
-	}
-	
-	*decoded_len = (PHP_HTTP_BUFFER(ctx->opaque)->used + 1) * PHP_HTTP_INFLATE_ROUNDS;
-	*decoded = emalloc(*decoded_len);
-	
-	/* inflate remaining input */
-	ctx->next_in = (Bytef *) PHP_HTTP_BUFFER(ctx->opaque)->data;
-	ctx->avail_in = PHP_HTTP_BUFFER(ctx->opaque)->used;
-	
-	ctx->avail_out = *decoded_len;
-	ctx->next_out = (Bytef *) *decoded;
-	
-	if (Z_STREAM_END == (status = inflate(ctx, Z_FINISH))) {
-		/* cut processed input off */
-		php_http_buffer_cut(PHP_HTTP_BUFFER(ctx->opaque), 0, PHP_HTTP_BUFFER(ctx->opaque)->used - ctx->avail_in);
-		
-		/* size down */
-		*decoded_len -= ctx->avail_out;
-		*decoded = erealloc(*decoded, *decoded_len + 1);
-		(*decoded)[*decoded_len] = '\0';
-		return SUCCESS;
-	}
-	
-	PTR_SET(*decoded, NULL);
-	*decoded_len = 0;
-	php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to finish inflate stream: %s", zError(status));
-	return FAILURE;
-}
-
-static zend_bool deflate_done(php_http_encoding_stream_t *s)
-{
-	z_streamp ctx = s->ctx;
-	return !ctx->avail_in && !PHP_HTTP_BUFFER(ctx->opaque)->used;
-}
 
-static zend_bool inflate_done(php_http_encoding_stream_t *s)
-{
-	z_streamp ctx = s->ctx;
-	return !ctx->avail_in && !PHP_HTTP_BUFFER(ctx->opaque)->used;
-}
 
 static zend_bool dechunk_done(php_http_encoding_stream_t *s)
 {
 	return ((struct dechunk_ctx *) s->ctx)->zeroed;
 }
 
-static void deflate_dtor(php_http_encoding_stream_t *s)
-{
-	if (s->ctx) {
-		z_streamp ctx = s->ctx;
-
-		if (ctx->opaque) {
-			php_http_buffer_free((php_http_buffer_t **) &ctx->opaque);
-		}
-		deflateEnd(ctx);
-		pefree(ctx, (s->flags & PHP_HTTP_ENCODING_STREAM_PERSISTENT));
-		s->ctx = NULL;
-	}
-}
-
-static void inflate_dtor(php_http_encoding_stream_t *s)
-{
-	if (s->ctx) {
-		z_streamp ctx = s->ctx;
-
-		if (ctx->opaque) {
-			php_http_buffer_free((php_http_buffer_t **) &ctx->opaque);
-		}
-		inflateEnd(ctx);
-		pefree(ctx, (s->flags & PHP_HTTP_ENCODING_STREAM_PERSISTENT));
-		s->ctx = NULL;
-	}
-}
-
 static void dechunk_dtor(php_http_encoding_stream_t *s)
 {
 	if (s->ctx) {
@@ -863,36 +438,6 @@ static void dechunk_dtor(php_http_encoding_stream_t *s)
 	}
 }
 
-static php_http_encoding_stream_ops_t php_http_encoding_deflate_ops = {
-	deflate_init,
-	deflate_copy,
-	deflate_update,
-	deflate_flush,
-	deflate_done,
-	deflate_finish,
-	deflate_dtor
-};
-
-php_http_encoding_stream_ops_t *php_http_encoding_stream_get_deflate_ops(void)
-{
-	return &php_http_encoding_deflate_ops;
-}
-
-static php_http_encoding_stream_ops_t php_http_encoding_inflate_ops = {
-	inflate_init,
-	inflate_copy,
-	inflate_update,
-	NULL,
-	inflate_done,
-	inflate_finish,
-	inflate_dtor
-};
-
-php_http_encoding_stream_ops_t *php_http_encoding_stream_get_inflate_ops(void)
-{
-	return &php_http_encoding_inflate_ops;
-}
-
 static php_http_encoding_stream_ops_t php_http_encoding_dechunk_ops = {
 	dechunk_init,
 	dechunk_copy,
@@ -910,53 +455,63 @@ php_http_encoding_stream_ops_t *php_http_encoding_stream_get_dechunk_ops(void)
 
 static zend_object_handlers php_http_encoding_stream_object_handlers;
 
-zend_object_value php_http_encoding_stream_object_new(zend_class_entry *ce TSRMLS_DC)
+zend_object *php_http_encoding_stream_object_new(zend_class_entry *ce)
 {
-	return php_http_encoding_stream_object_new_ex(ce, NULL, NULL TSRMLS_CC);
+	return &php_http_encoding_stream_object_new_ex(ce, NULL)->zo;
 }
 
-zend_object_value php_http_encoding_stream_object_new_ex(zend_class_entry *ce, php_http_encoding_stream_t *s, php_http_encoding_stream_object_t **ptr TSRMLS_DC)
+php_http_encoding_stream_object_t *php_http_encoding_stream_object_new_ex(zend_class_entry *ce, php_http_encoding_stream_t *s)
 {
 	php_http_encoding_stream_object_t *o;
 
-	o = ecalloc(1, sizeof(*o));
-	zend_object_std_init((zend_object *) o, ce TSRMLS_CC);
-	object_properties_init((zend_object *) o, ce);
-
-	if (ptr) {
-		*ptr = o;
-	}
+	o = ecalloc(1, sizeof(*o) + zend_object_properties_size(ce));
+	zend_object_std_init(&o->zo, ce);
+	object_properties_init(&o->zo, ce);
 
 	if (s) {
 		o->stream = s;
 	}
 
-	o->zv.handle = zend_objects_store_put((zend_object *) o, NULL, php_http_encoding_stream_object_free, NULL TSRMLS_CC);
-	o->zv.handlers = &php_http_encoding_stream_object_handlers;
+	o->zo.handlers = &php_http_encoding_stream_object_handlers;
 
-	return o->zv;
+	return o;
 }
 
-zend_object_value php_http_encoding_stream_object_clone(zval *this_ptr TSRMLS_DC)
+zend_object *php_http_encoding_stream_object_clone(zval *object)
 {
-	zend_object_value new_ov;
-	php_http_encoding_stream_object_t *new_obj = NULL, *old_obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+	php_http_encoding_stream_object_t *new_obj, *old_obj = PHP_HTTP_OBJ(NULL, object);
+	php_http_encoding_stream_t *cpy = php_http_encoding_stream_copy(old_obj->stream, NULL);
 
-	new_ov = php_http_encoding_stream_object_new_ex(old_obj->zo.ce, php_http_encoding_stream_copy(old_obj->stream, NULL), &new_obj TSRMLS_CC);
-	zend_objects_clone_members(&new_obj->zo, new_ov, &old_obj->zo, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC);
+	if (!cpy) {
+		return NULL;
+	}
+
+	new_obj = php_http_encoding_stream_object_new_ex(old_obj->zo.ce, cpy);
+	zend_objects_clone_members(&new_obj->zo, &old_obj->zo);
 
-	return new_ov;
+	return &new_obj->zo;
 }
 
-void php_http_encoding_stream_object_free(void *object TSRMLS_DC)
+void php_http_encoding_stream_object_free(zend_object *object)
 {
-	php_http_encoding_stream_object_t *o = (php_http_encoding_stream_object_t *) object;
+	php_http_encoding_stream_object_t *o = PHP_HTTP_OBJ(object, NULL);
 
 	if (o->stream) {
 		php_http_encoding_stream_free(&o->stream);
 	}
-	zend_object_std_dtor((zend_object *) o TSRMLS_CC);
-	efree(o);
+	zend_object_std_dtor(object);
+}
+
+static zend_class_entry *php_http_encoding_stream_class_entry;
+zend_class_entry *php_http_get_encoding_stream_class_entry(void)
+{
+	return php_http_encoding_stream_class_entry;
+}
+
+static zend_class_entry *php_http_dechunk_stream_class_entry;
+zend_class_entry *php_http_get_dechunk_stream_class_entry(void)
+{
+	return php_http_dechunk_stream_class_entry;
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpEncodingStream___construct, 0, 0, 0)
@@ -964,31 +519,37 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpEncodingStream___construct, 0, 0, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(HttpEncodingStream, __construct)
 {
-	long flags = 0;
+	zend_long flags = 0;
 	php_http_encoding_stream_object_t *obj;
 	php_http_encoding_stream_ops_t *ops;
 
-	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &flags), invalid_arg, return);
+	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &flags), invalid_arg, return);
 
-	obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+	obj = PHP_HTTP_OBJ(NULL, getThis());
 
-	if (obj->stream) {
+	if (UNEXPECTED(obj->stream)) {
 		php_http_throw(bad_method_call, "http\\Encoding\\Stream cannot be initialized twice", NULL);
 		return;
 	}
 
-	if (instanceof_function(obj->zo.ce, php_http_deflate_stream_class_entry TSRMLS_CC)) {
-		ops = &php_http_encoding_deflate_ops;
-	} else if (instanceof_function(obj->zo.ce, php_http_inflate_stream_class_entry TSRMLS_CC)) {
-		ops = &php_http_encoding_inflate_ops;
-	} else if (instanceof_function(obj->zo.ce, php_http_dechunk_stream_class_entry TSRMLS_CC)) {
+	if (instanceof_function(obj->zo.ce, php_http_get_deflate_stream_class_entry())) {
+		ops = php_http_encoding_stream_get_deflate_ops();
+	} else if (instanceof_function(obj->zo.ce, php_http_get_inflate_stream_class_entry())) {
+		ops = php_http_encoding_stream_get_inflate_ops();
+	} else if (instanceof_function(obj->zo.ce, php_http_dechunk_stream_class_entry)) {
 		ops = &php_http_encoding_dechunk_ops;
+#if PHP_HTTP_HAVE_LIBBROTLI
+	} else if (instanceof_function(obj->zo.ce, php_http_get_enbrotli_stream_class_entry())) {
+		ops = php_http_encoding_stream_get_enbrotli_ops();
+	} else if (instanceof_function(obj->zo.ce, php_http_get_debrotli_stream_class_entry())) {
+		ops = php_http_encoding_stream_get_debrotli_ops();
+#endif
 	} else {
-		php_http_throw(runtime, "Unknown http\\Encoding\\Stream class '%s'", obj->zo.ce->name);
+		php_http_throw(runtime, "Unknown http\\Encoding\\Stream class '%s'", obj->zo.ce->name->val);
 		return;
 	}
 
-	php_http_expect(obj->stream = php_http_encoding_stream_init(obj->stream, ops, flags TSRMLS_CC), runtime, return);
+	php_http_expect(obj->stream = php_http_encoding_stream_init(obj->stream, ops, flags), runtime, return);
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpEncodingStream_update, 0, 0, 1)
@@ -996,18 +557,22 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpEncodingStream_update, 0, 0, 1)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(HttpEncodingStream, update)
 {
-	int data_len;
+	size_t data_len;
 	char *data_str;
 
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &data_str, &data_len)) {
-		php_http_encoding_stream_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+	if (EXPECTED(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "s", &data_str, &data_len))) {
+		php_http_encoding_stream_object_t *obj = PHP_HTTP_OBJ(NULL, getThis());
 
-		if (obj->stream) {
+		if (EXPECTED(obj->stream)) {
+			char *encoded_str = NULL;
 			size_t encoded_len;
-			char *encoded_str;
 
-			if (SUCCESS == php_http_encoding_stream_update(obj->stream, data_str, data_len, &encoded_str, &encoded_len)) {
-				RETURN_STRINGL(encoded_str, encoded_len, 0);
+			if (EXPECTED(SUCCESS == php_http_encoding_stream_update(obj->stream, data_str, data_len, &encoded_str, &encoded_len))) {
+				if (EXPECTED(encoded_str)) {
+					RETURN_STR(php_http_cs2zs(encoded_str, encoded_len));
+				} else {
+					RETURN_EMPTY_STRING();
+				}
 			}
 		}
 	}
@@ -1017,16 +582,16 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpEncodingStream_flush, 0, 0, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(HttpEncodingStream, flush)
 {
-	if (SUCCESS == zend_parse_parameters_none()) {
-		php_http_encoding_stream_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+	if (EXPECTED(SUCCESS == zend_parse_parameters_none())) {
+		php_http_encoding_stream_object_t *obj = PHP_HTTP_OBJ(NULL, getThis());
 
-		if (obj->stream) {
-			char *encoded_str;
+		if (EXPECTED(obj->stream)) {
+			char *encoded_str = NULL;
 			size_t encoded_len;
 
-			if (SUCCESS == php_http_encoding_stream_flush(obj->stream, &encoded_str, &encoded_len)) {
+			if (EXPECTED(SUCCESS == php_http_encoding_stream_flush(obj->stream, &encoded_str, &encoded_len))) {
 				if (encoded_str) {
-					RETURN_STRINGL(encoded_str, encoded_len, 0);
+					RETURN_STR(php_http_cs2zs(encoded_str, encoded_len));
 				} else {
 					RETURN_EMPTY_STRING();
 				}
@@ -1039,10 +604,10 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpEncodingStream_done, 0, 0, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(HttpEncodingStream, done)
 {
-	if (SUCCESS == zend_parse_parameters_none()) {
-		php_http_encoding_stream_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+	if (EXPECTED(SUCCESS == zend_parse_parameters_none())) {
+		php_http_encoding_stream_object_t *obj = PHP_HTTP_OBJ(NULL, getThis());
 
-		if (obj->stream) {
+		if (EXPECTED(obj->stream)) {
 			RETURN_BOOL(php_http_encoding_stream_done(obj->stream));
 		}
 	}
@@ -1052,17 +617,17 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpEncodingStream_finish, 0, 0, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(HttpEncodingStream, finish)
 {
-	if (SUCCESS == zend_parse_parameters_none()) {
-		php_http_encoding_stream_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+	if (EXPECTED(SUCCESS == zend_parse_parameters_none())) {
+		php_http_encoding_stream_object_t *obj = PHP_HTTP_OBJ(NULL, getThis());
 
-		if (obj->stream) {
-			char *encoded_str;
+		if (EXPECTED(obj->stream)) {
+			char *encoded_str = NULL;
 			size_t encoded_len;
 
-			if (SUCCESS == php_http_encoding_stream_finish(obj->stream, &encoded_str, &encoded_len)) {
-				if (SUCCESS == php_http_encoding_stream_reset(&obj->stream)) {
+			if (EXPECTED(SUCCESS == php_http_encoding_stream_finish(obj->stream, &encoded_str, &encoded_len))) {
+				if (EXPECTED(SUCCESS == php_http_encoding_stream_reset(&obj->stream))) {
 					if (encoded_str) {
-						RETURN_STRINGL(encoded_str, encoded_len, 0);
+						RETURN_STR(php_http_cs2zs(encoded_str, encoded_len));
 					} else {
 						RETURN_EMPTY_STRING();
 					}
@@ -1075,7 +640,7 @@ static PHP_METHOD(HttpEncodingStream, finish)
 }
 
 static zend_function_entry php_http_encoding_stream_methods[] = {
-	PHP_ME(HttpEncodingStream, __construct,  ai_HttpEncodingStream___construct,  ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+	PHP_ME(HttpEncodingStream, __construct,  ai_HttpEncodingStream___construct,  ZEND_ACC_PUBLIC)
 	PHP_ME(HttpEncodingStream, update,       ai_HttpEncodingStream_update,       ZEND_ACC_PUBLIC)
 	PHP_ME(HttpEncodingStream, flush,        ai_HttpEncodingStream_flush,        ZEND_ACC_PUBLIC)
 	PHP_ME(HttpEncodingStream, done,         ai_HttpEncodingStream_done,         ZEND_ACC_PUBLIC)
@@ -1083,56 +648,6 @@ static zend_function_entry php_http_encoding_stream_methods[] = {
 	EMPTY_FUNCTION_ENTRY
 };
 
-ZEND_BEGIN_ARG_INFO_EX(ai_HttpDeflateStream_encode, 0, 0, 1)
-	ZEND_ARG_INFO(0, data)
-	ZEND_ARG_INFO(0, flags)
-ZEND_END_ARG_INFO();
-static PHP_METHOD(HttpDeflateStream, encode)
-{
-	char *str;
-	int len;
-	long flags = 0;
-
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &str, &len, &flags)) {
-		char *enc_str;
-		size_t enc_len;
-
-		if (SUCCESS == php_http_encoding_deflate(flags, str, len, &enc_str, &enc_len TSRMLS_CC)) {
-			RETURN_STRINGL(enc_str, enc_len, 0);
-		}
-	}
-	RETURN_FALSE;
-}
-
-static zend_function_entry php_http_deflate_stream_methods[] = {
-	PHP_ME(HttpDeflateStream, encode, ai_HttpDeflateStream_encode, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-	EMPTY_FUNCTION_ENTRY
-};
-
-ZEND_BEGIN_ARG_INFO_EX(ai_HttpInflateStream_decode, 0, 0, 1)
-	ZEND_ARG_INFO(0, data)
-ZEND_END_ARG_INFO();
-static PHP_METHOD(HttpInflateStream, decode)
-{
-	char *str;
-	int len;
-
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &len)) {
-		char *enc_str;
-		size_t enc_len;
-
-		if (SUCCESS == php_http_encoding_inflate(str, len, &enc_str, &enc_len TSRMLS_CC)) {
-			RETURN_STRINGL(enc_str, enc_len, 0);
-		}
-	}
-	RETURN_FALSE;
-}
-
-static zend_function_entry php_http_inflate_stream_methods[] = {
-	PHP_ME(HttpInflateStream, decode, ai_HttpInflateStream_decode, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-	EMPTY_FUNCTION_ENTRY
-};
-
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpDechunkStream_decode, 0, 0, 1)
 	ZEND_ARG_INFO(0, data)
 	ZEND_ARG_INFO(1, decoded_len)
@@ -1140,20 +655,25 @@ ZEND_END_ARG_INFO();
 static PHP_METHOD(HttpDechunkStream, decode)
 {
 	char *str;
-	int len;
+	size_t len;
 	zval *zlen = NULL;
 
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|z!", &str, &len, &zlen)) {
+	if (EXPECTED(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "s|z!", &str, &len, &zlen))) {
 		const char *end_ptr;
-		char *enc_str;
+		char *enc_str = NULL;
 		size_t enc_len;
 
-		if ((end_ptr = php_http_encoding_dechunk(str, len, &enc_str, &enc_len TSRMLS_CC))) {
+		if (EXPECTED(end_ptr = php_http_encoding_dechunk(str, len, &enc_str, &enc_len))) {
 			if (zlen) {
+				ZVAL_DEREF(zlen);
 				zval_dtor(zlen);
 				ZVAL_LONG(zlen, str + len - end_ptr);
 			}
-			RETURN_STRINGL(enc_str, enc_len, 0);
+			if (enc_str) {
+				RETURN_STR(php_http_cs2zs(enc_str, enc_len));
+			} else {
+				RETURN_EMPTY_STRING();
+			}
 		}
 	}
 	RETURN_FALSE;
@@ -1164,54 +684,31 @@ static zend_function_entry php_http_dechunk_stream_methods[] = {
 	EMPTY_FUNCTION_ENTRY
 };
 
-zend_class_entry *php_http_encoding_stream_class_entry;
-zend_class_entry *php_http_deflate_stream_class_entry;
-zend_class_entry *php_http_inflate_stream_class_entry;
-zend_class_entry *php_http_dechunk_stream_class_entry;
-
 PHP_MINIT_FUNCTION(http_encoding)
 {
 	zend_class_entry ce = {0};
 
 	INIT_NS_CLASS_ENTRY(ce, "http\\Encoding", "Stream", php_http_encoding_stream_methods);
-	php_http_encoding_stream_class_entry = zend_register_internal_class(&ce TSRMLS_CC);
+	php_http_encoding_stream_class_entry = zend_register_internal_class(&ce);
 	php_http_encoding_stream_class_entry->ce_flags |= ZEND_ACC_EXPLICIT_ABSTRACT_CLASS;
 	php_http_encoding_stream_class_entry->create_object = php_http_encoding_stream_object_new;
 	memcpy(&php_http_encoding_stream_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
+	php_http_encoding_stream_object_handlers.offset = XtOffsetOf(php_http_encoding_stream_object_t, zo);
 	php_http_encoding_stream_object_handlers.clone_obj = php_http_encoding_stream_object_clone;
+	php_http_encoding_stream_object_handlers.free_obj = php_http_encoding_stream_object_free;
 
-	zend_declare_class_constant_long(php_http_encoding_stream_class_entry, ZEND_STRL("FLUSH_NONE"), PHP_HTTP_ENCODING_STREAM_FLUSH_NONE TSRMLS_CC);
-	zend_declare_class_constant_long(php_http_encoding_stream_class_entry, ZEND_STRL("FLUSH_SYNC"), PHP_HTTP_ENCODING_STREAM_FLUSH_SYNC TSRMLS_CC);
-	zend_declare_class_constant_long(php_http_encoding_stream_class_entry, ZEND_STRL("FLUSH_FULL"), PHP_HTTP_ENCODING_STREAM_FLUSH_FULL TSRMLS_CC);
-
-	memset(&ce, 0, sizeof(ce));
-	INIT_NS_CLASS_ENTRY(ce, "http\\Encoding\\Stream", "Deflate", php_http_deflate_stream_methods);
-	php_http_deflate_stream_class_entry = zend_register_internal_class_ex(&ce, php_http_encoding_stream_class_entry, NULL TSRMLS_CC);
-
-	zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("TYPE_GZIP"), PHP_HTTP_DEFLATE_TYPE_GZIP TSRMLS_CC);
-	zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("TYPE_ZLIB"), PHP_HTTP_DEFLATE_TYPE_ZLIB TSRMLS_CC);
-	zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("TYPE_RAW"), PHP_HTTP_DEFLATE_TYPE_RAW TSRMLS_CC);
-	zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("LEVEL_DEF"), PHP_HTTP_DEFLATE_LEVEL_DEF TSRMLS_CC);
-	zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("LEVEL_MIN"), PHP_HTTP_DEFLATE_LEVEL_MIN TSRMLS_CC);
-	zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("LEVEL_MAX"), PHP_HTTP_DEFLATE_LEVEL_MAX TSRMLS_CC);
-	zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("STRATEGY_DEF"), PHP_HTTP_DEFLATE_STRATEGY_DEF TSRMLS_CC);
-	zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("STRATEGY_FILT"), PHP_HTTP_DEFLATE_STRATEGY_FILT TSRMLS_CC);
-	zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("STRATEGY_HUFF"), PHP_HTTP_DEFLATE_STRATEGY_HUFF TSRMLS_CC);
-	zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("STRATEGY_RLE"), PHP_HTTP_DEFLATE_STRATEGY_RLE TSRMLS_CC);
-	zend_declare_class_constant_long(php_http_deflate_stream_class_entry, ZEND_STRL("STRATEGY_FIXED"), PHP_HTTP_DEFLATE_STRATEGY_FIXED TSRMLS_CC);
-
-	memset(&ce, 0, sizeof(ce));
-	INIT_NS_CLASS_ENTRY(ce, "http\\Encoding\\Stream", "Inflate", php_http_inflate_stream_methods);
-	php_http_inflate_stream_class_entry = zend_register_internal_class_ex(&ce, php_http_encoding_stream_class_entry, NULL TSRMLS_CC);
+	zend_declare_class_constant_long(php_http_encoding_stream_class_entry, ZEND_STRL("FLUSH_NONE"), PHP_HTTP_ENCODING_STREAM_FLUSH_NONE);
+	zend_declare_class_constant_long(php_http_encoding_stream_class_entry, ZEND_STRL("FLUSH_SYNC"), PHP_HTTP_ENCODING_STREAM_FLUSH_SYNC);
+	zend_declare_class_constant_long(php_http_encoding_stream_class_entry, ZEND_STRL("FLUSH_FULL"), PHP_HTTP_ENCODING_STREAM_FLUSH_FULL);
 
 	memset(&ce, 0, sizeof(ce));
 	INIT_NS_CLASS_ENTRY(ce, "http\\Encoding\\Stream", "Dechunk", php_http_dechunk_stream_methods);
-	php_http_dechunk_stream_class_entry = zend_register_internal_class_ex(&ce, php_http_encoding_stream_class_entry, NULL TSRMLS_CC);
+	php_http_dechunk_stream_class_entry = zend_register_internal_class_ex(&ce, php_http_encoding_stream_class_entry);
+	php_http_dechunk_stream_class_entry->create_object = php_http_encoding_stream_object_new;
 
 	return SUCCESS;
 }
 
-
 /*
  * Local variables:
  * tab-width: 4