[patch] Proposed patch for trunk

mod_rewrite.diff (text/plain), 2.07 KB, created by Hank Ibell on 2018-05-07 16:47:16 UTC

(hide)

Description: Proposed patch for trunk

Filename:

MIME Type:

Creator: Hank Ibell

Created: 2018-05-07 16:47:16 UTC

Size: 2.07 KB

patch

obsolete

>Index: modules/mappers/mod_rewrite.c >=================================================================== >--- modules/mappers/mod_rewrite.c (revision 1831104) >+++ modules/mappers/mod_rewrite.c (working copy) >@@ -422,6 +422,7 @@ > static int proxy_available; > > /* Locks/Mutexes */ >+static int rewrite_lock_needed = 0; > static apr_global_mutex_t *rewrite_mapr_lock_acquire = NULL; > static const char *rewritemap_mutex_type = "rewrite-map"; > >@@ -2691,9 +2692,6 @@ > apr_status_t rc; > > /* create the lockfile */ >- /* XXX See if there are any rewrite map programs before creating >- * the mutex. >- */ > rc = ap_global_mutex_create(&rewrite_mapr_lock_acquire, NULL, > rewritemap_mutex_type, NULL, s, p, 0); > if (rc != APR_SUCCESS) { >@@ -3180,6 +3178,8 @@ > > newmap->type = MAPTYPE_PRG; > newmap->checkfile = newmap->argv[0]; >+ rewrite_lock_needed = 1; >+ > if (a3) { > char *tok_cntx; > newmap->user = apr_strtok(apr_pstrdup(cmd->pool, a3), ":", &tok_cntx); >@@ -4502,6 +4502,7 @@ > { > APR_OPTIONAL_FN_TYPE(ap_register_rewrite_mapfunc) *map_pfn_register; > >+ rewrite_lock_needed = 0; > ap_mutex_register(pconf, rewritemap_mutex_type, NULL, APR_LOCK_DEFAULT, 0); > > /* register int: rewritemap handlers */ >@@ -4527,14 +4528,16 @@ > /* check if proxy module is available */ > proxy_available = (ap_find_linked_module("mod_proxy.c") != NULL); > >- rv = rewritelock_create(s, p); >- if (rv != APR_SUCCESS) { >- return HTTP_INTERNAL_SERVER_ERROR; >+ if (rewrite_lock_needed) { >+ rv = rewritelock_create(s, p); >+ if (rv != APR_SUCCESS) { >+ return HTTP_INTERNAL_SERVER_ERROR; >+ } >+ >+ apr_pool_cleanup_register(p, (void *)s, rewritelock_remove, >+ apr_pool_cleanup_null); > } > >- apr_pool_cleanup_register(p, (void *)s, rewritelock_remove, >- apr_pool_cleanup_null); >- > /* if we are not doing the initial config, step through the servers and > * open the RewriteMap prg:xxx programs, > */ 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]