Merge r1309585 from trunk:

static scope for rewritemap_mutex_type.

Submitted by: nd
Reviewed by: sf, jorton, trawick

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1333493 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 87daa45b62f35af82d0dad5c3fadee96ef756bd3..8161661fc2fd5c696b241f1cb8e790385b89cbdf 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,8 @@ Changes with Apache 2.4.3
      standard modules, update for new format of server-status output.
      PR 45424. [Richard Bowen, Dave Brondsema, and others]
 
-  *) mod_sed, mod_log_debug: Symbol namespace cleanups. [Joe Orton]
+  *) mod_sed, mod_log_debug, mod_rewrite: Symbol namespace cleanups. 
+     [Joe Orton, André Malo]
 
   *) core: Prevent "httpd -k restart" from killing server in presence of
      config error. [Joe Orton]

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index 8f5d3972ed19aa6d8107c34f03c1224c29dfef71..a7fb0666d3b1db313f20eec7978e77d128ea5d53 100644 (file)
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -401,7 +401,7 @@ static int proxy_available;
 
 /* Locks/Mutexes */
 static apr_global_mutex_t *rewrite_mapr_lock_acquire = NULL;
-const char *rewritemap_mutex_type = "rewrite-map";
+static const char *rewritemap_mutex_type = "rewrite-map";
 
 /* Optional functions imported from mod_ssl when loaded: */
 static APR_OPTIONAL_FN_TYPE(ssl_var_lookup) *rewrite_ssl_lookup = NULL;