diff options
author | yang-g <yangg@google.com> | 2016-04-26 16:23:53 -0700 |
---|---|---|
committer | yang-g <yangg@google.com> | 2016-04-26 16:23:53 -0700 |
commit | 6b16aaae96d7f8664870da8b4e36ea0da10d667e (patch) | |
tree | d3b6915ba019bae703f6e6d87351a454be2a3aba /test/core/http/parser_test.c | |
parent | 57d1e082689c96e2721122748b08583d6b63d394 (diff) | |
parent | a4e7ecab1a512bae1c40b9b301661ba24677b0ed (diff) |
merge and resolve conflict
Diffstat (limited to 'test/core/http/parser_test.c')
-rw-r--r-- | test/core/http/parser_test.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/test/core/http/parser_test.c b/test/core/http/parser_test.c index 10936754d9..7fdf60cc2b 100644 --- a/test/core/http/parser_test.c +++ b/test/core/http/parser_test.c @@ -238,6 +238,11 @@ int main(int argc, char **argv) { "\r\n" "hello world!", 200, "hello world!", "xyz", "abc", NULL); + test_succeeds(split_modes[i], + "HTTP/1.1 200 OK\n" + "\n" + "abc", + 200, "abc", NULL); test_request_succeeds(split_modes[i], "GET / HTTP/1.0\r\n" "\r\n", @@ -264,6 +269,11 @@ int main(int argc, char **argv) { "xyz", "GET", GRPC_HTTP_HTTP10, "/", "xyz", "xyz", "abc", NULL); + test_request_succeeds(split_modes[i], + "GET / HTTP/1.0\n" + "\n" + "xyz", + "GET", GRPC_HTTP_HTTP10, "/", "xyz", NULL); test_fails(split_modes[i], "HTTP/1.0\r\n"); test_fails(split_modes[i], "HTTP/1.2\r\n"); test_fails(split_modes[i], "HTTP/1.0 000 XYX\r\n"); @@ -281,6 +291,7 @@ int main(int argc, char **argv) { test_fails(split_modes[i], "GET / HTTP/0.0\r\n"); test_fails(split_modes[i], "GET / ____/1.0\r\n"); test_fails(split_modes[i], "GET / HTTP/1.2\r\n"); + test_fails(split_modes[i], "GET / HTTP/1.0\n"); tmp1 = gpr_malloc(2 * GRPC_HTTP_PARSER_MAX_HEADER_LENGTH); memset(tmp1, 'a', 2 * GRPC_HTTP_PARSER_MAX_HEADER_LENGTH - 1); |