[patch] Remove global mod_rewrite log lock

mod_rewrite_no_log_lock.patch (text/plain), 2.99 KB, created by Dan Poirier on 2009-06-11 04:36:01 UTC

(hide)

Description: Remove global mod_rewrite log lock

Filename:

MIME Type:

Creator: Dan Poirier

Created: 2009-06-11 04:36:01 UTC

Size: 2.99 KB

patch

obsolete

>Index: modules/mappers/mod_rewrite.c >=================================================================== >--- modules/mappers/mod_rewrite.c (revision 783721) >+++ modules/mappers/mod_rewrite.c (working copy) >@@ -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, View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]