X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message_parser.c;h=92c8e4073aad391bd5f25bb9c2be32605167af88;hp=0d11bf6aed153a2843ec87d6c5af85ae57021e07;hb=468e8d748d365811af4ce890fd8fc4c1f88cc08a;hpb=07436695bedb3a99ad39bb2fcba7ca0d27eaaedd

diff --git a/php_http_message_parser.c b/php_http_message_parser.c
index 0d11bf6..92c8e40 100644
--- a/php_http_message_parser.c
+++ b/php_http_message_parser.c
@@ -23,19 +23,20 @@ typedef struct php_http_message_parser_state_spec {
 
 static const php_http_message_parser_state_spec_t php_http_message_parser_states[] = {
 		{PHP_HTTP_MESSAGE_PARSER_STATE_START,			1},
-		{PHP_HTTP_MESSAGE_PARSER_STATE_HEADER,			1},
+		{PHP_HTTP_MESSAGE_PARSER_STATE_HEADER,			0},
 		{PHP_HTTP_MESSAGE_PARSER_STATE_HEADER_DONE,		0},
 		{PHP_HTTP_MESSAGE_PARSER_STATE_BODY,			0},
 		{PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DUMB,		1},
 		{PHP_HTTP_MESSAGE_PARSER_STATE_BODY_LENGTH,		1},
 		{PHP_HTTP_MESSAGE_PARSER_STATE_BODY_CHUNKED,	1},
 		{PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DONE,		0},
+		{PHP_HTTP_MESSAGE_PARSER_STATE_UPDATE_CL,		0},
 		{PHP_HTTP_MESSAGE_PARSER_STATE_DONE,			0}
 };
 
 #if DBG_PARSER
 const char *php_http_message_parser_state_name(php_http_message_parser_state_t state) {
-	const char *states[] = {"START", "HEADER", "HEADER_DONE", "BODY", "BODY_DUMB", "BODY_LENGTH", "BODY_CHUNK", "BODY_DONE", "DONE"};
+	const char *states[] = {"START", "HEADER", "HEADER_DONE", "BODY", "BODY_DUMB", "BODY_LENGTH", "BODY_CHUNK", "BODY_DONE", "UPDATE_CL", "DONE"};
 	
 	if (state < 0 || state > (sizeof(states)/sizeof(char*))-1) {
 		return "FAILURE";
@@ -44,35 +45,35 @@ const char *php_http_message_parser_state_name(php_http_message_parser_state_t s
 }
 #endif
 
-php_http_message_parser_t *php_http_message_parser_init(php_http_message_parser_t *parser TSRMLS_DC)
+php_http_message_parser_t *php_http_message_parser_init(php_http_message_parser_t *parser)
 {
 	if (!parser) {
 		parser = emalloc(sizeof(*parser));
 	}
 	memset(parser, 0, sizeof(*parser));
 
-	TSRMLS_SET_CTX(parser->ts);
-
-	php_http_header_parser_init(&parser->header TSRMLS_CC);
+	php_http_header_parser_init(&parser->header);
 
 	return parser;
 }
 
 php_http_message_parser_state_t php_http_message_parser_state_push(php_http_message_parser_t *parser, unsigned argc, ...)
 {
-	php_http_message_parser_state_t state;
+	php_http_message_parser_state_t state = PHP_HTTP_MESSAGE_PARSER_STATE_FAILURE;
 	va_list va_args;
 	unsigned i;
 
-	/* short circuit */
-	ZEND_PTR_STACK_RESIZE_IF_NEEDED((&parser->stack), argc);
+	if (argc > 0) {
+		/* short circuit */
+		ZEND_PTR_STACK_RESIZE_IF_NEEDED((&parser->stack), argc);
 
-	va_start(va_args, argc);
-	for (i = 0; i < argc; ++i) {
-		state  = va_arg(va_args, php_http_message_parser_state_t);
-		zend_ptr_stack_push(&parser->stack, (void *) state);
+		va_start(va_args, argc);
+		for (i = 0; i < argc; ++i) {
+			state  = va_arg(va_args, php_http_message_parser_state_t);
+			zend_ptr_stack_push(&parser->stack, (void *) state);
+		}
+		va_end(va_args);
 	}
-	va_end(va_args);
 
 	return state;
 }
@@ -115,71 +116,90 @@ void php_http_message_parser_free(php_http_message_parser_t **parser)
 	}
 }
 
-php_http_message_parser_state_t php_http_message_parser_parse_stream(php_http_message_parser_t *parser, php_stream *s, unsigned flags, php_http_message_t **message)
+php_http_message_parser_state_t php_http_message_parser_parse_stream(php_http_message_parser_t *parser, php_http_buffer_t *buf, php_stream *s, unsigned flags, php_http_message_t **message)
 {
-	php_http_buffer_t buf;
 	php_http_message_parser_state_t state = PHP_HTTP_MESSAGE_PARSER_STATE_START;
-	TSRMLS_FETCH_FROM_CTX(parser->ts);
 
-	php_http_buffer_init_ex(&buf, 0x1000, PHP_HTTP_BUFFER_INIT_PREALLOC);
-
-	while (!php_stream_eof(s)) {
-		size_t len = 0;
+	if (!buf->data) {
+		php_http_buffer_resize_ex(buf, 0x1000, 1, 0);
+	}
+	while (1) {
+		size_t justread = 0;
 #if DBG_PARSER
 		fprintf(stderr, "#SP: %s (f:%u)\n", php_http_message_parser_state_name(state), flags);
 #endif
+		/* resize if needed */
+		if (buf->free < 0x1000) {
+			php_http_buffer_resize_ex(buf, 0x1000, 1, 0);
+		}
 		switch (state) {
 			case PHP_HTTP_MESSAGE_PARSER_STATE_START:
 			case PHP_HTTP_MESSAGE_PARSER_STATE_HEADER:
 			case PHP_HTTP_MESSAGE_PARSER_STATE_HEADER_DONE:
 				/* read line */
-				php_stream_get_line(s, buf.data + buf.used, buf.free, &len);
-				php_http_buffer_account(&buf, len);
+				php_stream_get_line(s, buf->data + buf->used, buf->free, &justread);
+				/* if we fail reading a whole line, try a single char */
+				if (!justread) {
+					int c = php_stream_getc(s);
+
+					if (c != EOF) {
+						char s[1] = {c};
+						justread = php_http_buffer_append(buf, s, 1);
+					}
+				}
+				php_http_buffer_account(buf, justread);
 				break;
 
 			case PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DUMB:
 				/* read all */
-				php_http_buffer_account(&buf, php_stream_read(s, buf.data + buf.used, buf.free));
+				justread = php_stream_read(s, buf->data + buf->used, buf->free);
+				php_http_buffer_account(buf, justread);
 				break;
 
 			case PHP_HTTP_MESSAGE_PARSER_STATE_BODY_LENGTH:
 				/* read body_length */
-				php_http_buffer_account(&buf, php_stream_read(s, buf.data + buf.used, MIN(buf.free, parser->body_length)));
+				justread = php_stream_read(s, buf->data + buf->used, MIN(buf->free, parser->body_length));
+				php_http_buffer_account(buf, justread);
 				break;
 
 			case PHP_HTTP_MESSAGE_PARSER_STATE_BODY_CHUNKED:
 				/* duh, this is very naive */
-				if (len) {
-					size_t read = php_stream_read(s, buf.data + buf.used, MIN(len, buf.free));
+				if (parser->body_length) {
+					justread = php_stream_read(s, buf->data + buf->used, MIN(parser->body_length, buf->free));
 
-					php_http_buffer_account(&buf, read);
+					php_http_buffer_account(buf, justread);
 
-					len -= read;
+					parser->body_length -= justread;
 				} else {
-					php_http_buffer_resize(&buf, 24);
-					php_stream_get_line(s, buf.data, buf.free, &len);
-					php_http_buffer_account(&buf, len);
+					php_http_buffer_resize(buf, 24);
+					php_stream_get_line(s, buf->data, buf->free, &justread);
+					php_http_buffer_account(buf, justread);
 
-					len = strtoul(buf.data + buf.used - len, NULL, 16);
+					parser->body_length = strtoul(buf->data + buf->used - justread, NULL, 16);
 				}
 				break;
 
 			case PHP_HTTP_MESSAGE_PARSER_STATE_BODY:
 			case PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DONE:
+			case PHP_HTTP_MESSAGE_PARSER_STATE_UPDATE_CL:
 				/* should not occur */
 				abort();
 				break;
 
 			case PHP_HTTP_MESSAGE_PARSER_STATE_DONE:
 			case PHP_HTTP_MESSAGE_PARSER_STATE_FAILURE:
-				php_http_buffer_dtor(&buf);
 				return php_http_message_parser_state_is(parser);
 		}
 
-		state = php_http_message_parser_parse(parser, &buf, flags, message);
+		if (justread) {
+			state = php_http_message_parser_parse(parser, buf, flags, message);
+		} else if (php_stream_eof(s)) {
+			return php_http_message_parser_parse(parser, buf, flags | PHP_HTTP_MESSAGE_PARSER_CLEANUP, message);
+		} else {
+			return state;
+		}
 	}
 
-	php_http_buffer_dtor(&buf);
 	return PHP_HTTP_MESSAGE_PARSER_STATE_DONE;
 }
 
@@ -189,7 +209,6 @@ php_http_message_parser_state_t php_http_message_parser_parse(php_http_message_p
 	char *str = NULL;
 	size_t len = 0;
 	size_t cut = 0;
-	TSRMLS_FETCH_FROM_CTX(parser->ts);
 
 	while (buffer->used || !php_http_message_parser_states[php_http_message_parser_state_is(parser)].need_data) {
 #if DBG_PARSER
@@ -236,9 +255,10 @@ php_http_message_parser_state_t php_http_message_parser_parse(php_http_message_p
 						break;
 
 					default:
-						php_http_message_parser_state_push(parser, 1, PHP_HTTP_MESSAGE_PARSER_STATE_HEADER);
-						if (buffer->used) {
-							return PHP_HTTP_MESSAGE_PARSER_STATE_HEADER;
+						if (buffer->used || !(flags & PHP_HTTP_MESSAGE_PARSER_CLEANUP)) {
+							return php_http_message_parser_state_push(parser, 1, PHP_HTTP_MESSAGE_PARSER_STATE_HEADER);
+						} else {
+							php_http_message_parser_state_push(parser, 1, PHP_HTTP_MESSAGE_PARSER_STATE_HEADER_DONE);
 						}
 				}
 				break;
@@ -246,24 +266,39 @@ php_http_message_parser_state_t php_http_message_parser_parse(php_http_message_p
 
 			case PHP_HTTP_MESSAGE_PARSER_STATE_HEADER_DONE:
 			{
-				zval *h, *h_loc = NULL, *h_con = NULL, **h_cl = NULL, **h_cr = NULL, **h_te = NULL;
-
-				if ((h = php_http_message_header(*message, ZEND_STRL("Transfer-Encoding"), 1))) {
-					zend_hash_update(&(*message)->hdrs, "X-Original-Transfer-Encoding", sizeof("X-Original-Transfer-Encoding"), &h, sizeof(zval *), (void *) &h_te);
-					zend_hash_del(&(*message)->hdrs, "Transfer-Encoding", sizeof("Transfer-Encoding"));
-				}
-				if ((h = php_http_message_header(*message, ZEND_STRL("Content-Length"), 1))) {
-					zend_hash_update(&(*message)->hdrs, "X-Original-Content-Length", sizeof("X-Original-Content-Length"), &h, sizeof(zval *), (void *) &h_cl);
-				}
-				if ((h = php_http_message_header(*message, ZEND_STRL("Content-Range"), 1))) {
-					zend_hash_update(&(*message)->hdrs, "X-Original-Content-Range", sizeof("X-Original-Content-Range"), &h, sizeof(zval *), (void *) &h_cr);
-					zend_hash_del(&(*message)->hdrs, "Content-Range", sizeof("Content-Range"));
+				zval h, *h_ptr, *h_loc = NULL, *h_con = NULL, *h_ce;
+				zend_bool chunked = 0;
+				zend_long content_length = -1;
+				zend_string *content_range = NULL;
+
+				/* Content-Range has higher precedence than Content-Length,
+				 * and content-length denotes the original length of the entity,
+				 * so let's *NOT* remove CR/CL, because that would fundamentally
+				 * change the meaning of the whole message
+				 */
+				if ((h_ptr = php_http_message_header(*message, ZEND_STRL("Transfer-Encoding")))) {
+					zend_string *zs = zval_get_string(h_ptr);
+
+					chunked = zend_string_equals_literal(zs, "chunked");
+					zend_string_release(zs);
+
+					Z_TRY_ADDREF_P(h_ptr);
+					zend_hash_str_update(&(*message)->hdrs, "X-Original-Transfer-Encoding", lenof("X-Original-Transfer-Encoding"), h_ptr);
+					zend_hash_str_del(&(*message)->hdrs, "Transfer-Encoding", lenof("Transfer-Encoding"));
+
+					/* reset */
+					ZVAL_LONG(&h, 0);
+					zend_hash_str_update(&(*message)->hdrs, "Content-Length", lenof("Content-Length"), &h);
+				} else if ((h_ptr = php_http_message_header(*message, ZEND_STRL("Content-Length")))) {
+					content_length = zval_get_long(h_ptr);
+					Z_TRY_ADDREF_P(h_ptr);
+					zend_hash_str_update(&(*message)->hdrs, "X-Original-Content-Length", lenof("X-Original-Content-Length"), h_ptr);
 				}
 
-				/* default */
-				MAKE_STD_ZVAL(h);
-				ZVAL_LONG(h, 0);
-				zend_hash_update(&(*message)->hdrs, "Content-Length", sizeof("Content-Length"), &h, sizeof(zval *), NULL);
+				if ((content_range = php_http_message_header_string(*message, ZEND_STRL("Content-Range")))) {
+					ZVAL_STR_COPY(&h, content_range);
+					zend_hash_str_update(&(*message)->hdrs, "Content-Range", lenof("Content-Range"), &h);
+				}
 
 				/* so, if curl sees a 3xx code, a Location header and a Connection:close header
 				 * it decides not to read the response body.
@@ -271,79 +306,58 @@ php_http_message_parser_state_t php_http_message_parser_parse(php_http_message_p
 				if ((flags & PHP_HTTP_MESSAGE_PARSER_EMPTY_REDIRECTS)
 				&&	(*message)->type == PHP_HTTP_RESPONSE
 				&&	(*message)->http.info.response.code/100 == 3
-				&&	(h_loc = php_http_message_header(*message, ZEND_STRL("Location"), 1))
-				&&	(h_con = php_http_message_header(*message, ZEND_STRL("Connection"), 1))
+				&&	(h_loc = php_http_message_header(*message, ZEND_STRL("Location")))
+				&&	(h_con = php_http_message_header(*message, ZEND_STRL("Connection")))
 				) {
-					if (php_http_match(Z_STRVAL_P(h_con), "close", PHP_HTTP_MATCH_WORD)) {
+					zend_string *con = zval_get_string(h_con);
+
+					if (php_http_match(con->val, "close", PHP_HTTP_MATCH_WORD)) {
+						zend_string_release(con);
 						php_http_message_parser_state_push(parser, 1, PHP_HTTP_MESSAGE_PARSER_STATE_DONE);
-						zval_ptr_dtor(&h_loc);
-						zval_ptr_dtor(&h_con);
 						break;
 					}
+					zend_string_release(con);
 				}
-				if (h_loc) {
-					zval_ptr_dtor(&h_loc);
-				}
-				if (h_con) {
-					zval_ptr_dtor(&h_con);
-				}
 
-				if ((h = php_http_message_header(*message, ZEND_STRL("Content-Encoding"), 1))) {
-					if (php_http_match(Z_STRVAL_P(h), "gzip", PHP_HTTP_MATCH_WORD)
-					||	php_http_match(Z_STRVAL_P(h), "x-gzip", PHP_HTTP_MATCH_WORD)
-					||	php_http_match(Z_STRVAL_P(h), "deflate", PHP_HTTP_MATCH_WORD)
+				if ((h_ce = php_http_message_header(*message, ZEND_STRL("Content-Encoding")))) {
+					zend_string *ce = zval_get_string(h_ce);
+
+					if (php_http_match(ce->val, "gzip", PHP_HTTP_MATCH_WORD)
+					||	php_http_match(ce->val, "x-gzip", PHP_HTTP_MATCH_WORD)
+					||	php_http_match(ce->val, "deflate", PHP_HTTP_MATCH_WORD)
 					) {
 						if (parser->inflate) {
 							php_http_encoding_stream_reset(&parser->inflate);
 						} else {
-							parser->inflate = php_http_encoding_stream_init(NULL, php_http_encoding_stream_get_inflate_ops(), 0 TSRMLS_CC);
+							parser->inflate = php_http_encoding_stream_init(NULL, php_http_encoding_stream_get_inflate_ops(), 0);
 						}
-						zend_hash_update(&(*message)->hdrs, "X-Original-Content-Encoding", sizeof("X-Original-Content-Encoding"), &h, sizeof(zval *), NULL);
-						zend_hash_del(&(*message)->hdrs, "Content-Encoding", sizeof("Content-Encoding"));
-					} else {
-						zval_ptr_dtor(&h);
+						Z_TRY_ADDREF_P(h_ce);
+						zend_hash_str_update(&(*message)->hdrs, "X-Original-Content-Encoding", lenof("X-Original-Content-Encoding"), h_ce);
+						zend_hash_str_del(&(*message)->hdrs, "Content-Encoding", lenof("Content-Encoding"));
 					}
+					zend_string_release(ce);
 				}
 
 				if ((flags & PHP_HTTP_MESSAGE_PARSER_DUMB_BODIES)) {
 					php_http_message_parser_state_push(parser, 1, PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DUMB);
 				} else {
-					if (h_te) {
-						if (strstr(Z_STRVAL_PP(h_te), "chunked")) {
-							parser->dechunk = php_http_encoding_stream_init(parser->dechunk, php_http_encoding_stream_get_dechunk_ops(), 0 TSRMLS_CC);
-							php_http_message_parser_state_push(parser, 1, PHP_HTTP_MESSAGE_PARSER_STATE_BODY_CHUNKED);
-							break;
-						}
-					}
-
-					if (h_cl) {
-						char *stop;
-
-						if (Z_TYPE_PP(h_cl) == IS_STRING) {
-							parser->body_length = strtoul(Z_STRVAL_PP(h_cl), &stop, 10);
-
-							if (stop != Z_STRVAL_PP(h_cl)) {
-								php_http_message_parser_state_push(parser, 1, !parser->body_length?PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DONE:PHP_HTTP_MESSAGE_PARSER_STATE_BODY_LENGTH);
-								break;
-							}
-						} else if (Z_TYPE_PP(h_cl) == IS_LONG) {
-							parser->body_length = Z_LVAL_PP(h_cl);
-							php_http_message_parser_state_push(parser, 1, !parser->body_length?PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DONE:PHP_HTTP_MESSAGE_PARSER_STATE_BODY_LENGTH);
-							break;
-						}
+					if (chunked) {
+						parser->dechunk = php_http_encoding_stream_init(parser->dechunk, php_http_encoding_stream_get_dechunk_ops(), 0);
+						php_http_message_parser_state_push(parser, 1, PHP_HTTP_MESSAGE_PARSER_STATE_BODY_CHUNKED);
+						break;
 					}
 
-					if (h_cr) {
+					if (content_range) {
 						ulong total = 0, start = 0, end = 0;
 
-						if (!strncasecmp(Z_STRVAL_PP(h_cr), "bytes", lenof("bytes"))
-						&& (	Z_STRVAL_P(h)[lenof("bytes")] == ':'
-							||	Z_STRVAL_P(h)[lenof("bytes")] == ' '
-							||	Z_STRVAL_P(h)[lenof("bytes")] == '='
+						if (!strncasecmp(content_range->val, "bytes", lenof("bytes"))
+						&& (	content_range->val[lenof("bytes")] == ':'
+							||	content_range->val[lenof("bytes")] == ' '
+							||	content_range->val[lenof("bytes")] == '='
 							)
 						) {
 							char *total_at = NULL, *end_at = NULL;
-							char *start_at = Z_STRVAL_PP(h_cr) + sizeof("bytes");
+							char *start_at = content_range->val + sizeof("bytes");
 
 							start = strtoul(start_at, &end_at, 10);
 							if (end_at) {
@@ -352,15 +366,23 @@ php_http_message_parser_state_t php_http_message_parser_parse(php_http_message_p
 									total = strtoul(total_at + 1, NULL, 10);
 								}
 
-								if (end >= start && (!total || end < total)) {
+								if (end >= start && (!total || end <= total)) {
 									parser->body_length = end + 1 - start;
 									php_http_message_parser_state_push(parser, 1, !parser->body_length?PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DONE:PHP_HTTP_MESSAGE_PARSER_STATE_BODY_LENGTH);
+									zend_string_release(content_range);
 									break;
 								}
 							}
 						}
+
+						zend_string_release(content_range);
 					}
 
+					if (content_length >= 0) {
+						parser->body_length = content_length;
+						php_http_message_parser_state_push(parser, 1, !parser->body_length?PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DONE:PHP_HTTP_MESSAGE_PARSER_STATE_BODY_LENGTH);
+						break;
+					}
 
 					if ((*message)->type == PHP_HTTP_REQUEST) {
 						php_http_message_parser_state_push(parser, 1, PHP_HTTP_MESSAGE_PARSER_STATE_DONE);
@@ -374,8 +396,6 @@ php_http_message_parser_state_t php_http_message_parser_parse(php_http_message_p
 			case PHP_HTTP_MESSAGE_PARSER_STATE_BODY:
 			{
 				if (len) {
-					zval *zcl;
-
 					if (parser->inflate) {
 						char *dec_str = NULL;
 						size_t dec_len;
@@ -385,18 +405,13 @@ php_http_message_parser_state_t php_http_message_parser_parse(php_http_message_p
 						}
 
 						if (str != buffer->data) {
-							STR_FREE(str);
+							PTR_FREE(str);
 						}
 						str = dec_str;
 						len = dec_len;
 					}
 
 					php_stream_write(php_http_message_body_stream((*message)->body), str, len);
-
-					/* keep track */
-					MAKE_STD_ZVAL(zcl);
-					ZVAL_LONG(zcl, php_http_message_body_size((*message)->body));
-					zend_hash_update(&(*message)->hdrs, "Content-Length", sizeof("Content-Length"), &zcl, sizeof(zval *), NULL);
 				}
 
 				if (cut) {
@@ -404,7 +419,7 @@ php_http_message_parser_state_t php_http_message_parser_parse(php_http_message_p
 				}
 
 				if (str != buffer->data) {
-					STR_FREE(str);
+					PTR_FREE(str);
 				}
 
 				str = NULL;
@@ -469,7 +484,7 @@ php_http_message_parser_state_t php_http_message_parser_parse(php_http_message_p
 			{
 				php_http_message_parser_state_push(parser, 1, PHP_HTTP_MESSAGE_PARSER_STATE_DONE);
 
-				if (parser->dechunk) {
+				if (parser->dechunk && parser->dechunk->ctx) {
 					char *dec_str = NULL;
 					size_t dec_len;
 
@@ -482,14 +497,24 @@ php_http_message_parser_state_t php_http_message_parser_parse(php_http_message_p
 						str = dec_str;
 						len = dec_len;
 						cut = 0;
-						php_http_message_parser_state_push(parser, 1, PHP_HTTP_MESSAGE_PARSER_STATE_BODY);
+						php_http_message_parser_state_push(parser, 2, PHP_HTTP_MESSAGE_PARSER_STATE_UPDATE_CL, PHP_HTTP_MESSAGE_PARSER_STATE_BODY);
 					}
 				}
 
 				break;
 			}
 
-			case PHP_HTTP_MESSAGE_PARSER_STATE_DONE: {
+			case PHP_HTTP_MESSAGE_PARSER_STATE_UPDATE_CL:
+			{
+				zval zcl;
+
+				ZVAL_LONG(&zcl, php_http_message_body_size((*message)->body));
+				zend_hash_str_update(&(*message)->hdrs, "Content-Length", lenof("Content-Length"), &zcl);
+				break;
+			}
+
+			case PHP_HTTP_MESSAGE_PARSER_STATE_DONE:
+			{
 				char *ptr = buffer->data;
 
 				while (ptr - buffer->data < buffer->used && PHP_HTTP_IS_CTYPE(space, *ptr)) {
@@ -512,55 +537,46 @@ php_http_message_parser_state_t php_http_message_parser_parse(php_http_message_p
 zend_class_entry *php_http_message_parser_class_entry;
 static zend_object_handlers php_http_message_parser_object_handlers;
 
-zend_object_value php_http_message_parser_object_new(zend_class_entry *ce TSRMLS_DC)
+zend_object *php_http_message_parser_object_new(zend_class_entry *ce)
 {
-	return php_http_message_parser_object_new_ex(ce, NULL, NULL TSRMLS_CC);
+	return &php_http_message_parser_object_new_ex(ce, NULL)->zo;
 }
 
-zend_object_value php_http_message_parser_object_new_ex(zend_class_entry *ce, php_http_message_parser_t *parser, php_http_message_parser_object_t **ptr TSRMLS_DC)
+php_http_message_parser_object_t *php_http_message_parser_object_new_ex(zend_class_entry *ce, php_http_message_parser_t *parser)
 {
 	php_http_message_parser_object_t *o;
 
-	o = ecalloc(1, sizeof(php_http_message_parser_object_t));
-	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 (parser) {
 		o->parser = parser;
 	} else {
-		o->parser = php_http_message_parser_init(NULL TSRMLS_CC);
+		o->parser = php_http_message_parser_init(NULL);
 	}
-	o->buffer = php_http_buffer_new();
-
-	o->zv.handle = zend_objects_store_put((zend_object *) o, NULL, php_http_message_parser_object_free, NULL TSRMLS_CC);
-	o->zv.handlers = &php_http_message_parser_object_handlers;
+	php_http_buffer_init(&o->buffer);
+	o->zo.handlers = &php_http_message_parser_object_handlers;
 
-	return o->zv;
+	return o;
 }
 
-void php_http_message_parser_object_free(void *object TSRMLS_DC)
+void php_http_message_parser_object_free(zend_object *object)
 {
-	php_http_message_parser_object_t *o = (php_http_message_parser_object_t *) object;
+	php_http_message_parser_object_t *o = PHP_HTTP_OBJ(object, NULL);
 
 	if (o->parser) {
 		php_http_message_parser_free(&o->parser);
 	}
-	if (o->buffer) {
-		php_http_buffer_free(&o->buffer);
-	}
-	zend_object_std_dtor((zend_object *) o TSRMLS_CC);
-	efree(o);
+	php_http_buffer_dtor(&o->buffer);
+	zend_object_std_dtor(object);
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageParser_getState, 0, 0, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(HttpMessageParser, getState)
 {
-	php_http_message_parser_object_t *parser_obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+	php_http_message_parser_object_t *parser_obj = PHP_HTTP_OBJ(NULL, getThis());
 
 	zend_parse_parameters_none();
 	/* always return the real state */
@@ -577,19 +593,23 @@ static PHP_METHOD(HttpMessageParser, parse)
 	php_http_message_parser_object_t *parser_obj;
 	zval *zmsg;
 	char *data_str;
-	int data_len;
-	long flags;
+	size_t data_len;
+	zend_long flags;
 
 	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "slz", &data_str, &data_len, &flags, &zmsg), invalid_arg, return);
 
-	parser_obj = zend_object_store_get_object(getThis() TSRMLS_CC);
-	php_http_buffer_append(parser_obj->buffer, data_str, data_len);
-	RETVAL_LONG(php_http_message_parser_parse(parser_obj->parser, parser_obj->buffer, flags, &parser_obj->parser->message));
+	parser_obj = PHP_HTTP_OBJ(NULL, getThis());
+	php_http_buffer_append(&parser_obj->buffer, data_str, data_len);
+	RETVAL_LONG(php_http_message_parser_parse(parser_obj->parser, &parser_obj->buffer, flags, &parser_obj->parser->message));
 
+	ZVAL_DEREF(zmsg);
 	zval_dtor(zmsg);
+	ZVAL_NULL(zmsg);
 	if (parser_obj->parser->message) {
-			ZVAL_OBJVAL(zmsg, php_http_message_object_new_ex(php_http_message_class_entry, php_http_message_copy(parser_obj->parser->message, NULL), NULL TSRMLS_CC), 0);
-		}
+		php_http_message_t *msg_cpy = php_http_message_copy(parser_obj->parser->message, NULL);
+		php_http_message_object_t *msg_obj = php_http_message_object_new_ex(php_http_message_class_entry, msg_cpy);
+		ZVAL_OBJ(zmsg, &msg_obj->zo);
+	}
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageParser_stream, 0, 0, 3)
@@ -603,20 +623,24 @@ static PHP_METHOD(HttpMessageParser, stream)
 	zend_error_handling zeh;
 	zval *zmsg, *zstream;
 	php_stream *s;
-	long flags;
+	zend_long flags;
 
 	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlz", &zstream, &flags, &zmsg), invalid_arg, return);
 
-	zend_replace_error_handling(EH_THROW, php_http_exception_unexpected_val_class_entry, &zeh TSRMLS_CC);
-	php_stream_from_zval(s, &zstream);
-	zend_restore_error_handling(&zeh TSRMLS_CC);
+	zend_replace_error_handling(EH_THROW, php_http_exception_unexpected_val_class_entry, &zeh);
+	php_stream_from_zval(s, zstream);
+	zend_restore_error_handling(&zeh);
 
-	parser_obj = zend_object_store_get_object(getThis() TSRMLS_CC);
-	RETVAL_LONG(php_http_message_parser_parse_stream(parser_obj->parser, s, flags, &parser_obj->parser->message));
+	parser_obj = PHP_HTTP_OBJ(NULL, getThis());
+	RETVAL_LONG(php_http_message_parser_parse_stream(parser_obj->parser, &parser_obj->buffer, s, flags, &parser_obj->parser->message));
 
+	ZVAL_DEREF(zmsg);
 	zval_dtor(zmsg);
+	ZVAL_NULL(zmsg);
 	if (parser_obj->parser->message) {
-		ZVAL_OBJVAL(zmsg, php_http_message_object_new_ex(php_http_message_class_entry, php_http_message_copy(parser_obj->parser->message, NULL), NULL TSRMLS_CC), 0);
+		php_http_message_t *msg_cpy = php_http_message_copy(parser_obj->parser->message, NULL);
+		php_http_message_object_t *msg_obj = php_http_message_object_new_ex(php_http_message_class_entry, msg_cpy);
+		ZVAL_OBJ(zmsg, &msg_obj->zo);
 	}
 }
 
@@ -632,26 +656,29 @@ PHP_MINIT_FUNCTION(http_message_parser)
 	zend_class_entry ce;
 
 	INIT_NS_CLASS_ENTRY(ce, "http\\Message", "Parser", php_http_message_parser_methods);
-	php_http_message_parser_class_entry = zend_register_internal_class(&ce TSRMLS_CC);
+	php_http_message_parser_class_entry = zend_register_internal_class(&ce);
 	memcpy(&php_http_message_parser_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 	php_http_message_parser_class_entry->create_object = php_http_message_parser_object_new;
 	php_http_message_parser_object_handlers.clone_obj = NULL;
-
-	zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("CLEANUP"), PHP_HTTP_MESSAGE_PARSER_CLEANUP TSRMLS_CC);
-	zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("DUMB_BODIES"), PHP_HTTP_MESSAGE_PARSER_DUMB_BODIES TSRMLS_CC);
-	zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("EMPTY_REDIRECTS"), PHP_HTTP_MESSAGE_PARSER_EMPTY_REDIRECTS TSRMLS_CC);
-	zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("GREEDY"), PHP_HTTP_MESSAGE_PARSER_GREEDY TSRMLS_CC);
-
-	zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_FAILURE"), PHP_HTTP_MESSAGE_PARSER_STATE_FAILURE TSRMLS_CC);
-	zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_START"), PHP_HTTP_MESSAGE_PARSER_STATE_START TSRMLS_CC);
-	zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_HEADER"), PHP_HTTP_MESSAGE_PARSER_STATE_HEADER TSRMLS_CC);
-	zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_HEADER_DONE"), PHP_HTTP_MESSAGE_PARSER_STATE_HEADER_DONE TSRMLS_CC);
-	zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_BODY"), PHP_HTTP_MESSAGE_PARSER_STATE_BODY TSRMLS_CC);
-	zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_BODY_DUMB"), PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DUMB TSRMLS_CC);
-	zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_BODY_LENGTH"), PHP_HTTP_MESSAGE_PARSER_STATE_BODY_LENGTH TSRMLS_CC);
-	zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_BODY_CHUNKED"), PHP_HTTP_MESSAGE_PARSER_STATE_BODY_CHUNKED TSRMLS_CC);
-	zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_BODY_DONE"), PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DONE TSRMLS_CC);
-	zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_DONE"), PHP_HTTP_MESSAGE_PARSER_STATE_DONE TSRMLS_CC);
+	php_http_message_parser_object_handlers.free_obj = php_http_message_parser_object_free;
+	php_http_message_parser_object_handlers.offset = XtOffsetOf(php_http_message_parser_object_t, zo);
+
+	zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("CLEANUP"), PHP_HTTP_MESSAGE_PARSER_CLEANUP);
+	zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("DUMB_BODIES"), PHP_HTTP_MESSAGE_PARSER_DUMB_BODIES);
+	zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("EMPTY_REDIRECTS"), PHP_HTTP_MESSAGE_PARSER_EMPTY_REDIRECTS);
+	zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("GREEDY"), PHP_HTTP_MESSAGE_PARSER_GREEDY);
+
+	zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_FAILURE"), PHP_HTTP_MESSAGE_PARSER_STATE_FAILURE);
+	zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_START"), PHP_HTTP_MESSAGE_PARSER_STATE_START);
+	zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_HEADER"), PHP_HTTP_MESSAGE_PARSER_STATE_HEADER);
+	zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_HEADER_DONE"), PHP_HTTP_MESSAGE_PARSER_STATE_HEADER_DONE);
+	zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_BODY"), PHP_HTTP_MESSAGE_PARSER_STATE_BODY);
+	zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_BODY_DUMB"), PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DUMB);
+	zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_BODY_LENGTH"), PHP_HTTP_MESSAGE_PARSER_STATE_BODY_LENGTH);
+	zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_BODY_CHUNKED"), PHP_HTTP_MESSAGE_PARSER_STATE_BODY_CHUNKED);
+	zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_BODY_DONE"), PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DONE);
+	zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_UPDATE_CL"), PHP_HTTP_MESSAGE_PARSER_STATE_UPDATE_CL);
+	zend_declare_class_constant_long(php_http_message_parser_class_entry, ZEND_STRL("STATE_DONE"), PHP_HTTP_MESSAGE_PARSER_STATE_DONE);
 
 	return SUCCESS;
 }