X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=php_http_message_parser.c;h=b64eb0035853c79c8048e22c3a38fba5b976fe72;hb=47be714b40e14b6b5cdc2f35a7994efd13c2076e;hp=634a7648642d6a2b3991cbfbf6f717b779430ade;hpb=628bdcb6edd65cb683b43af16cd0ce619b56d58a;p=m6w6%2Fext-http

diff --git a/php_http_message_parser.c b/php_http_message_parser.c
index 634a764..b64eb00 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-2011, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2013, 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));
@@ -59,7 +59,7 @@ PHP_HTTP_API php_http_message_parser_t *php_http_message_parser_init(php_http_me
 	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;
@@ -75,7 +75,7 @@ PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_state_push(
 	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;
 
@@ -85,7 +85,7 @@ PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_state_is(ph
 	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)) {
@@ -96,7 +96,7 @@ PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_state_pop(p
 	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);
@@ -108,7 +108,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 +117,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 +186,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;
@@ -393,11 +393,11 @@ PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_parse(php_h
 						len = dec_len;
 					}
 
-					php_stream_write(php_http_message_body_stream(&(*message)->body), str, len);
+					php_stream_write(php_http_message_body_stream((*message)->body), str, len);
 
 					/* keep track */
 					MAKE_STD_ZVAL(zcl);
-					ZVAL_LONG(zcl, php_http_message_body_size(&(*message)->body));
+					ZVAL_LONG(zcl, php_http_message_body_size((*message)->body));
 					zend_hash_update(&(*message)->hdrs, "Content-Length", sizeof("Content-Length"), &zcl, sizeof(zval *), NULL);
 				}
 
@@ -451,14 +451,14 @@ PHP_HTTP_API php_http_message_parser_state_t php_http_message_parser_parse(php_h
 				size_t dec_len;
 
 				if (SUCCESS != php_http_encoding_stream_update(parser->dechunk, buffer->data, buffer->used, &dec_str, &dec_len)) {
-					return FAILURE;
+					return PHP_HTTP_MESSAGE_PARSER_STATE_FAILURE;
 				}
 
 				str = dec_str;
 				len = dec_len;
 
 				if (php_http_encoding_stream_done(parser->dechunk)) {
-					cut = buffer->used - PHP_HTTP_BUFFER_LEN(parser->dechunk->ctx);
+					cut = buffer->used - PHP_HTTP_BUFFER(parser->dechunk->ctx)->used;
 					php_http_message_parser_state_push(parser, 2, PHP_HTTP_MESSAGE_PARSER_STATE_BODY_DONE, PHP_HTTP_MESSAGE_PARSER_STATE_BODY);
 				} else {
 					cut = buffer->used;