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

diff --git a/src/php_http_encoding.c b/src/php_http_encoding.c
index ad43853..c3e9a3a 100644
--- a/src/php_http_encoding.c
+++ b/src/php_http_encoding.c
@@ -164,7 +164,9 @@ ZEND_RESULT_CODE php_http_encoding_stream_reset(php_http_encoding_stream_t **s)
 	if (EXPECTED((*s)->ops->dtor)) {
 		(*s)->ops->dtor(*s);
 	}
+
 	if (EXPECTED(ss = (*s)->ops->init(*s))) {
+		ss->flags &= ~PHP_HTTP_ENCODING_STREAM_DIRTY;
 		*s = ss;
 		return SUCCESS;
 	}
@@ -173,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 (UNEXPECTED(!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)
@@ -192,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);
 }
@@ -202,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);
@@ -472,6 +482,10 @@ zend_object *php_http_encoding_stream_object_clone(zval *object)
 	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);
 
+	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);
 
@@ -524,10 +538,12 @@ static PHP_METHOD(HttpEncodingStream, __construct)
 		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->val);
 		return;
@@ -624,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)