Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 7 Jun 2003 13:09:10 -0000
Message-ID: <20030607130910.37786.qmail@icarus.apache.org>
From: trawick@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/modules/mappers mod_rewrite.c

trawick     2003/06/07 06:09:10

  Modified:    .        CHANGES
               modules/mappers mod_rewrite.c
  Log:
  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).
  
  Revision  Changes    Path
  1.1198    +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1197
  retrieving revision 1.1198
  diff -u -r1.1197 -r1.1198
  --- CHANGES	6 Jun 2003 02:48:55 -0000	1.1197
  +++ CHANGES	7 Jun 2003 13:09:09 -0000	1.1198
  @@ -2,6 +2,10 @@
   
     [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
  
  
  
  1.152     +6 -0      httpd-2.0/modules/mappers/mod_rewrite.c
  
  Index: mod_rewrite.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_rewrite.c,v
  retrieving revision 1.151
  retrieving revision 1.152
  diff -u -r1.151 -r1.152
  --- mod_rewrite.c	17 May 2003 22:28:23 -0000	1.151
  +++ mod_rewrite.c	7 Jun 2003 13:09:10 -0000	1.152
  @@ -1072,6 +1072,12 @@
           }
       }
   
  +    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);
   }