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 31e0549191a1b5ddb6e6eec61e305ae80f09d949..90d4d2251c0aa73ff0e12d9ca18a148ad875ebae 100644 (file)
--- 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 dfacdaea8d701cdb84714ac91081f3a05ff7ebd1..92c3cd7fc05bf0138e55abd9faada9affacdb5ed 100644 (file)
--- 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);