X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message_parser.h;h=fa6385845bc7a8906f974430bf378ba1c216a996;hp=5b04351678e430151e9102de2f40ec86e94bcd10;hb=8000eca9bbf2cebb98a2dfd982d54e93aaa6a58f;hpb=39e4972736be9924a4917b3340b7ae0651bf7a2b

diff --git a/php_http_message_parser.h b/php_http_message_parser.h
index 5b04351..fa63858 100644
--- a/php_http_message_parser.h
+++ b/php_http_message_parser.h
@@ -27,6 +27,7 @@ typedef enum php_http_message_parser_state {
 	PHP_HTTP_MESSAGE_PARSER_STATE_BODY_LENGTH,
 	PHP_HTTP_MESSAGE_PARSER_STATE_BODY_CHUNKED,
 	PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DONE,
+	PHP_HTTP_MESSAGE_PARSER_STATE_UPDATE_CL,
 	PHP_HTTP_MESSAGE_PARSER_STATE_DONE
 } php_http_message_parser_state_t;
 
@@ -42,34 +43,30 @@ typedef struct php_http_message_parser {
 	php_http_message_t *message;
 	php_http_encoding_stream_t *dechunk;
 	php_http_encoding_stream_t *inflate;
-#ifdef ZTS
-	void ***ts;
-#endif
 } php_http_message_parser_t;
 
-PHP_HTTP_API php_http_message_parser_t *php_http_message_parser_init(php_http_message_parser_t *parser TSRMLS_DC);
+PHP_HTTP_API php_http_message_parser_t *php_http_message_parser_init(php_http_message_parser_t *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_API php_http_message_parser_state_t php_http_message_parser_state_is(php_http_message_parser_t *parser);
 PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_state_pop(php_http_message_parser_t *parser);
 PHP_HTTP_API void php_http_message_parser_dtor(php_http_message_parser_t *parser);
 PHP_HTTP_API void php_http_message_parser_free(php_http_message_parser_t **parser);
 PHP_HTTP_API 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);
-PHP_HTTP_API 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_API php_http_message_parser_state_t php_http_message_parser_parse_stream(php_http_message_parser_t *parser, php_http_buffer_t *buffer, php_stream *s, unsigned flags, php_http_message_t **message);
 
 typedef struct php_http_message_parser_object {
-	zend_object zo;
-	zend_object_value zv;
-	php_http_buffer_t *buffer;
+	php_http_buffer_t buffer;
 	php_http_message_parser_t *parser;
+	zend_object zo;
 } php_http_message_parser_object_t;
 
 PHP_HTTP_API zend_class_entry *php_http_message_parser_class_entry;
 
 PHP_MINIT_FUNCTION(http_message_parser);
 
-zend_object_value php_http_message_parser_object_new(zend_class_entry *ce TSRMLS_DC);
-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);
-void php_http_message_parser_object_free(void *object TSRMLS_DC);
+zend_object *php_http_message_parser_object_new(zend_class_entry *ce);
+php_http_message_parser_object_t *php_http_message_parser_object_new_ex(zend_class_entry *ce, php_http_message_parser_t *parser);
+void php_http_message_parser_object_free(zend_object *object);
 
 #endif