X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_encoding.c;h=a418a21b1ef6069ade6823ebdbdb7c9436a1422d;hp=07a026d3fe532de0cd44cd9c1a60b6c95106637a;hb=50546d76a9bf44bba6237df7c8101be125bc929a;hpb=c5c580f24e24e8032a0554a2e39e38c496144bc2

diff --git a/php_http_encoding.c b/php_http_encoding.c
index 07a026d..a418a21 100644
--- a/php_http_encoding.c
+++ b/php_http_encoding.c
@@ -393,7 +393,6 @@ static php_http_encoding_stream_t *inflate_init(php_http_encoding_stream_t *s)
 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));
-	TSRMLS_FETCH_FROM_CTX(s->ts);
 
 	if (!php_http_buffer_init_ex(&ctx->buffer, PHP_HTTP_BUFFER_DEFAULT_SIZE, (s->flags & PHP_HTTP_ENCODING_STREAM_PERSISTENT) ? PHP_HTTP_BUFFER_INIT_PERSISTENT : 0)) {
 		return NULL;
@@ -486,7 +485,7 @@ static STATUS inflate_update(php_http_encoding_stream_t *s, const char *data, si
 	
 	/* 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_VAL(ctx->opaque);
 	ctx->avail_in = PHP_HTTP_BUFFER_LEN(ctx->opaque);
@@ -942,7 +941,7 @@ void php_http_encoding_stream_object_free(void *object TSRMLS_DC)
 	php_http_encoding_stream_object_t *o = (php_http_encoding_stream_object_t *) object;
 
 	if (o->stream) {
-		php_http_encoding_stream_free(&o->stream TSRMLS_CC);
+		php_http_encoding_stream_free(&o->stream);
 	}
 	zend_object_std_dtor((zend_object *) o TSRMLS_CC);
 	efree(o);
@@ -950,11 +949,11 @@ void php_http_encoding_stream_object_free(void *object TSRMLS_DC)
 
 PHP_METHOD(HttpEncodingStream, __construct)
 {
-	with_error_handling(EH_THROW, PHP_HTTP_EX_CE(runtime)) {
+	with_error_handling(EH_THROW, php_http_exception_class_entry) {
 		long flags = 0;
 
 		if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &flags)) {
-			with_error_handling(EH_THROW, PHP_HTTP_EX_CE(encoding)) {
+			with_error_handling(EH_THROW, php_http_exception_class_entry) {
 				php_http_encoding_stream_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
 				if (!obj->stream) {
@@ -994,7 +993,7 @@ PHP_METHOD(HttpEncodingStream, update)
 			size_t encoded_len;
 			char *encoded_str;
 
-			if (SUCCESS == php_http_encoding_stream_update(obj->stream, data_str, data_len, &encoded_str, &encoded_len TSRMLS_CC)) {
+			if (SUCCESS == php_http_encoding_stream_update(obj->stream, data_str, data_len, &encoded_str, &encoded_len)) {
 				RETURN_STRINGL(encoded_str, encoded_len, 0);
 			}
 		}
@@ -1011,7 +1010,7 @@ PHP_METHOD(HttpEncodingStream, flush)
 			char *encoded_str;
 			size_t encoded_len;
 
-			if (SUCCESS == php_http_encoding_stream_flush(obj->stream, &encoded_str, &encoded_len TSRMLS_CC)) {
+			if (SUCCESS == php_http_encoding_stream_flush(obj->stream, &encoded_str, &encoded_len)) {
 				RETURN_STRINGL(encoded_str, encoded_len, 0);
 			}
 		}
@@ -1040,7 +1039,7 @@ PHP_METHOD(HttpEncodingStream, finish)
 			char *encoded_str;
 			size_t encoded_len;
 
-			if (SUCCESS == php_http_encoding_stream_finish(obj->stream, &encoded_str, &encoded_len TSRMLS_CC)) {
+			if (SUCCESS == php_http_encoding_stream_finish(obj->stream, &encoded_str, &encoded_len)) {
 				if (SUCCESS == php_http_encoding_stream_reset(&obj->stream)) {
 					RETURN_STRINGL(encoded_str, encoded_len, 0);
 				} else {
@@ -1162,7 +1161,7 @@ PHP_METHOD(HttpDechunkStream, decode)
 
 PHP_MINIT_FUNCTION(http_encoding)
 {
-	PHP_HTTP_REGISTER_CLASS(http\\encoding, Stream, http_encoding_stream, php_http_object_class_entry, ZEND_ACC_EXPLICIT_ABSTRACT_CLASS);
+	PHP_HTTP_REGISTER_CLASS(http\\Encoding, Stream, http_encoding_stream, php_http_object_class_entry, 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.clone_obj = php_http_encoding_stream_object_clone;
@@ -1171,7 +1170,7 @@ PHP_MINIT_FUNCTION(http_encoding)
 	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);
 
-	PHP_HTTP_REGISTER_CLASS(http\\encoding\\stream, Deflate, http_deflate_stream, php_http_encoding_stream_class_entry, 0);
+	PHP_HTTP_REGISTER_CLASS(http\\Encoding\\Stream, Deflate, http_deflate_stream, php_http_encoding_stream_class_entry, 0);
 
 	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);
@@ -1185,8 +1184,8 @@ PHP_MINIT_FUNCTION(http_encoding)
 	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);
 
-	PHP_HTTP_REGISTER_CLASS(http\\encoding\\stream, Inflate, http_inflate_stream, php_http_encoding_stream_class_entry, 0);
-	PHP_HTTP_REGISTER_CLASS(http\\encoding\\stream, Dechunk, http_dechunk_stream, php_http_encoding_stream_class_entry, 0);
+	PHP_HTTP_REGISTER_CLASS(http\\Encoding\\Stream, Inflate, http_inflate_stream, php_http_encoding_stream_class_entry, 0);
+	PHP_HTTP_REGISTER_CLASS(http\\Encoding\\Stream, Dechunk, http_dechunk_stream, php_http_encoding_stream_class_entry, 0);
 
 	return SUCCESS;
 }