Commit 9e12957d authored by Sander Striker's avatar Sander Striker
Browse files

More hardcoded schemes in mod_rewrite... :/ 

Cooked up in a debugging session with Justin Erenkrantz.

* modules/mappers/mod_rewrite.c

  (splitout_queryargs): Don't mess with the query args when dealing
    with ajp or balancer.

  (hook_uri2file): Account for r->filename being NULL.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@126171 13f79535-47bb-0310-9956-ffa450edef68
parent a47bd5b2

modules/mappers/mod_rewrite.c

+3 −1
Changes for modules/mappers/mod_rewrite.c: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -705,6 +705,8 @@ static void splitout_queryargs(request_rec *r, int qsappend) 
     * See RFC 1738 and RFC 2368.

     */

    if (is_absolute_uri(r->filename)

        && strncasecmp(r->filename, "ajp", 3)

        && strncasecmp(r->filename, "balancer", 8)

        && strncasecmp(r->filename, "http", 4)

        && strncasecmp(r->filename, "mailto", 6)) {

        r->args = NULL; /* forget the query that's still flying around */
@@ -4241,7 +4243,7 @@ static int hook_uri2file(request_rec *r) 
            return n;

        }



        flen = strlen(r->filename);

        flen = r->filename ? strlen(r->filename) : 0;

        if (flen > 6 && strncmp(r->filename, "proxy:", 6) == 0) {

            /* it should be go on as an internal proxy request */