Commit 2cc32db3 authored by Yann Ylavic's avatar Yann Ylavic
Browse files

Merge r1734294 from trunk: 

followup to r1734125: null check for r->args
before cleaning up some QSA cases.

Submitted by: covener
Reviewed by: covener, rpluem, ylavic
Backported by: ylavic


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

STATUS

+0 −4
Original line number Diff line number Diff line
@@ -112,10 +112,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  *) mod_rewrite: bug in recently backported r1734125.

     trunk patch: http://svn.apache.org/r1734294.

     2.4.x patch: trunk works

     +1 covener, rpluem, ylavic



PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

modules/mappers/mod_rewrite.c

+9 −6
Original line number Diff line number Diff line
@@ -762,13 +762,16 @@ static void splitout_queryargs(request_rec *r, int qsappend, int qsdiscard, 
            r->args = apr_pstrdup(r->pool, q);

        }



        if (r->args) { 

           len = strlen(r->args);

      

           if (!len) {

               r->args = NULL;

           }

           else if (r->args[len-1] == '&') {

               r->args[len-1] = '\0';

           }

        }



        rewritelog((r, 3, NULL, "split uri=%s -> uri=%s, args=%s", olduri,

                    r->filename, r->args ? r->args : "<none>"));