svn commit: r1425750 - in /httpd/httpd/branches/2.4.x: STATUS modules/mappers/mod_imagemap.c

[co...@apache.org]

Author: covener
Date: Tue Dec 25 15:11:23 2012
New Revision: 1425750

URL: http://svn.apache.org/viewvc?rev=1425750&view=rev
Log:
Backport 1422234, 1416889, 1422253 from trunk:

const fixes for mod_imagemap.

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


Modified:
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/modules/mappers/mod_imagemap.c

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1425750&r1=1425749&r2=1425750&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Dec 25 15:11:23 2012
@@ -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 ]

Modified: httpd/httpd/branches/2.4.x/modules/mappers/mod_imagemap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/mappers/mod_imagemap.c?rev=1425750&r1=1425749&r2=1425750&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/mappers/mod_imagemap.c (original)
+++ httpd/httpd/branches/2.4.x/modules/mappers/mod_imagemap.c Tue Dec 25 15:11:23 2012
@@ -316,7 +316,7 @@ static void read_quoted(char **string, c
 /*
  * 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, co
     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,
                                    '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,
     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
     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;