Commit d4e60545 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1724656 from trunk: 

  *) mod_rewrite: Avoid looping on relative substitutions that
     result in the same filename we started with. PR 58854.
     [Eric Covener]


Previously, the comparison of old and new filename happened before
some prefixes might be added.


Submitted by: covener
Reviewed/backported by: jim


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

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@ 


Changes with Apache 2.4.19



  *) mod_rewrite: Avoid looping on relative substitutions that

     result in the same filename we started with. PR 58854.

     [Eric Covener]



  *) mime.types: add common extension "m4a" for MPEG 4 Audio.

     PR 57895 [Dylan Millikin <dylan.millikin gmail.com>]

modules/mappers/mod_rewrite.c

+14 −13
Original line number Diff line number Diff line
@@ -5010,19 +5010,6 @@ static int hook_fixup(request_rec *r) 
                return HTTP_BAD_REQUEST;

            }



            /* Check for deadlooping:

             * At this point we KNOW that at least one rewriting

             * rule was applied, but when the resulting URL is

             * the same as the initial URL, we are not allowed to

             * use the following internal redirection stuff because

             * this would lead to a deadloop.

             */

            if (ofilename != NULL && strcmp(r->filename, ofilename) == 0) {

                rewritelog((r, 1, dconf->directory, "initial URL equal rewritten"

                            " URL: %s [IGNORING REWRITE]", r->filename));

                return OK;

            }



            tmpfilename = r->filename;



            /* if there is a valid base-URL then substitute
@@ -5083,6 +5070,20 @@ static int hook_fixup(request_rec *r) 
                }

            }



            /* Check for deadlooping:

             * At this point we KNOW that at least one rewriting

             * rule was applied, but when the resulting URL is

             * the same as the initial URL, we are not allowed to

             * use the following internal redirection stuff because

             * this would lead to a deadloop.

             */

            if (ofilename != NULL && strcmp(r->filename, ofilename) == 0) {

                rewritelog((r, 1, dconf->directory, "initial URL equal rewritten"

                            " URL: %s [IGNORING REWRITE]", r->filename));

                return OK;

            }





            /* now initiate the internal redirect */

            rewritelog((r, 1, dconf->directory, "internal redirect with %s "

                        "[INTERNAL REDIRECT]", r->filename));