From b4bfdd84b808d2b02475032d57f33cf40c36a490 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Thu, 3 May 2012 15:03:02 +0000 Subject: [PATCH] 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 --- CHANGES | 3 ++- modules/mappers/mod_rewrite.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 87daa45b62..8161661fc2 100644 --- 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 8f5d3972ed..a7fb0666d3 100644 --- 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; -- 2.40.0