merge this fix from 2.1-dev:

  *) 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]

Reviewed by:	jerenkrantz, nd

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

diff --git a/CHANGES b/CHANGES
index 16c8ea9d728ba07404fc546b4006f1e68c04bc1d..2db6efb72914eaa86b9489df6cf5d8fd90e85e7a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.48
 
+  *) 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/STATUS b/STATUS
index 6adb1bc70f715e997b804e0357e0b165eae142de..e2cc8af9c982073e7108e1c43365086b14e1915f 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/07/07 19:11:34 $]
+Last modified at [$Date: 2003/07/07 19:54:53 $]
 
 Release:
 
@@ -197,12 +197,6 @@ PATCHES TO PORT FROM 2.1
         build/.cvsignore 1.4
         +1: trawick, jerenkrantz
 
-    * 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).
-        modules/mappers/mod_rewrite.c 1.152
-        +1: trawick, jerenkrantz, nd
-
     * Unix: Handle permissions settings for flock-based mutexes in 
       unixd_set_global|proc_mutex_perms().  Allow the functions to
       be called for any type of mutex.  PR 20312

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index 28e414096c4ecc1bc44d0fd5cc7fbabe72ef8177..ae0090e967f2bf58029b87384c2c944c2357b21a 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);
 }