X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message_parser.c;h=ce2a515b26e59174c0140e8dcfb90bea7c3c2a8a;hp=312a44fbc544b5717bdfd11aad96b72fa4712305;hb=5560fddc86c1fbbc53ab57e885acbd5e879077a8;hpb=b233c50a85448c251d23a1bdce3e9003c4ee03b8

diff --git a/php_http_message_parser.c b/php_http_message_parser.c
index 312a44f..ce2a515 100644
--- a/php_http_message_parser.c
+++ b/php_http_message_parser.c
@@ -1,4 +1,20 @@
-#include "php_http.h"
+/*
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2014, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
+*/
+
+#include "php_http_api.h"
+
+#ifndef DBG_PARSER
+#	define DBG_PARSER 0
+#endif
 
 typedef struct php_http_message_parser_state_spec {
 	php_http_message_parser_state_t state;
@@ -14,10 +30,22 @@ static const php_http_message_parser_state_spec_t php_http_message_parser_states
 		{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}
 };
 
-PHP_HTTP_API php_http_message_parser_t *php_http_message_parser_init(php_http_message_parser_t *parser TSRMLS_DC)
+#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", "UPDATE_CL", "DONE"};
+	
+	if (state < 0 || state > (sizeof(states)/sizeof(char*))-1) {
+		return "FAILURE";
+	}
+	return states[state];
+}
+#endif
+
+php_http_message_parser_t *php_http_message_parser_init(php_http_message_parser_t *parser TSRMLS_DC)
 {
 	if (!parser) {
 		parser = emalloc(sizeof(*parser));
@@ -27,61 +55,59 @@ PHP_HTTP_API php_http_message_parser_t *php_http_message_parser_init(php_http_me
 	TSRMLS_SET_CTX(parser->ts);
 
 	php_http_header_parser_init(&parser->header TSRMLS_CC);
-	zend_stack_init(&parser->stack);
 
 	return parser;
 }
 
-PHP_HTTP_API 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 php_http_message_parser_state_push(php_http_message_parser_t *parser, unsigned argc, ...)
 {
+	php_http_message_parser_state_t state;
 	va_list va_args;
 	unsigned i;
-	va_start(va_args, argc);
-	php_http_message_parser_state_t state;
 
+	/* 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_stack_push(&parser->stack, &state, sizeof(state));
+		zend_ptr_stack_push(&parser->stack, (void *) state);
 	}
 	va_end(va_args);
 
 	return state;
 }
 
-PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_state_is(php_http_message_parser_t *parser)
+php_http_message_parser_state_t php_http_message_parser_state_is(php_http_message_parser_t *parser)
 {
-	php_http_message_parser_state_t *state;
-
-	if (SUCCESS == zend_stack_top(&parser->stack, (void *) &state)) {
-		return *state;
+	if (parser->stack.top) {
+		return (php_http_message_parser_state_t) parser->stack.elements[parser->stack.top - 1];
 	}
 	return PHP_HTTP_MESSAGE_PARSER_STATE_START;
 }
 
-PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_state_pop(php_http_message_parser_t *parser)
+php_http_message_parser_state_t php_http_message_parser_state_pop(php_http_message_parser_t *parser)
 {
-	php_http_message_parser_state_t state, *state_ptr;
-	if (SUCCESS == zend_stack_top(&parser->stack, (void *) &state_ptr)) {
-		state = *state_ptr;
-		zend_stack_del_top(&parser->stack);
-		return state;
+	if (parser->stack.top) {
+		return (php_http_message_parser_state_t) zend_ptr_stack_pop(&parser->stack);
 	}
 	return PHP_HTTP_MESSAGE_PARSER_STATE_START;
 }
 
-PHP_HTTP_API void php_http_message_parser_dtor(php_http_message_parser_t *parser)
+void php_http_message_parser_dtor(php_http_message_parser_t *parser)
 {
 	php_http_header_parser_dtor(&parser->header);
-	zend_stack_destroy(&parser->stack);
+	zend_ptr_stack_destroy(&parser->stack);
+	php_http_message_free(&parser->message);
 	if (parser->dechunk) {
-		php_http_encoding_stream_free(&parser->dechunk TSRMLS_CC);
+		php_http_encoding_stream_free(&parser->dechunk);
 	}
 	if (parser->inflate) {
-		php_http_encoding_stream_free(&parser->inflate TSRMLS_CC);
+		php_http_encoding_stream_free(&parser->inflate);
 	}
 }
 
-PHP_HTTP_API void php_http_message_parser_free(php_http_message_parser_t **parser)
+void php_http_message_parser_free(php_http_message_parser_t **parser)
 {
 	if (*parser) {
 		php_http_message_parser_dtor(*parser);
@@ -90,19 +116,96 @@ PHP_HTTP_API void php_http_message_parser_free(php_http_message_parser_t **parse
 	}
 }
 
-
-PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_parse(php_http_message_parser_t *parser, php_http_buffer *buffer, 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_message_parser_state_t state = PHP_HTTP_MESSAGE_PARSER_STATE_START;
 	TSRMLS_FETCH_FROM_CTX(parser->ts);
+
+	if (!buf->data) {
+		php_http_buffer_resize_ex(buf, 0x1000, 1, 0);
+	}
+	while (!php_stream_eof(s)) {
+		size_t justread = 0;
+#if DBG_PARSER
+		fprintf(stderr, "#SP: %s (f:%u)\n", php_http_message_parser_state_name(state), flags);
+#endif
+		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, &justread);
+				php_http_buffer_account(buf, justread);
+				break;
+
+			case PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DUMB:
+				/* read all */
+				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 */
+				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 (parser->body_length) {
+					justread = php_stream_read(s, buf->data + buf->used, MIN(parser->body_length, buf->free));
+
+					php_http_buffer_account(buf, justread);
+
+					parser->body_length -= justread;
+				} else {
+					php_http_buffer_resize(buf, 24);
+					php_stream_get_line(s, buf->data, buf->free, &justread);
+					php_http_buffer_account(buf, justread);
+
+					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:
+				return php_http_message_parser_state_is(parser);
+		}
+
+		if (justread) {
+			state = php_http_message_parser_parse(parser, buf, flags, message);
+		} else  {
+			return state;
+		}
+	}
+
+	return PHP_HTTP_MESSAGE_PARSER_STATE_DONE;
+}
+
+
+php_http_message_parser_state_t php_http_message_parser_parse(php_http_message_parser_t *parser, php_http_buffer_t *buffer, unsigned flags, php_http_message_t **message)
+{
 	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 0
-		const char *state[] = {"START", "HEADER", "HEADER_DONE", "BODY", "BODY_DUMB", "BODY_LENGTH", "BODY_CHUNK", "BODY_DONE", "DONE"};
-		fprintf(stderr, "#MP: %s (%d) %zu\n",
-				state[php_http_message_parser_state_is(parser)], (*message)->type, buffer->used);
+#if DBG_PARSER
+		fprintf(stderr, "#MP: %s (f: %u, t:%d, l:%zu)\n", 
+			php_http_message_parser_state_name(php_http_message_parser_state_is(parser)),
+			flags, 
+			message && *message ? (*message)->type : -1, 
+			buffer->used
+		);
+		_dpf(0, buffer->data, buffer->used);
 #endif
 
 		switch (php_http_message_parser_state_pop(parser))
@@ -130,7 +233,7 @@ PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_parse(php_h
 			{
 				unsigned header_parser_flags = (flags & PHP_HTTP_MESSAGE_PARSER_CLEANUP) ? PHP_HTTP_HEADER_PARSER_CLEANUP : 0;
 
-				switch (php_http_header_parser_parse(&parser->header, buffer, header_parser_flags, &(*message)->hdrs, (php_http_info_callback_t) php_http_message_info_callback, message)) {
+				switch (php_http_header_parser_parse(&parser->header, buffer, header_parser_flags, *message ? &(*message)->hdrs : NULL, (php_http_info_callback_t) php_http_message_info_callback, message)) {
 					case PHP_HTTP_HEADER_PARSER_STATE_FAILURE:
 						return PHP_HTTP_MESSAGE_PARSER_STATE_FAILURE;
 
@@ -149,23 +252,67 @@ PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_parse(php_h
 
 			case PHP_HTTP_MESSAGE_PARSER_STATE_HEADER_DONE:
 			{
-				zval *h, **h_cl = NULL, **h_cr = NULL, **h_te = NULL;
+				zval *h, *h_loc = NULL, *h_con = NULL, **h_cl = NULL, **h_cr = NULL, **h_te = 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 = 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_update(&(*message)->hdrs, "X-Original-Transfer-Encoding", sizeof("X-Original-Transfer-Encoding"), (void *) &h, sizeof(zval *), (void *) &h_te);
 					zend_hash_del(&(*message)->hdrs, "Transfer-Encoding", sizeof("Transfer-Encoding"));
+
+					/* reset */
+					MAKE_STD_ZVAL(h);
+					ZVAL_LONG(h, 0);
+					zend_hash_update(&(*message)->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &h, sizeof(zval *), NULL);
+				} else 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"), (void *) &h, sizeof(zval *), (void *) &h_cl);
 				}
-				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"));
+					zend_hash_find(&(*message)->hdrs, ZEND_STRS("Content-Range"), (void *) &h_cr);
+					if (h != *h_cr) {
+						zend_hash_update(&(*message)->hdrs, "Content-Range", sizeof("Content-Range"), &h, sizeof(zval *), (void *) &h_cr);
+					} else {
+						zval_ptr_dtor(&h);
+					}
+				}
+
+				/* so, if curl sees a 3xx code, a Location header and a Connection:close header
+				 * it decides not to read the response body.
+				 */
+				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))
+				) {
+					if (php_http_match(Z_STRVAL_P(h_con), "close", PHP_HTTP_MATCH_WORD)) {
+						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;
+					}
+				}
+				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 (strstr(Z_STRVAL_P(h), "gzip") || strstr(Z_STRVAL_P(h), "x-gzip") || strstr(Z_STRVAL_P(h), "deflate")) {
-						parser->inflate = php_http_encoding_stream_init(parser->inflate, php_http_encoding_stream_get_inflate_ops(), 0 TSRMLS_CC);
+					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 (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);
+						}
 						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 {
@@ -173,97 +320,102 @@ PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_parse(php_h
 					}
 				}
 
-				/* default */
-				MAKE_STD_ZVAL(h);
-				ZVAL_LONG(h, 0);
-				zend_hash_update(&(*message)->hdrs, "Content-Length", sizeof("Content-Length"), &h, sizeof(zval *), NULL);
-
-				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 ((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;
 
-					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, PHP_HTTP_MESSAGE_PARSER_STATE_BODY_LENGTH);
-						break;
+					if (h_cr) {
+						ulong total = 0, start = 0, end = 0;
+
+						if (!strncasecmp(Z_STRVAL_PP(h_cr), "bytes", lenof("bytes"))
+						&& (	Z_STRVAL_PP(h_cr)[lenof("bytes")] == ':'
+							||	Z_STRVAL_PP(h_cr)[lenof("bytes")] == ' '
+							||	Z_STRVAL_PP(h_cr)[lenof("bytes")] == '='
+							)
+						) {
+							char *total_at = NULL, *end_at = NULL;
+							char *start_at = Z_STRVAL_PP(h_cr) + sizeof("bytes");
+
+							start = strtoul(start_at, &end_at, 10);
+							if (end_at) {
+								end = strtoul(end_at + 1, &total_at, 10);
+								if (total_at && strncmp(total_at + 1, "*", 1)) {
+									total = strtoul(total_at + 1, NULL, 10);
+								}
+
+								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);
+									break;
+								}
+							}
+						}
 					}
-				}
 
