From: Eric Covener <covener@apache.org>
Date: Sat, 18 Jan 2014 19:14:14 +0000 (+0000)
Subject: followups to r1557641 suggested by nd -- add
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8750b7702640052f87d0140ae3e1bd3e368378d1;p=thirdparty%2Fapache%2Fhttpd.git

followups to r1557641 suggested by nd -- add
prefix to both the macro and the handler name
itself.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1559394 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 686900cd285..23bc0cfaa9d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mod_rewrite: Rename the handler that does per-directory internal 
+     redirects to "rewrite-redirect-handler" from "redirect-handler" so
+     it is less ambiguous and less likely to be reused. [Eric Covener]
 
   *) mod_dir: Don't search for a DirectoryIndex or DirectorySlash on a URL
      that was just rewritten by mod_rewrite. PR53929. [Eric Covener]
diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index ba4034e631f..06eb663dab2 100644
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -445,7 +445,8 @@
  * 20131112.1 (2.5.0-dev)  Add suspend_connection and resume_connection hooks
  * 20131112.2 (2.5.0-dev)  Add ap_regname
  * 20131230.0 (2.5.0-dev)  cl_head_zero & expect_strict added to server_config
- * 20131230.1 (2.5.0-dev)  REDIRECT_HANDLER_NAME in mod_rewrite.h
+ * 20131230.1 (2.5.0-dev)  REWRITE_REDIRECT_HANDLER_NAME in mod_rewrite.h
+ * 20131230.2 (2.5.0-dev)  Prefix REWRITE_REDIRECT_HANDLER_NAME in mod_rewrite.h
  */
 
 #define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */
@@ -453,7 +454,7 @@
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
 #define MODULE_MAGIC_NUMBER_MAJOR 20131230
 #endif
-#define MODULE_MAGIC_NUMBER_MINOR 1                  /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 2                  /* 0...n */
 
 /**
  * Determine if the server's current MODULE_MAGIC_NUMBER is at least a
diff --git a/modules/mappers/mod_dir.c b/modules/mappers/mod_dir.c
index e0047ecf75f..d2d9823e7c0 100644
--- a/modules/mappers/mod_dir.c
+++ b/modules/mappers/mod_dir.c
@@ -279,7 +279,7 @@ static int fixup_dir(request_rec *r)
     }
 
     /* we're running between mod_rewrites fixup and its internal redirect handler, step aside */
-    if (!strcmp(r->handler, REDIRECT_HANDLER_NAME)) { 
+    if (!strcmp(r->handler, REWRITE_REDIRECT_HANDLER_NAME)) { 
         return DECLINED;
     }
 
diff --git a/modules/mappers/mod_rewrite.h b/modules/mappers/mod_rewrite.h
index 25d2e9a23b7..133d3a458bd 100644
--- a/modules/mappers/mod_rewrite.h
+++ b/modules/mappers/mod_rewrite.h
@@ -29,7 +29,7 @@
 #include "apr_optional.h"
 #include "httpd.h"
 
-#define REDIRECT_HANDLER_NAME "redirect-handler"
+#define REWRITE_REDIRECT_HANDLER_NAME "rewrite-redirect-handler"
 
 /* rewrite map function prototype */
 typedef char *(rewrite_mapfunc_t)(request_rec *r, char *key);