]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1908341, r1908628, r1908629 from trunk:
authorRuediger Pluem <rpluem@apache.org>
Fri, 31 Mar 2023 14:33:00 +0000 (14:33 +0000)
committerRuediger Pluem <rpluem@apache.org>
Fri, 31 Mar 2023 14:33:00 +0000 (14:33 +0000)
commit9b8cf1746bb004050b02a30bf0222479fbe405c2
tree2e26c51335792dff81d5cb009de7f2c83d844928
parent386a268201e9424fb3e4be62fe5ff42b441a5760
Merge r1908341, r1908628, r1908629 from trunk:

Do not double encode encoded slashes

In case that AllowEncodedSlashes is set to NoDecode do not double encode
encoded slashes in the URL sent by the reverse proxy to the backend.

* include/ap_mmn.h: Document the addition of ap_proxy_canonenc_ex to the API.

* modules/proxy/mod_proxy.h: Declare ap_proxy_canonenc_ex and define flag
      values.

* modules/proxy/proxy_util.c: Implement ap_proxy_canonenc_ex by modifying
      ap_proxy_canonenc accordingly and reimplement ap_proxy_canonenc to
      use ap_proxy_canonenc_ex with the appropriate flag.

* modules/http2/mod_proxy_http2.c, modules/proxy/mod_proxy_*.c: Set the
      correct flag based on the AllowEncodedSlashes configuration and use
      ap_proxy_canonenc_ex instead of ap_proxy_canonenc.

* Whitespace fixes. No functional change.

* Fix typo

Reviewed by: rpluem, ylavic, covener

Github: closes #351

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908864 13f79535-47bb-0310-9956-ffa450edef68
14 files changed:
CHANGES
STATUS
include/ap_mmn.h
modules/http2/mod_proxy_http2.c
modules/proxy/mod_proxy.h
modules/proxy/mod_proxy_ajp.c
modules/proxy/mod_proxy_balancer.c
modules/proxy/mod_proxy_fcgi.c
modules/proxy/mod_proxy_ftp.c
modules/proxy/mod_proxy_http.c
modules/proxy/mod_proxy_scgi.c
modules/proxy/mod_proxy_uwsgi.c
modules/proxy/mod_proxy_wstunnel.c
modules/proxy/proxy_util.c