X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_header_parser.c;h=df0837df2727430de080869760daa65f4f7b8969;hp=0dbaf848f9e72f02d59f55f27e87ef7c4ba79eee;hb=refs%2Fheads%2Fv2.2.x;hpb=d926a12aeec96752456eddfbf9a04a002809a0d2

diff --git a/php_http_header_parser.c b/php_http_header_parser.c
index 0dbaf84..df0837d 100644
--- a/php_http_header_parser.c
+++ b/php_http_header_parser.c
@@ -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>            |
     +--------------------------------------------------------------------+
 */
 
@@ -21,12 +21,12 @@ static const php_http_header_parser_state_spec_t php_http_header_parser_states[]
 		{PHP_HTTP_HEADER_PARSER_STATE_START,		1},
 		{PHP_HTTP_HEADER_PARSER_STATE_KEY,			1},
 		{PHP_HTTP_HEADER_PARSER_STATE_VALUE,		1},
+		{PHP_HTTP_HEADER_PARSER_STATE_VALUE_EX,		1},
 		{PHP_HTTP_HEADER_PARSER_STATE_HEADER_DONE,	0},
 		{PHP_HTTP_HEADER_PARSER_STATE_DONE,			0}
 };
 
-
-PHP_HTTP_API php_http_header_parser_t *php_http_header_parser_init(php_http_header_parser_t *parser TSRMLS_DC)
+php_http_header_parser_t *php_http_header_parser_init(php_http_header_parser_t *parser TSRMLS_DC)
 {
 	if (!parser) {
 		parser = emalloc(sizeof(*parser));
@@ -38,53 +38,52 @@ PHP_HTTP_API php_http_header_parser_t *php_http_header_parser_init(php_http_head
 	return 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_header_parser_state_t php_http_header_parser_state_push(php_http_header_parser_t *parser, unsigned argc, ...)
 {
 	va_list va_args;
 	unsigned i;
 	php_http_header_parser_state_t state = 0;
 
+	/* 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_header_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_header_parser_state_t php_http_header_parser_state_is(php_http_header_parser_t *parser)
+php_http_header_parser_state_t php_http_header_parser_state_is(php_http_header_parser_t *parser)
 {
-	php_http_header_parser_state_t *state;
-
-	if (SUCCESS == zend_stack_top(&parser->stack, (void *) &state)) {
-		return *state;
+	if (parser->stack.top) {
+		return (php_http_header_parser_state_t) parser->stack.elements[parser->stack.top - 1];
 	}
+
 	return PHP_HTTP_HEADER_PARSER_STATE_START;
 }
 
-PHP_HTTP_API php_http_header_parser_state_t php_http_header_parser_state_pop(php_http_header_parser_t *parser)
+php_http_header_parser_state_t php_http_header_parser_state_pop(php_http_header_parser_t *parser)
 {
-	php_http_header_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_header_parser_state_t) zend_ptr_stack_pop(&parser->stack);
 	}
+
 	return PHP_HTTP_HEADER_PARSER_STATE_START;
 }
 
-PHP_HTTP_API void php_http_header_parser_dtor(php_http_header_parser_t *parser)
+void php_http_header_parser_dtor(php_http_header_parser_t *parser)
 {
-	zend_stack_destroy(&parser->stack);
+	zend_ptr_stack_destroy(&parser->stack);
 	php_http_info_dtor(&parser->info);
-	STR_FREE(parser->_key.str);
-	STR_FREE(parser->_val.str);
+	PTR_FREE(parser->_key.str);
+	PTR_FREE(parser->_val.str);
 }
 
-PHP_HTTP_API void php_http_header_parser_free(php_http_header_parser_t **parser)
+void php_http_header_parser_free(php_http_header_parser_t **parser)
 {
 	if (*parser) {
 		php_http_header_parser_dtor(*parser);
@@ -93,14 +92,14 @@ 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)
+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)
 {
 	TSRMLS_FETCH_FROM_CTX(parser->ts);
 
 	while (buffer->used || !php_http_header_parser_states[php_http_header_parser_state_is(parser)].need_data) {
 #if 0
 		const char *state[] = {"START", "KEY", "VALUE", "HEADER_DONE", "DONE"};
-		fprintf(stderr, "#HP: %s (%d)\n", php_http_header_parser_state_is(parser) < 0 ? "FAILURE" : state[php_http_header_parser_state_is(parser)], zend_hash_num_elements(headers));
+		fprintf(stderr, "#HP: %s (avail:%zu, num:%d)\n", php_http_header_parser_state_is(parser) < 0 ? "FAILURE" : state[php_http_header_parser_state_is(parser)], buffer->used, headers?zend_hash_num_elements(headers):0);
 		_dpf(0, buffer->data, buffer->used);
 #endif
 		switch (php_http_header_parser_state_pop(parser)) {
@@ -138,7 +137,7 @@ PHP_HTTP_API STATUS php_http_header_parser_parse(php_http_header_parser_t *parse
 				} else if ((colon = memchr(buffer->data, ':', buffer->used)) && (!eol_str || eol_str > colon)) {
 					/* header: string */
 					parser->_key.str = estrndup(buffer->data, parser->_key.len = colon - buffer->data);
-					while (PHP_HTTP_IS_CTYPE(space, *++colon));
+					while (PHP_HTTP_IS_CTYPE(space, *++colon) && *colon != '\n' && *colon != '\r');
 					php_http_buffer_cut(buffer, 0, colon - buffer->data);
 					php_http_header_parser_state_push(parser, 1, PHP_HTTP_HEADER_PARSER_STATE_VALUE);
 				} else {
@@ -152,42 +151,75 @@ PHP_HTTP_API STATUS php_http_header_parser_parse(php_http_header_parser_t *parse
 				const char *eol_str;
 				int eol_len;
 
-				line_split: {
-					
-					if ((eol_str = php_http_locate_bin_eol(buffer->data, buffer->used, &eol_len))) {
-						if (eol_str + eol_len - buffer->data < buffer->used) {
-							char *nextline = eol_str + eol_len;
-
-							if (*nextline == '\t' || *nextline == ' ') {
-								while (nextline < buffer->data + buffer->used && (*nextline == '\t' || *nextline == ' ')) {
-									++nextline;
-								}
-								php_http_buffer_cut(buffer, eol_str - buffer->data, nextline - eol_str);
-								goto line_split;
-							}
+#define SET_ADD_VAL(slen, eol_len) \
+	do { \
+		const char *ptr = buffer->data; \
+		size_t len = slen; \
+		 \
+		while (len > 0 && PHP_HTTP_IS_CTYPE(space, *ptr)) { \
+			++ptr; \
+			--len; \
+		} \
+		while (len > 0 && PHP_HTTP_IS_CTYPE(space, ptr[len - 1])) { \
+			--len; \
+		} \
+		 \
+		if (len > 0) { \
+			if (parser->_val.str) { \
+				parser->_val.str = erealloc(parser->_val.str, parser->_val.len + len + 2); \
+				parser->_val.str[parser->_val.len++] = ' '; \
+				memcpy(&parser->_val.str[parser->_val.len], ptr, len); \
+				parser->_val.len += len; \
+				parser->_val.str[parser->_val.len] = '\0'; \
+			} else { \
+				parser->_val.len = len; \
+				parser->_val.str = estrndup(ptr, len); \
+			} \
+		} \
+		php_http_buffer_cut(buffer, 0, slen + eol_len); \
+	} while (0)
+
+				if ((eol_str = php_http_locate_bin_eol(buffer->data, buffer->used, &eol_len))) {
+					SET_ADD_VAL(eol_str - buffer->data, eol_len);
+
+					if (buffer->used) {
+						if (*buffer->data != '\t' && *buffer->data != ' ') {
+							php_http_header_parser_state_push(parser, 1, PHP_HTTP_HEADER_PARSER_STATE_HEADER_DONE);
+							break;
+						} else {
+							php_http_header_parser_state_push(parser, 1, PHP_HTTP_HEADER_PARSER_STATE_VALUE);
+							break;
 						}
-
-						parser->_val.str = estrndup(buffer->data, parser->_val.len = eol_str - buffer->data);
-						php_http_buffer_cut(buffer, 0, eol_str + eol_len - buffer->data);
-						php_http_header_parser_state_push(parser, 1, PHP_HTTP_HEADER_PARSER_STATE_HEADER_DONE);
-					} else if (flags & PHP_HTTP_HEADER_PARSER_CLEANUP) {
-						if (buffer->used) {
-							parser->_val.str = estrndup(buffer->data, parser->_val.len = buffer->used);
-							php_http_buffer_reset(buffer);
-						}
-						php_http_header_parser_state_push(parser, 1, PHP_HTTP_HEADER_PARSER_STATE_HEADER_DONE);
-					} else {
-						return php_http_header_parser_state_push(parser, 1, PHP_HTTP_HEADER_PARSER_STATE_VALUE);
 					}
 				}
 
+				if (flags & PHP_HTTP_HEADER_PARSER_CLEANUP) {
+					if (buffer->used) {
+						SET_ADD_VAL(buffer->used, 0);
+					}
+					php_http_header_parser_state_push(parser, 1, PHP_HTTP_HEADER_PARSER_STATE_HEADER_DONE);
+				} else {
+					return php_http_header_parser_state_push(parser, 1, PHP_HTTP_HEADER_PARSER_STATE_VALUE_EX);
+				}
 				break;
 			}
 
+			case PHP_HTTP_HEADER_PARSER_STATE_VALUE_EX:
+				if (*buffer->data == ' ' || *buffer->data == '\t') {
+					php_http_header_parser_state_push(parser, 1, PHP_HTTP_HEADER_PARSER_STATE_VALUE);
+				} else {
+					php_http_header_parser_state_push(parser, 1, PHP_HTTP_HEADER_PARSER_STATE_HEADER_DONE);
+				}
+				break;
+
 			case PHP_HTTP_HEADER_PARSER_STATE_HEADER_DONE:
 				if (parser->_key.str && parser->_val.str) {
 					zval array, **exist;
 
+					if (!headers && callback_func) {
+						callback_func(callback_arg, &headers, NULL TSRMLS_CC);
+					}
+
 					INIT_PZVAL_ARRAY(&array, headers);
 					php_http_pretty_key(parser->_key.str, parser->_key.len, 1, 1);
 					if (SUCCESS == zend_symtable_find(headers, parser->_key.str, parser->_key.len + 1, (void *) &exist)) {
@@ -199,8 +231,8 @@ PHP_HTTP_API STATUS php_http_header_parser_parse(php_http_header_parser_t *parse
 					parser->_val.str = NULL;
 				}
 
-				STR_SET(parser->_key.str, NULL);
-				STR_SET(parser->_val.str, NULL);
+				PTR_SET(parser->_key.str, NULL);
+				PTR_SET(parser->_val.str, NULL);
 
 				php_http_header_parser_state_push(parser, 1, PHP_HTTP_HEADER_PARSER_STATE_KEY);
 				break;