-				if (h_cr) {
-					ulong total = 0, start = 0, end = 0;
+					if (h_cl) {
+						char *stop;
 
-					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")] == '='
-						)
-					) {
-						char *total_at = NULL, *end_at = NULL;
-						char *start_at = Z_STRVAL_PP(h_cr) + sizeof("bytes");
-
-						start = strtoul(start_at, &end_at, 10);
-						if (end_at) {
-							end = strtoul(end_at + 1, &total_at, 10);
-							if (total_at && strncmp(total_at + 1, "*", 1)) {
-								total = strtoul(total_at + 1, NULL, 10);
-							}
+						if (Z_TYPE_PP(h_cl) == IS_STRING) {
+							parser->body_length = strtoul(Z_STRVAL_PP(h_cl), &stop, 10);
 
-							if (end >= start && (!total || end < total)) {
-								parser->body_length = end + 1 - start;
-								php_http_message_parser_state_push(parser, 1, PHP_HTTP_MESSAGE_PARSER_STATE_BODY_LENGTH);
+							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 ((*message)->type == PHP_HTTP_REQUEST) {
-					php_http_message_parser_state_push(parser, 1, PHP_HTTP_MESSAGE_PARSER_STATE_DONE);
-				} else {
-					php_http_message_parser_state_push(parser, 1, PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DUMB);
+					if ((*message)->type == PHP_HTTP_REQUEST) {
+						php_http_message_parser_state_push(parser, 1, PHP_HTTP_MESSAGE_PARSER_STATE_DONE);
+					} else {
+						php_http_message_parser_state_push(parser, 1, PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DUMB);
+					}
 				}
 				break;
 			}
 
 			case PHP_HTTP_MESSAGE_PARSER_STATE_BODY:
 			{
-				zval *zcl;
-
-				if (parser->inflate) {
-					char *dec_str = NULL;
-					size_t dec_len;
+				if (len) {
+					/* FIXME: what if we re-use the parser? */
+					if (parser->inflate) {
+						char *dec_str = NULL;
+						size_t dec_len;
+
+						if (SUCCESS != php_http_encoding_stream_update(parser->inflate, str, len, &dec_str, &dec_len)) {
+							return php_http_message_parser_state_push(parser, 1, PHP_HTTP_MESSAGE_PARSER_STATE_FAILURE);
+						}
 
-					if (SUCCESS != php_http_encoding_stream_update(parser->inflate, str, len, &dec_str, &dec_len TSRMLS_CC)) {
-						return php_http_message_parser_state_push(parser, 1, PHP_HTTP_MESSAGE_PARSER_STATE_FAILURE);
+						if (str != buffer->data) {
+							PTR_FREE(str);
+						}
+						str = dec_str;
+						len = dec_len;
 					}
 
-					if (str != buffer->data) {
-						STR_FREE(str);
-					}
-					str = dec_str;
-					len = dec_len;
-				}
+					php_stream_write(php_http_message_body_stream((*message)->body), str, len);
 
-				php_stream_write(php_http_message_body_stream(&(*message)->body), str, len);
-				php_http_buffer_cut(buffer, 0, cut);
+				}
 
-				/* 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) {
+					php_http_buffer_cut(buffer, 0, cut);
+				}
 
 				if (str != buffer->data) {
-					STR_FREE(str);
+					PTR_FREE(str);
 				}
+
 				str = NULL;
 				len = 0;
 				cut = 0;
@@ -276,7 +428,7 @@ PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_parse(php_h
 				len = buffer->used;
 				cut = len;
 
-				php_http_message_parser_state_push(parser, 2, !buffer->used?PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DONE:PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DUMB, PHP_HTTP_MESSAGE_PARSER_STATE_BODY);
+				php_http_message_parser_state_push(parser, 2, PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DONE, PHP_HTTP_MESSAGE_PARSER_STATE_BODY);
 				break;
 			}
 
@@ -305,15 +457,15 @@ PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_parse(php_h
 				char *dec_str = NULL;
 				size_t dec_len;
 
-				if (SUCCESS != php_http_encoding_stream_update(parser->dechunk, buffer->data, buffer->used, &dec_str, &dec_len TSRMLS_CC)) {
-					return FAILURE;
+				if (SUCCESS != php_http_encoding_stream_update(parser->dechunk, buffer->data, buffer->used, &dec_str, &dec_len)) {
+					return PHP_HTTP_MESSAGE_PARSER_STATE_FAILURE;
 				}
 
 				str = dec_str;
 				len = dec_len;
 
 				if (php_http_encoding_stream_done(parser->dechunk)) {
-					cut = buffer->used - PHP_HTTP_BUFFER_LEN(parser->dechunk->ctx);
+					cut = buffer->used - PHP_HTTP_BUFFER(parser->dechunk->ctx)->used;
 					php_http_message_parser_state_push(parser, 2, PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DONE, PHP_HTTP_MESSAGE_PARSER_STATE_BODY);
 				} else {
 					cut = buffer->used;
@@ -326,11 +478,11 @@ PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_parse(php_h
 			{
 				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;
 
-					if (SUCCESS != php_http_encoding_stream_finish(parser->dechunk, &dec_str, &dec_len TSRMLS_CC)) {
+					if (SUCCESS != php_http_encoding_stream_finish(parser->dechunk, &dec_str, &dec_len)) {
 						return php_http_message_parser_state_push(parser, 1, PHP_HTTP_MESSAGE_PARSER_STATE_FAILURE);
 					}
 					php_http_encoding_stream_dtor(parser->dechunk);
@@ -339,14 +491,24 @@ PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_parse(php_h
 						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;
+				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);
+				break;
+			}
+
+			case PHP_HTTP_MESSAGE_PARSER_STATE_DONE:
+			{
 				char *ptr = buffer->data;
 
 				while (ptr - buffer->data < buffer->used && PHP_HTTP_IS_CTYPE(space, *ptr)) {
@@ -354,6 +516,10 @@ PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_parse(php_h
 				}
 
 				php_http_buffer_cut(buffer, 0, ptr - buffer->data);
+				
+				if (!(flags & PHP_HTTP_MESSAGE_PARSER_GREEDY)) {
+					return PHP_HTTP_MESSAGE_PARSER_STATE_DONE;
+				}
 				break;
 			}
 		}
@@ -361,3 +527,160 @@ PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_parse(php_h
 
 	return php_http_message_parser_state_is(parser);
 }
+
+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)
+{
+	return php_http_message_parser_object_new_ex(ce, NULL, NULL TSRMLS_CC);
+}
+
+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 *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;
+	}
+
+	if (parser) {
+		o->parser = parser;
+	} else {
+		o->parser = php_http_message_parser_init(NULL TSRMLS_CC);
+	}
+	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;
+
+	return o->zv;
+}
+
+void php_http_message_parser_object_free(void *object TSRMLS_DC)
+{
+	php_http_message_parser_object_t *o = (php_http_message_parser_object_t *) object;
+
+	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);
+}
+
+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);
+
+	zend_parse_parameters_none();
+	/* always return the real state */
+	RETVAL_LONG(php_http_message_parser_state_is(parser_obj->parser));
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageParser_parse, 0, 0, 3)
+	ZEND_ARG_INFO(0, data)
+	ZEND_ARG_INFO(0, flags)
+	ZEND_ARG_INFO(1, message)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpMessageParser, parse)
+{
+	php_http_message_parser_object_t *parser_obj;
+	zval *zmsg;
+	char *data_str;
+	int data_len;
+	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));
+
+	zval_dtor(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);
+	}
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageParser_stream, 0, 0, 3)
+	ZEND_ARG_INFO(0, stream)
+	ZEND_ARG_INFO(0, flags)
+	ZEND_ARG_INFO(1, message)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpMessageParser, stream)
+{
+	php_http_message_parser_object_t *parser_obj;
+	zend_error_handling zeh;
+	zval *zmsg, *zstream;
+	php_stream *s;
+	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);
+
+	parser_obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+	RETVAL_LONG(php_http_message_parser_parse_stream(parser_obj->parser, parser_obj->buffer, s, flags, &parser_obj->parser->message));
+
+	zval_dtor(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);
+	}
+}
+
+static zend_function_entry php_http_message_parser_methods[] = {
+		PHP_ME(HttpMessageParser, getState, ai_HttpMessageParser_getState, ZEND_ACC_PUBLIC)
+		PHP_ME(HttpMessageParser, parse, ai_HttpMessageParser_parse, ZEND_ACC_PUBLIC)
+		PHP_ME(HttpMessageParser, stream, ai_HttpMessageParser_stream, ZEND_ACC_PUBLIC)
+		{NULL, NULL, NULL}
+};
+
+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);
+	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);
+
+	return SUCCESS;
+}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
+