rpluem at apache
Jun 11, 2009, 5:19 AM
Views: 178
Permalink
|
|
svn commit: r783734 - in /httpd/httpd/trunk: CHANGES modules/mappers/mod_rewrite.c
|
|
Author: rpluem
Date: Thu Jun 11 12:19:44 2009
New Revision: 783734
URL: http://svn.apache.org/viewvc?rev=783734&view=rev
Log:
* Remove locking for writing to the rewritelog. There seems to be no reason
why locking is required here.
See also: http://marc.info/?l=apache-httpd-dev&m=124282193217344&w=2
PR: 46942
Submitted by: Dan Poirier <poirier pobox.com>
Reviewed by: rpluem
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/modules/mappers/mod_rewrite.c
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=783734&r1=783733&r2=783734&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Thu Jun 11 12:19:44 2009
@@ -6,6 +6,9 @@
mod_proxy_ajp: Avoid delivering content from a previous request which
failed to send a request body. PR 46949 [Ruediger Pluem]
+ *) mod_rewrite: Remove locking for writing to the rewritelog.
+ PR 46942 [Dan Poirier <poirier pobox.com>]
+
*) mod_alias: check sanity in Redirect arguments.
PR 44729 [Sönke Tesch <st kino-fahrplan.de>, Jim Jagielski]
Modified: httpd/httpd/trunk/modules/mappers/mod_rewrite.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_rewrite.c?rev=783734&r1=783733&r2=783734&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_rewrite.c (original)
+++ httpd/httpd/trunk/modules/mappers/mod_rewrite.c Thu Jun 11 12:19:44 2009
@@ -385,10 +385,6 @@
static const char *lockname;
static apr_global_mutex_t *rewrite_mapr_lock_acquire = NULL;
-#ifndef REWRITELOG_DISABLED
-static apr_global_mutex_t *rewrite_log_lock = NULL;
-#endif
-
/* Optional functions imported from mod_ssl when loaded: */
static APR_OPTIONAL_FN_TYPE(ssl_var_lookup) *rewrite_ssl_lookup = NULL;
static APR_OPTIONAL_FN_TYPE(ssl_is_https) *rewrite_is_https = NULL;
@@ -489,7 +485,6 @@
const char *rhost, *rname;
apr_size_t nbytes;
int redir;
- apr_status_t rv;
request_rec *req;
va_list ap;
@@ -535,23 +530,9 @@
if (!conf->rewritelogfp || level > conf->rewriteloglevel)
return;
- rv = apr_global_mutex_lock(rewrite_log_lock);
- if (rv != APR_SUCCESS) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
- "apr_global_mutex_lock(rewrite_log_lock) failed");
- /* XXX: Maybe this should be fatal? */
- }
-
nbytes = strlen(logline);
apr_file_write(conf->rewritelogfp, logline, &nbytes);
- rv = apr_global_mutex_unlock(rewrite_log_lock);
- if (rv != APR_SUCCESS) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
- "apr_global_mutex_unlock(rewrite_log_lock) failed");
- /* XXX: Maybe this should be fatal? */
- }
-
return;
}
#endif /* !REWRITELOG_DISABLED */
@@ -4326,26 +4307,6 @@
/* check if proxy module is available */
proxy_available = (ap_find_linked_module("mod_proxy.c") != NULL);
-#ifndef REWRITELOG_DISABLED
- /* create the rewriting lockfiles in the parent */
- if ((rv = apr_global_mutex_create(&rewrite_log_lock, NULL,
- APR_LOCK_DEFAULT, p)) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
- "mod_rewrite: could not create rewrite_log_lock");
- return HTTP_INTERNAL_SERVER_ERROR;
- }
-
-#ifdef AP_NEED_SET_MUTEX_PERMS
- rv = ap_unixd_set_global_mutex_perms(rewrite_log_lock);
- if (rv != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
- "mod_rewrite: Could not set permissions on "
- "rewrite_log_lock; check User and Group directives");
- return HTTP_INTERNAL_SERVER_ERROR;
- }
-#endif /* perms */
-#endif /* rewritelog */
-
rv = rewritelock_create(s, p);
if (rv != APR_SUCCESS) {
return HTTP_INTERNAL_SERVER_ERROR;
@@ -4392,14 +4353,6 @@
}
}
-#ifndef REWRITELOG_DISABLED
- 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");
- }
-#endif
-
/* create the lookup cache */
if (!init_cache(p)) {
ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
|
svn commit: r783734 - in /httpd/httpd/trunk: CHANGES modules/mappers/mod_rewrite.c