mod_rewrite: Perform child initialization on the rewrite log lock.

This fixes a log corruption issue when flock-based serialization
is used (e.g., FreeBSD).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100187 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 14ec0bbbb3bc8818d4a957ef54b5342fd317f5a0..d3c4f8d82886448fa3602e6db36822b1a1d8f3d7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) mod_rewrite: Perform child initialization on the rewrite log lock.
+     This fixes a log corruption issue when flock-based serialization
+     is used (e.g., FreeBSD).  [Jeff Trawick]
+
   *) Don't respect the Server header field as set by modules and CGIs.
      As with 1.3, for proxy requests any such field is from the origin 
      server; otherwise it will have our server info as controlled by

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index 0e63f5597061fa06326f2979c03da76e58fc63af..4ef13a27108e37f12e50f2c200d260555ed035af 100644 (file)
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -1072,6 +1072,12 @@ static void init_child(apr_pool_t *p, server_rec *s)
         }
     }
 
+    rv = apr_global_mutex_child_init(&rewrite_log_lock, NULL, p);
+    if (rv != APR_SUCCESS) {
+        ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
+                     "mod_rewrite: could not init rewrite log lock in child");
+    }
+    
     /* create the lookup cache */
     cachep = init_cache(p);
 }