Skip to content

remove the extra apr_thread_mutex_create() from 993 or 947. #1015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jfclere merged 1 commit into from
Nov 12, 2026
Merged

remove the extra apr_thread_mutex_create() from 993 or 947. #1015

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions modules/http3/h3_io.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,9 @@ static apr_status_t spawn_serviced_session(h3_io_t* io, h3q_conn* conn)
{
apr_allocator_t* allocator = NULL;
apr_pool_t* session_pool = NULL;
apr_thread_mutex_t* alloc_mutex = NULL;
h3_session* session = NULL;
conn_rec* c;
if (apr_allocator_create(&allocator) != APR_SUCCESS || apr_pool_create_ex(&session_pool, io->pool, NULL, allocator) != APR_SUCCESS)
{
ap_log_error(APLOG_MARK, APLOG_ERR, 0, io->server, "failed to create session pool for new connection");
Expand All @@ -277,16 +280,7 @@ static apr_status_t spawn_serviced_session(h3_io_t* io, h3q_conn* conn)
return APR_EGENERAL;
}
apr_allocator_owner_set(allocator, session_pool);
{
apr_thread_mutex_t* alloc_mutex;
if (apr_thread_mutex_create(&alloc_mutex, APR_THREAD_MUTEX_DEFAULT, session_pool) == APR_SUCCESS)
{
apr_allocator_mutex_set(allocator, alloc_mutex);
}
}
apr_pool_tag(session_pool, "h3_session");
/* Workers allocate from stream subpools while this thread makes its own: share the allocator safely. */
apr_thread_mutex_t* alloc_mutex = NULL;
if (apr_thread_mutex_create(&alloc_mutex, APR_THREAD_MUTEX_DEFAULT, session_pool) != APR_SUCCESS)
{
apr_pool_destroy(session_pool);
Expand All @@ -295,7 +289,6 @@ static apr_status_t spawn_serviced_session(h3_io_t* io, h3q_conn* conn)
}
apr_allocator_mutex_set(allocator, alloc_mutex);

h3_session* session = NULL;
if (h3_session_create(&session, io->server, conn, session_pool) != APR_SUCCESS)
{
h3q_conn_free(conn);
Expand All @@ -312,7 +305,7 @@ static apr_status_t spawn_serviced_session(h3_io_t* io, h3q_conn* conn)
h3_session_destroy(session);
return APR_EGENERAL;
}
conn_rec* c = h3_synth_conn(session);
c = h3_synth_conn(session);
if (!c)
{
ap_log_error(APLOG_MARK, APLOG_ERR, 0, io->server, "h3_synth_conn failed");
Expand Down
Loading