From b08a238775e998bb07b530c3cd80219e100c95cf Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 2 Aug 2014 17:50:00 +0200 Subject: [PATCH] set always_populate_raw_post_data=-1 to avoid failed test (because of warning) --- tests/message002.phpt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/message002.phpt b/tests/message002.phpt index f782f8f..403fb26 100644 --- a/tests/message002.phpt +++ b/tests/message002.phpt @@ -9,6 +9,8 @@ b=c HTTP_X_TEST=test --COOKIE-- foo=bar +--INI-- +always_populate_raw_post_data=-1 --FILE-- Date: Sat, 2 Aug 2014 17:50:41 +0200 Subject: [PATCH] slip online test --- tests/client010.phpt | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/client010.phpt b/tests/client010.phpt index 803403f..055d585 100644 --- a/tests/client010.phpt +++ b/tests/client010.phpt @@ -3,6 +3,7 @@ client upload --SKIPIF-- --FILE-- Date: Mon, 4 Aug 2014 10:45:19 +0200 Subject: [PATCH] =?utf8?q?fix=20PHP-5.4=20compatibility=C2=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- php_http.h | 2 +- php_http_header_parser.c | 2 +- php_http_message_parser.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/php_http_header_parser.c b/php_http_header_parser.c index f560a85..ec41a24 100644 --- a/php_http_header_parser.c +++ b/php_http_header_parser.c @@ -62,7 +62,7 @@ php_http_header_parser_state_t php_http_header_parser_state_is(php_http_header_p php_http_header_parser_state_t state; if (parser->stack.top) { - return (php_http_header_parser_state_t) zend_ptr_stack_top(&parser->stack); + return (php_http_header_parser_state_t) parser->stack.elements[parser->stack.top - 1]; } return PHP_HTTP_HEADER_PARSER_STATE_START; diff --git a/php_http_message_parser.c b/php_http_message_parser.c index 6328fa4..20ef3ac 100644 --- a/php_http_message_parser.c +++ b/php_http_message_parser.c @@ -80,7 +80,7 @@ php_http_message_parser_state_t php_http_message_parser_state_push(php_http_mess php_http_message_parser_state_t php_http_message_parser_state_is(php_http_message_parser_t *parser) { if (parser->stack.top) { - return (php_http_message_parser_state_t) zend_ptr_stack_top(&parser->stack); + return (php_http_message_parser_state_t) parser->stack.elements[parser->stack.top - 1]; } return PHP_HTTP_MESSAGE_PARSER_STATE_START; } -- 1.9.2