Merge branch 'main' into user/ashdhin/IssueTemplateRegressionCheckbox

awslabs · Oct 25, 2024 · 51e11c9 · 51e11c9
2 parents de275ed + 74b3a0d
commit 51e11c9
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,10 +1,6 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.9)
 project(aws-c-http C)
 
-if (POLICY CMP0069)
-    cmake_policy(SET CMP0069 NEW) # Enable LTO/IPO if available in the compiler, see AwsCFlags
-endif()
-
 option(ENABLE_PROXY_INTEGRATION_TESTS "Whether to run the proxy integration tests that rely on pre-configured proxy" OFF)
 option(ENABLE_LOCALHOST_INTEGRATION_TESTS "Whether to run the integration tests that rely on pre-configured localhost" OFF)
 

diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ This library is licensed under the Apache 2.0 License.
 
 ### Building
 
-CMake 3.1+ is required to build.
+CMake 3.9+ is required to build.
 
 `<install-path>` must be an absolute path in the following instructions.
 

diff --git a/integration-testing/http_client_test.py b/integration-testing/http_client_test.py
@@ -7,7 +7,7 @@
 import unittest
 import os.path
 
-TIMEOUT = 100
+TIMEOUT = 300
 
 # Accepting multiple args so we can pass something like: python elasticurl.py
 elasticurl_cmd_prefix = sys.argv[1:]

diff --git a/source/h1_connection.c b/source/h1_connection.c
@@ -831,8 +831,8 @@ static void s_http_stream_response_first_byte_timeout_task(
                                                   : stream->base.client_data->response_first_byte_timeout_ms;
     AWS_LOGF_INFO(
         AWS_LS_HTTP_CONNECTION,
-        "id=%p: Closing connection as timeout after request sent to the first byte received happened. "
-        "response_first_byte_timeout_ms is %" PRIu64 ".",
+        "id=%p: Closing connection. Timed out waiting for first byte of HTTP response, after sending the full request."
+        " response_first_byte_timeout_ms=%" PRIu64,
         (void *)connection_base,
         response_first_byte_timeout_ms);
 

diff --git a/source/http.c b/source/http.c
@@ -150,7 +150,7 @@ static struct aws_error_info s_errors[] = {
         "Manual write failed because manual writes are already completed."),
     AWS_DEFINE_ERROR_INFO_HTTP(
         AWS_ERROR_HTTP_RESPONSE_FIRST_BYTE_TIMEOUT,
-        "The server does not begin responding within the configuration after a request is fully sent."),
+        "Timed out waiting for first byte of HTTP response, after sending the full request."),
     AWS_DEFINE_ERROR_INFO_HTTP(
         AWS_ERROR_HTTP_CONNECTION_MANAGER_ACQUISITION_TIMEOUT,
         "Connection Manager failed to acquire a connection within the defined timeout."),