]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1895914, r1895921 from trunk:
authorYann Ylavic <ylavic@apache.org>
Tue, 14 Dec 2021 15:35:56 +0000 (15:35 +0000)
committerYann Ylavic <ylavic@apache.org>
Tue, 14 Dec 2021 15:35:56 +0000 (15:35 +0000)
commita962ba73047b5478d702c8ad09fd1a167e1d3736
tree22c24e832b0c94b528cec9835c0a7d604057e5d5
parent40e1770b161192f9f64815e2294eef8db4a325ee
Merge r1895914, r1895921 from trunk:

  *) http: Enforce that fully qualified uri-paths not to be forward-proxied
     have an http(s) scheme, and that the ones to be forward proxied have a
     hostname, per HTTP specifications.
     trunk patch: http://svn.apache.org/r1895914
                  http://svn.apache.org/r1895921
     2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/286.patch
     backport PR: https://github.com/apache/httpd/pull/286
     +1: ylavic, minfrin, gbechis

mod_proxy: Detect unix: scheme syntax errors at load time.

* modules/proxy/mod_proxy.c(add_pass, add_member, set_proxy_param,
                            proxysection):
  Check return value of ap_proxy_de_socketfy().

* modules/proxy/proxy_util.c(ap_proxy_get_worker_ex):
  Check return value of ap_proxy_de_socketfy().

http: Enforce that fully qualified uri-paths not to be forward-proxied
      have an http(s) scheme, and that the ones to be forward proxied have a
      hostname, per HTTP specifications.

The early checks avoid failing the request later on and thus save cycles
for those invalid cases.

Submitted by: ylavic
Reviewed by: ylavic, minfrin, gbechis
Closes #286

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1895955 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
include/ap_mmn.h
include/http_protocol.h
modules/http/http_request.c
modules/http2/h2_request.c
modules/proxy/mod_proxy.c
modules/proxy/proxy_util.c
server/protocol.c