fix macro usage

[m6w6/ext-http] / php_http_message_parser.h

diff --git a/php_http_message_parser.h b/php_http_message_parser.h
index 31c30040117ff2877f3028bf36e7c8c02db0c777..fa6385845bc7a8906f974430bf378ba1c216a996 100644 (file)
--- a/php_http_message_parser.h
+++ b/php_http_message_parser.h
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2014, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -27,32 +27,46 @@ 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;
 
 #define PHP_HTTP_MESSAGE_PARSER_CLEANUP                        0x1
 #define PHP_HTTP_MESSAGE_PARSER_DUMB_BODIES            0x2
 #define PHP_HTTP_MESSAGE_PARSER_EMPTY_REDIRECTS        0x4
+#define PHP_HTTP_MESSAGE_PARSER_GREEDY                 0x8
 
 typedef struct php_http_message_parser {
        php_http_header_parser_t header;
-       zend_stack stack;
+       zend_ptr_stack stack;
        size_t body_length;
        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_http_buffer_t *buffer, php_stream *s, unsigned flags, php_http_message_t **message);
+
+typedef struct php_http_message_parser_object {
+       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 *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