Backport 1422234, 1416889, 1422253 from trunk:

const fixes for mod_imagemap.

Contributed By: covener, fuankg
Reviewed By: covener, fuankg, gsmith

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

diff --git a/STATUS b/STATUS
index 0d81cdf0067614594d92fea14f20538221f187cf..6d8a939a34f3cca57953552b0b5971c2d8d66269 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -91,13 +91,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * mod_imagemap: const fixes (didn't compile on old XLC)
-     trunk patch: http://svn.apache.org/viewvc?rev=1422234&view=rev
-                  http://svn.apache.org/viewvc?rev=1416889&view=rev
-                  http://svn.apache.org/viewvc?rev=1422253&view=rev
-     2.4.x patch: http://people.apache.org/~covener/patches/httpd-2.4.x-mod_imap-const.diff
-     +1 covener, fuankg, gsmith
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

diff --git a/modules/mappers/mod_imagemap.c b/modules/mappers/mod_imagemap.c
index 8057e29608bd6a1d58041757610cf90e6bfea97b..1857760b37ea3f08b9ca09e33de41b0ea1d48b00 100644 (file)
--- a/modules/mappers/mod_imagemap.c
+++ b/modules/mappers/mod_imagemap.c
@@ -316,7 +316,7 @@ static void read_quoted(char **string, char **quoted_part)
 /*
  * returns the mapped URL or NULL.
  */
-static char *imap_url(request_rec *r, const char *base, const char *value)
+static const char *imap_url(request_rec *r, const char *base, const char *value)
 {
 /* translates a value into a URL. */
     int slen, clen;
@@ -455,7 +455,7 @@ static char *imap_url(request_rec *r, const char *base, const char *value)
     return my_base;
 }
 
-static int imap_reply(request_rec *r, char *redirect)
+static int imap_reply(request_rec *r, const char *redirect)
 {
     if (!strcasecmp(redirect, "error")) {
         /* they actually requested an error! */
@@ -519,7 +519,7 @@ static void menu_comment(request_rec *r, char *menu, char *comment)
                                    'formatted' form */
 }
 
-static void menu_default(request_rec *r, char *menu, char *href, char *text)
+static void menu_default(request_rec *r, const char *menu, const char *href, const char *text)
 {
     char *ehref, *etext;
     if (!strcasecmp(href, "error") || !strcasecmp(href, "nocontent")) {
@@ -544,7 +544,7 @@ static void menu_default(request_rec *r, char *menu, char *href, char *text)
     return;
 }
 
-static void menu_directive(request_rec *r, char *menu, char *href, char *text)
+static void menu_directive(request_rec *r, const char *menu, const char *href, const char *text)
 {
     char *ehref, *etext;
     if (!strcasecmp(href, "error") || !strcasecmp(href, "nocontent")) {
@@ -580,9 +580,9 @@ static int imap_handler_internal(request_rec *r)
     char *directive;
     char *value;
     char *href_text;
-    char *base;
-    char *redirect;
-    char *mapdflt;
+    const char *base;
+    const char *redirect;
+    const char *mapdflt;
     char *closest = NULL;
     double closest_yet = -1;
     apr_status_t status;