Skip to content

Remove streams own memory allocator again #315

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
icing merged 1 commit into from
Feb 20, 2026
Merged

Remove streams own memory allocator again #315

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
* Remove streams own memory allocator after reports of memory problems
with third party modules. Refs #313.

v2.0.38
--------------------------------------------------------------------------------
* Source sync with httpd trunk version. No functional change.
Expand Down
18 changes: 1 addition & 17 deletions mod_http2/h2_session.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,29 +111,13 @@ static void cleanup_unprocessed_streams(h2_session *session)
h2_mplx_c1_streams_do(session->mplx, rst_unprocessed_stream, session);
}

/* APR callback invoked if allocation fails. */
static int abort_on_oom(int retcode)
{
ap_abort_on_oom();
return retcode; /* unreachable, hopefully. */
}

static h2_stream *h2_session_open_stream(h2_session *session, int stream_id,
int initiated_on)
{
h2_stream * stream;
apr_allocator_t *allocator;
apr_pool_t *stream_pool;
apr_status_t rv;

rv = apr_allocator_create(&allocator);
if (rv != APR_SUCCESS)
return NULL;

apr_allocator_max_free_set(allocator, ap_max_mem_free);
apr_pool_create_ex(&stream_pool, session->pool, NULL, allocator);
apr_allocator_owner_set(allocator, stream_pool);
apr_pool_abort_set(abort_on_oom, stream_pool);
apr_pool_create(&stream_pool, session->pool);
apr_pool_tag(stream_pool, "h2_stream");

stream = h2_stream_create(stream_id, stream_pool, session,
Expand Down