From: Jeff Trawick <trawick@apache.org>
Date: Mon, 25 May 2015 14:33:08 +0000 (+0000)
Subject: Merge r1679712 from trunk:
X-Git-Tag: 2.4.13~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec8ef31b8038ba7fb968e897d8f00fc262bf2c0a;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1679712 from trunk:

Follow up to r1679181: fix warning (return discards qualifiers from pointer target type).

Submitted by: ylavic
Reviewed by: trawick, rjung


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

diff --git a/STATUS b/STATUS
index 31e0549191a..90d4d2251c0 100644
--- a/STATUS
+++ b/STATUS
@@ -105,10 +105,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) fix new warnings in mod_rewrite once r1679181 was merged:
-     trunk patch: http://svn.apache.org/r1679712
-     2.4.x patch: trunk patch works
-     +1: trawick, ylavic, rjung
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index dfacdaea8d7..92c3cd7fc05 100644
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -1335,7 +1335,7 @@ static char *lookup_map_dbd(request_rec *r, char *key, const char *label)
     const char *errmsg;
     apr_dbd_results_t *res = NULL;
     apr_dbd_row_t *row = NULL;
-    const char *ret = NULL;
+    char *ret = NULL;
     int n = 0;
     ap_dbd_t *db = dbd_acquire(r);