a lot of change needed for the tests

Author: TingDaoK

source/h1_connection.c

@@ -2029,6 +2029,7 @@ static int s_try_process_next_stream_read_message(struct aws_h1_connection *conn
     aws_h1_decoder_set_logging_id(connection->thread_data.incoming_stream_decoder, incoming_stream);
 
     bool body_headers_ignored = incoming_stream->base.request_method == AWS_HTTP_METHOD_HEAD;
+    body_headers_ignored |= incoming_stream->base.request_method == AWS_HTTP_METHOD_CONNECT;
     aws_h1_decoder_set_body_headers_ignored(connection->thread_data.incoming_stream_decoder, body_headers_ignored);
     /**
      * RFC-7230 3.3.3
@@ -2037,9 +2038,9 @@ static int s_try_process_next_stream_read_message(struct aws_h1_connection *conn
      * line that concludes the header fields.  A client MUST ignore any
      * Content-Length or Transfer-Encoding header fields received in
      * such a message. . */
-    aws_h1_decoder_set_body_headers_ignored_on_2xx(
-        connection->thread_data.incoming_stream_decoder,
-        incoming_stream->base.request_method == AWS_HTTP_METHOD_CONNECT);
+    // aws_h1_decoder_set_body_headers_ignored_on_2xx(
+    //     connection->thread_data.incoming_stream_decoder,
+    //     incoming_stream->base.request_method == AWS_HTTP_METHOD_CONNECT);
 
     if (incoming_stream->base.metrics.receive_start_timestamp_ns == -1) {
         /* That's the first time for the stream receives any message */

source/h1_decoder.c

@@ -380,11 +380,13 @@ static int s_linestate_header(struct aws_h1_decoder *decoder, struct aws_byte_cu
                 s_set_state(decoder, s_state_unchunked_body);
             } else if (
                 !decoder->is_decoding_requests && !decoder->content_length_received &&
-                !decoder->body_headers_forbidden) {
+                !decoder->body_headers_forbidden && !decoder->body_headers_ignored_on_2xx) {
                 /* RFC-7230 3.3.3: If a message is received without Transfer-Encoding and without Content-Length and NOT
                  * determined by the response lien to have no body, then the message body length is determined by
                  * reading the stream until connection closure. Note: This only applies to responses. A request without
                  * Content-Length or Transfer-Encoding has no message body (per RFC 7230 section 3.3.3). */
+                /* The failure response for CONNECT with body is undefined, and since the clinet will handle the CONNECT
+                 * request, don't read the body to keep it simple. */
                 decoder->response_body_indeterminate_length = true;
                 s_set_state(decoder, s_state_indeterminate_length_body);
                 AWS_LOGF_DEBUG(

tests/test_h1_client.c

@@ -2271,6 +2271,7 @@ H1_CLIENT_TEST_CASE(h1_client_response_get_headers) {
         &tester.testing_channel,
         "HTTP/1.1 308 Permanent Redirect\r\n"
         "Date: Fri, 01 Mar 2019 17:18:55 GMT\r\n"
+        "Content-Length: 0\r\n"
         "Location: /index.html\r\n"
         "\r\n"));
 
@@ -2722,7 +2723,8 @@ H1_CLIENT_TEST_CASE(h1_client_response_arrives_before_request_done_sending_is_ok
     aws_input_stream_release(body_stream);
 
     /* send response */
-    ASSERT_SUCCESS(testing_channel_push_read_str(&tester.testing_channel, "HTTP/1.1 200 OK\r\n\r\n"));
+    ASSERT_SUCCESS(
+        testing_channel_push_read_str(&tester.testing_channel, "HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n"));
 
     /* tick loop until body finishes sending.*/
     while (body_sender.cursor.len > 0) {
@@ -2745,7 +2747,7 @@ H1_CLIENT_TEST_CASE(h1_client_response_arrives_before_request_done_sending_is_ok
     ASSERT_TRUE(stream_tester.complete);
     ASSERT_INT_EQUALS(AWS_ERROR_SUCCESS, stream_tester.on_complete_error_code);
     ASSERT_INT_EQUALS(200, stream_tester.response_status);
-    ASSERT_UINT_EQUALS(0, aws_http_headers_count(stream_tester.response_headers));
+    ASSERT_UINT_EQUALS(1, aws_http_headers_count(stream_tester.response_headers));
     ASSERT_UINT_EQUALS(0, stream_tester.response_body.len);
 
     /* clean up */
@@ -2788,7 +2790,8 @@ H1_CLIENT_TEST_CASE(h1_client_response_arrives_before_request_chunks_done_sendin
     testing_channel_run_currently_queued_tasks(&tester.testing_channel);
 
     /* send response */
-    ASSERT_SUCCESS(testing_channel_push_read_str(&tester.testing_channel, "HTTP/1.1 200 OK\r\n\r\n"));
+    ASSERT_SUCCESS(
+        testing_channel_push_read_str(&tester.testing_channel, "HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n"));
 
     testing_channel_run_currently_queued_tasks(&tester.testing_channel);
 
@@ -2826,7 +2829,7 @@ H1_CLIENT_TEST_CASE(h1_client_response_arrives_before_request_chunks_done_sendin
     ASSERT_TRUE(stream_tester.complete);
     ASSERT_INT_EQUALS(AWS_ERROR_SUCCESS, stream_tester.on_complete_error_code);
     ASSERT_INT_EQUALS(200, stream_tester.response_status);
-    ASSERT_UINT_EQUALS(0, aws_http_headers_count(stream_tester.response_headers));
+    ASSERT_UINT_EQUALS(1, aws_http_headers_count(stream_tester.response_headers));
     ASSERT_UINT_EQUALS(0, stream_tester.response_body.len);
 
     /* clean up */
@@ -2841,7 +2844,8 @@ H1_CLIENT_TEST_CASE(h1_client_response_without_request_shuts_down_connection) {
     struct tester tester;
     ASSERT_SUCCESS(s_tester_init(&tester, allocator));
 
-    ASSERT_SUCCESS(testing_channel_push_read_str_ignore_errors(&tester.testing_channel, "HTTP/1.1 200 OK\r\n\r\n"));
+    ASSERT_SUCCESS(testing_channel_push_read_str_ignore_errors(
+        &tester.testing_channel, "HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n"));
     testing_channel_drain_queued_tasks(&tester.testing_channel);
 
     ASSERT_TRUE(testing_channel_is_shutdown_completed(&tester.testing_channel));
@@ -2874,6 +2878,7 @@ H1_CLIENT_TEST_CASE(h1_client_response_close_header_ends_connection) {
     ASSERT_SUCCESS(testing_channel_push_read_str(
         &tester.testing_channel,
         "HTTP/1.1 200 OK\r\n"
+        "Content-Length: 0\r\n"
         "Connection: close\r\n"
         "\r\n"));
 
@@ -2938,6 +2943,7 @@ H1_CLIENT_TEST_CASE(h1_client_request_close_header_ends_connection) {
     ASSERT_SUCCESS(testing_channel_push_read_str(
         &tester.testing_channel,
         "HTTP/1.1 200 OK\r\n"
+        "Content-Length: 0\r\n"
         "\r\n"));
 
     testing_channel_drain_queued_tasks(&tester.testing_channel);
@@ -2983,9 +2989,11 @@ H1_CLIENT_TEST_CASE(h1_client_response_close_header_with_pipelining) {
         &tester.testing_channel,
         /* Response 1 */
         "HTTP/1.1 200 OK\r\n"
+        "Content-Length: 0\r\n"
         "\r\n"
         /* Response 2 */
         "HTTP/1.1 200 OK\r\n"
+        "Content-Length: 0\r\n"
         "Connection: close\r\n"
         "\r\n"));
 
@@ -3069,9 +3077,11 @@ H1_CLIENT_TEST_CASE(h1_client_request_close_header_with_pipelining) {
         &tester.testing_channel,
         /* Response 1 */
         "HTTP/1.1 200 OK\r\n"
+        "Content-Length: 0\r\n"
         "\r\n"
         /* Response 2 */
         "HTTP/1.1 200 OK\r\n"
+        "Content-Length: 0\r\n"
         "\r\n"));
 
     testing_channel_drain_queued_tasks(&tester.testing_channel);
@@ -3175,9 +3185,11 @@ H1_CLIENT_TEST_CASE(h1_client_request_close_header_with_chunked_encoding_and_pip
         &tester.testing_channel,
         /* Response 1 */
         "HTTP/1.1 200 OK\r\n"
+        "Content-Length: 0\r\n"
         "\r\n"
         /* Response 2 */
         "HTTP/1.1 200 OK\r\n"
+        "Content-Length: 0\r\n"
         "\r\n"));
 
     testing_channel_drain_queued_tasks(&tester.testing_channel);
@@ -4786,6 +4798,7 @@ H1_CLIENT_TEST_CASE(h1_client_response_close_connection_before_request_finishes)
         &tester.testing_channel,
         "HTTP/1.1 404 Not Found\r\n"
         "Date: Fri, 01 Mar 2019 17:18:55 GMT\r\n"
+        "Content-Length: 0\r\n"
         "Connection: close\r\n"
         "\r\n"));