Merge r1930632, r1930633 from trunk:

mod_file_cache: Fix crashes for mmap'ed files under threaded MPM.

* modules/cache/mod_file_cache.c (mmap_handler): fix file getting
  unmapped erroneously when server is under load in multi-thread
  multi-core configuration

Follow up to r1930632 -

* modules/cache/mod_file_cache.c (mmap_handler): Remove unused
  variable.

PR: 69901
Github: closes #584
Submitted by: barr.israel <barr.israel campus.technion.ac.il>, jorton
Reviewed by: jorton, rpluem, covener


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1933635 13f79535-47bb-0310-9956-ffa450edef68

Author: notroj

changes-entries/pr69901.txt

@@ -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>
+

modules/cache/mod_file_cache.c

@@ -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);