Commit 6f61202d authored by Jeff Trawick's avatar Jeff Trawick
Browse files

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
parent eaa3e62c

STATUS

+0 −4
Changes for STATUS: 0 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -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:

modules/mappers/mod_rewrite.c

+1 −1
Changes for modules/mappers/mod_rewrite.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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);