Skip to content

Commit fd03531

Browse files
committed
try bump to 22?
1 parent 5ab0c96 commit fd03531

3 files changed

Lines changed: 17 additions & 19 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
BUILDER_SOURCE: releases
1111
BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net
1212
PACKAGE_NAME: aws-c-http
13-
LINUX_BASE_IMAGE: ubuntu-18-x64
13+
LINUX_BASE_IMAGE: ubuntu-22-x64
1414
RUN: ${{ github.run_id }}-${{ github.run_number }}
1515
CRT_CI_ROLE: ${{ secrets.CRT_CI_ROLE_ARN }}
1616
AWS_DEFAULT_REGION: us-east-1

source/http2_stream_manager.c

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -584,22 +584,20 @@ static struct aws_h2_sm_connection *s_sm_connection_new(
584584

585585
static void s_sm_connection_release_connection(struct aws_h2_sm_connection *sm_connection) {
586586
AWS_ASSERT(sm_connection->num_streams_assigned == 0);
587-
AWS_FATAL_ASSERT(sm_connection->connection != NULL);
588-
if (sm_connection->connection) {
589-
/* Should only be invoked from the connection thread. */
590-
AWS_ASSERT(aws_channel_thread_is_callers_thread(aws_http_connection_get_channel(sm_connection->connection)));
587+
AWS_ASSERT(sm_connection->connection != NULL);
588+
/* Should only be invoked from the connection thread. */
589+
AWS_ASSERT(aws_channel_thread_is_callers_thread(aws_http_connection_get_channel(sm_connection->connection)));
591590

592-
s_lock_synced_data(sm_connection->stream_manager);
593-
/* Remove this connection from the connection tracking list */
594-
aws_linked_list_remove(&sm_connection->node);
595-
s_unlock_synced_data(sm_connection->stream_manager);
596-
int error = aws_http_connection_manager_release_connection(
597-
sm_connection->stream_manager->connection_manager, sm_connection->connection);
598-
AWS_ASSERT(!error);
599-
(void)error;
600-
sm_connection->connection = NULL;
601-
aws_ref_count_release(&sm_connection->ref_count);
602-
}
591+
s_lock_synced_data(sm_connection->stream_manager);
592+
/* Remove this connection from the connection tracking list */
593+
aws_linked_list_remove(&sm_connection->node);
594+
s_unlock_synced_data(sm_connection->stream_manager);
595+
int error = aws_http_connection_manager_release_connection(
596+
sm_connection->stream_manager->connection_manager, sm_connection->connection);
597+
AWS_ASSERT(!error);
598+
(void)error;
599+
sm_connection->connection = NULL;
600+
aws_ref_count_release(&sm_connection->ref_count);
603601
}
604602

605603
static void s_sm_on_connection_acquired_failed_synced(

tests/test_stream_manager.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1120,12 +1120,12 @@ TEST_CASE(h2_sm_mock_goaway) {
11201120
/* Fake peer send goaway */
11211121
struct sm_fake_connection *fake_connection = s_get_fake_connection(0);
11221122
ASSERT_SUCCESS(h2_fake_peer_send_connection_preface_default_settings(&fake_connection->peer));
1123-
struct aws_byte_cursor EXTRA_LOG_info;
1124-
AWS_ZERO_STRUCT(EXTRA_LOG_info);
1123+
struct aws_byte_cursor debug_info;
1124+
AWS_ZERO_STRUCT(debug_info);
11251125
struct aws_http_stream *stream = NULL;
11261126
aws_array_list_front(&s_tester.streams, &stream);
11271127
struct aws_h2_frame *peer_frame =
1128-
aws_h2_frame_new_goaway(allocator, aws_http_stream_get_id(stream), AWS_HTTP2_ERR_NO_ERROR, EXTRA_LOG_info);
1128+
aws_h2_frame_new_goaway(allocator, aws_http_stream_get_id(stream), AWS_HTTP2_ERR_NO_ERROR, debug_info);
11291129
ASSERT_SUCCESS(h2_fake_peer_send_frame(&fake_connection->peer, peer_frame));
11301130
testing_channel_drain_queued_tasks(&fake_connection->testing_channel);
11311131

0 commit comments

Comments
 (0)