X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_header_parser.h;h=33707bd6fb5709ec5643fe950567e9747447bca5;hp=0d52930da09067030085ac876a3e527839868659;hb=d83a87724867f87e236c466df3dbb9a68c1670ba;hpb=df06e2dbf48a3b0d96f2c62071c1b5fc907a98d0

diff --git a/php_http_header_parser.h b/php_http_header_parser.h
index 0d52930..33707bd 100644
--- a/php_http_header_parser.h
+++ b/php_http_header_parser.h
@@ -1,3 +1,15 @@
+/*
+    +--------------------------------------------------------------------+
+    | 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>            |
+    +--------------------------------------------------------------------+
+*/
+
 #ifndef PHP_HTTP_HEADER_PARSER_H
 #define PHP_HTTP_HEADER_PARSER_H
 
@@ -8,6 +20,7 @@ typedef enum php_http_header_parser_state {
 	PHP_HTTP_HEADER_PARSER_STATE_START = 0,
 	PHP_HTTP_HEADER_PARSER_STATE_KEY,
 	PHP_HTTP_HEADER_PARSER_STATE_VALUE,
+	PHP_HTTP_HEADER_PARSER_STATE_VALUE_EX,
 	PHP_HTTP_HEADER_PARSER_STATE_HEADER_DONE,
 	PHP_HTTP_HEADER_PARSER_STATE_DONE
 } php_http_header_parser_state_t;
@@ -15,7 +28,7 @@ typedef enum php_http_header_parser_state {
 #define PHP_HTTP_HEADER_PARSER_CLEANUP 0x1
 
 typedef struct php_http_header_parser {
-	zend_stack stack;
+	zend_ptr_stack stack;
 	php_http_info_t info;
 	struct {
 		char *str;
@@ -25,17 +38,39 @@ typedef struct php_http_header_parser {
 		char *str;
 		size_t len;
 	} _val;
-#ifdef ZTS
-	void ***ts;
-#endif
 } php_http_header_parser_t;
 
-PHP_HTTP_API php_http_header_parser_t *php_http_header_parser_init(php_http_header_parser_t *parser TSRMLS_DC);
+PHP_HTTP_API php_http_header_parser_t *php_http_header_parser_init(php_http_header_parser_t *parser);
 PHP_HTTP_API php_http_header_parser_state_t php_http_header_parser_state_push(php_http_header_parser_t *parser, unsigned argc, ...);
 PHP_HTTP_API php_http_header_parser_state_t php_http_header_parser_state_is(php_http_header_parser_t *parser);
 PHP_HTTP_API php_http_header_parser_state_t php_http_header_parser_state_pop(php_http_header_parser_t *parser);
 PHP_HTTP_API void php_http_header_parser_dtor(php_http_header_parser_t *parser);
 PHP_HTTP_API void php_http_header_parser_free(php_http_header_parser_t **parser);
-PHP_HTTP_API STATUS php_http_header_parser_parse(php_http_header_parser_t *parser, php_http_buffer_t *buffer, unsigned flags, HashTable *headers, php_http_info_callback_t callback_func, void *callback_arg);
+PHP_HTTP_API php_http_header_parser_state_t php_http_header_parser_parse(php_http_header_parser_t *parser, php_http_buffer_t *buffer, unsigned flags, HashTable *headers, php_http_info_callback_t callback_func, void *callback_arg);
+PHP_HTTP_API php_http_header_parser_state_t php_http_headerparser_parse_stream(php_http_header_parser_t *parser, php_http_buffer_t *buffer, php_stream *s, unsigned flags, HashTable *headers, php_http_info_callback_t callback_func, void *callback_arg);
+
+typedef struct php_http_header_parser_object {
+	php_http_buffer_t *buffer;
+	php_http_header_parser_t *parser;
+	zend_object zo;
+} php_http_header_parser_object_t;
+
+PHP_HTTP_API zend_class_entry *php_http_header_parser_class_entry;
+
+PHP_MINIT_FUNCTION(http_header_parser);
+
+zend_object *php_http_header_parser_object_new(zend_class_entry *ce);
+php_http_header_parser_object_t *php_http_header_parser_object_new_ex(zend_class_entry *ce, php_http_header_parser_t *parser);
+void php_http_header_parser_object_free(zend_object *object);
 
 #endif /* PHP_HTTP_HEADER_PARSER_H */
+
+/*
+ * 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
+ */
+