X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message_parser.c;h=20ef3acc776b664e6cc4d78d7a440cd89f384d5d;hp=d6e7c260b57cc12f2326333d8d3d9baad1ad6799;hb=refs%2Fheads%2Fv2.1.x;hpb=975cb208a4711c01261dd76630ef793efd1294fa

diff --git a/php_http_message_parser.c b/php_http_message_parser.c
index d6e7c26..20ef3ac 100644
--- a/php_http_message_parser.c
+++ b/php_http_message_parser.c
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2013, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2014, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -44,7 +44,7 @@ const char *php_http_message_parser_state_name(php_http_message_parser_state_t s
 }
 #endif
 
-PHP_HTTP_API php_http_message_parser_t *php_http_message_parser_init(php_http_message_parser_t *parser TSRMLS_DC)
+php_http_message_parser_t *php_http_message_parser_init(php_http_message_parser_t *parser TSRMLS_DC)
 {
 	if (!parser) {
 		parser = emalloc(sizeof(*parser));
@@ -54,52 +54,49 @@ 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;
 
+	/* 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);
 	if (parser->dechunk) {
 		php_http_encoding_stream_free(&parser->dechunk);
 	}
@@ -108,7 +105,7 @@ 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)
+void php_http_message_parser_free(php_http_message_parser_t **parser)
 {
 	if (*parser) {
 		php_http_message_parser_dtor(*parser);
@@ -117,7 +114,7 @@ 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_stream(php_http_message_parser_t *parser, php_stream *s, 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_stream *s, unsigned flags, php_http_message_t **message)
 {
 	php_http_buffer_t buf;
 	php_http_message_parser_state_t state = PHP_HTTP_MESSAGE_PARSER_STATE_START;
@@ -186,7 +183,7 @@ PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_parse_strea
 }
 
 
-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_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;