fix old and add new http\Client\Curl\Versions constants

[m6w6/ext-http] / src / php_http_message_parser.c

diff --git a/src/php_http_message_parser.c b/src/php_http_message_parser.c
index 49a6013ae561d9b0bcec0cc4e52fc55172d7f4b2..55087e0f440ed628de9b26d3f38e347d6ebe6930 100644 (file)
--- a/src/php_http_message_parser.c
+++ b/src/php_http_message_parser.c
@@ -57,7 +57,13 @@ php_http_message_parser_t *php_http_message_parser_init(php_http_message_parser_
        return parser;
 }
 
-#define php_http_message_parser_state_push(parser, state) zend_ptr_stack_push(&(parser)->stack, (void *) (state)), (state)
+static inline php_http_message_parser_state_t
+php_http_message_parser_state_push(php_http_message_parser_t *parser, php_http_message_parser_state_t state)
+{
+       zend_ptr_stack_push(&parser->stack, (void *) state);
+       return state;
+}
+
 #define php_http_message_parser_state_pop(parser) ((parser)->stack.top \
                ? (php_http_message_parser_state_t) zend_ptr_stack_pop(&parser->stack) \
                : PHP_HTTP_MESSAGE_PARSER_STATE_START)
@@ -323,7 +329,7 @@ php_http_message_parser_state_t php_http_message_parser_parse(php_http_message_p
                                        }
 
                                        if (content_range) {
-                                               ulong total = 0, start = 0, end = 0;
+                                               unsigned long total = 0, start = 0, end = 0;
 
                                                if (!strncasecmp(content_range->val, "bytes", lenof("bytes"))
                                                && (    content_range->val[lenof("bytes")] == ':'
@@ -644,7 +650,7 @@ static zend_function_entry php_http_message_parser_methods[] = {
                PHP_ME(HttpMessageParser, getState, ai_HttpMessageParser_getState, ZEND_ACC_PUBLIC)
                PHP_ME(HttpMessageParser, parse, ai_HttpMessageParser_parse, ZEND_ACC_PUBLIC)
                PHP_ME(HttpMessageParser, stream, ai_HttpMessageParser_stream, ZEND_ACC_PUBLIC)
-               {NULL, NULL, NULL}
+               {0}
 };
 
 PHP_MINIT_FUNCTION(http_message_parser)