You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2003/07/07 21:54:56 UTC
cvs commit: httpd-2.0/modules/mappers mod_rewrite.c
trawick 2003/07/07 12:54:56
Modified: . Tag: APACHE_2_0_BRANCH CHANGES STATUS
modules/mappers Tag: APACHE_2_0_BRANCH mod_rewrite.c
Log:
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
Revision Changes Path
No revision
No revision
1.988.2.123 +4 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.988.2.122
retrieving revision 1.988.2.123
diff -u -r1.988.2.122 -r1.988.2.123
--- CHANGES 7 Jul 2003 19:11:33 -0000 1.988.2.122
+++ CHANGES 7 Jul 2003 19:54:52 -0000 1.988.2.123
@@ -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
1.751.2.355 +1 -7 httpd-2.0/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/httpd-2.0/STATUS,v
retrieving revision 1.751.2.354
retrieving revision 1.751.2.355
diff -u -r1.751.2.354 -r1.751.2.355
--- STATUS 7 Jul 2003 19:11:34 -0000 1.751.2.354
+++ STATUS 7 Jul 2003 19:54:53 -0000 1.751.2.355
@@ -197,12 +197,6 @@
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
No revision
No revision
1.135.2.13 +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.135.2.12
retrieving revision 1.135.2.13
diff -u -r1.135.2.12 -r1.135.2.13
--- mod_rewrite.c 19 May 2003 02:25:19 -0000 1.135.2.12
+++ mod_rewrite.c 7 Jul 2003 19:54:54 -0000 1.135.2.13
@@ -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);
}