Merge branch 'master' into phpng

[m6w6/ext-http] / php_http_message_parser.h

diff --git a/php_http_message_parser.h b/php_http_message_parser.h
index 0bac9da84ea60c5fcb2b11531a169d69c1f92afc..fa6385845bc7a8906f974430bf378ba1c216a996 100644 (file)
--- a/php_http_message_parser.h
+++ b/php_http_message_parser.h
@@ -43,12 +43,9 @@ 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);
@@ -58,19 +55,18 @@ PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_parse(php_h
 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