Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge r1838684, r1920570, r1920571, r1920572 from trunk #484

Open
wants to merge 5 commits into
base: 2.4.x
Choose a base branch
from
Open

Merge r1838684, r1920570, r1920571, r1920572 from trunk #484

wants to merge 5 commits into from

Commits on Sep 27, 2024

  1. When a rewrite to proxy is configured in the server config, a check i… 

    …s made to make sure mod_proxy is active. But the same is not done if a rewrite to proxy is configured in an .htaccess file.

Basically this patch is the block of code from hook_uri2file that does the proxy check, copied to hook_fixup.

Patch provided by Michael Streeter [mstreeter1 gmail.com], slightly modified to use a new APLOGNO
PR 56264

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1838684 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit d8ba152)
    @rpluem
    Christophe Jaillet authored and rpluem committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    fa9aabd View commit details
    Browse the repository at this point in the history

  2. mod_rewrite, mod_proxy: mod_proxy to cononicalize rewritten [P] URLs.… 

    … PR 69235.

When mod_rewrite sets a "proxy:" URL with [P], it should be canonicalized by
mod_proxy still, notably to handle any "unix:" local socket part.

To avoid double encoding in perdir context, a follow up commit should remove the
ap_escape_uri() done in mod_rewrite since it's now on mod_proxy to canonicalize,
per PR 69260.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1920570 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit c9dc4bb)
    @ylavic @rpluem
    ylavic authored and rpluem committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    2348d39 View commit details
    Browse the repository at this point in the history

  3. * Leave the proper escaping of the URL and the adding of r->args to the 

      proxy module which runs after us after r1920570.
  Just take care to add r->args in case the proxy rule has the
  [NE] flag set and tell the proxy module to not escape in this case.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1920571 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 4348e8c)
    @rpluem
    rpluem committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    904afc8 View commit details
    Browse the repository at this point in the history

  4. * Mention the additional bug 

    git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1920572 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 197ed77)
    @rpluem
    rpluem committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    4b31636 View commit details
    Browse the repository at this point in the history

  5. Add changes entry for PR 56264

    @rpluem
    rpluem committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    3b06b62 View commit details
    Browse the repository at this point in the history