Skip to content

[2.4.x] mod_file_cache: Merge r1930632, r1930633 from trunk #584

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

Open
notroj wants to merge 2 commits into
base: 2.4.x
Choose a base branch
from
+5 −4
Open

[2.4.x] mod_file_cache: Merge r1930632, r1930633 from trunk #584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f79fb14
mod_file_cache: Fix crashes for mmap'ed files under threaded MPM.
notroj Dec 16, 2025
0d9bc58
Follow up to r1930632 -
notroj Dec 16, 2025
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 changes-entries/pr69901.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*) mod_file_cache: Fix crashes for mmap'ed files under threaded
MPMs. PR 69901. barr.israel <barr.israel campus.technion.ac.il>

6 changes: 2 additions & 4 deletions modules/cache/mod_file_cache.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,12 +272,10 @@ static int mmap_handler(request_rec *r, a_file *file)
#if APR_HAS_MMAP
conn_rec *c = r->connection;
apr_bucket *b;
apr_mmap_t *mm;
apr_bucket_brigade *bb = apr_brigade_create(r->pool, c->bucket_alloc);

apr_mmap_dup(&mm, file->mm, r->pool);
b = apr_bucket_mmap_create(mm, 0, (apr_size_t)file->finfo.size,
c->bucket_alloc);
b = apr_bucket_immortal_create((const char *)file->mm->mm,
(apr_size_t)file->finfo.size, c->bucket_alloc);
APR_BRIGADE_INSERT_TAIL(bb, b);
b = apr_bucket_eos_create(c->bucket_alloc);
APR_BRIGADE_INSERT_TAIL(bb, b);
Expand Down
Loading