]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1855646, r1855748 from trunk:
authorJoe Orton <jorton@apache.org>
Wed, 20 Mar 2019 15:50:44 +0000 (15:50 +0000)
committerJoe Orton <jorton@apache.org>
Wed, 20 Mar 2019 15:50:44 +0000 (15:50 +0000)
commit65ed9cde1c1cea6e943524d0f19b148d4378284c
tree7587c7d7d64219bcaedb1a4abb25427577fdc3c4
parent3bbbaeba6929b54d8c29eda4d231fd4ed1cba860
Merge r1855646, r1855748 from trunk:

mod_proxy/ssl: cleanup per-request SSL configuration for recycled proxy conns.

The SSL dir config of proxy/backend connections is stored in r->per_dir_config
but those connections have a lifetime independent of the requests they handle.

So we need to allow the external ssl_engine_set() function to reset mod_ssl's
dir config in between proxy requests, or the first sslconn->dc could be used
after free for the next requests.

mod_proxy can then reset/reinit the request config when recycling its backend
connections.

* Solve a chicken and egg problem here:
  We need to have sslconn->dc set correctly when we want to
  init sslconn, but we need to allocate memory for it first.

PR 63256.
Submitted by: ylavic, rpluem
Reviewed by: ylavic, jorton, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1855918 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
modules/proxy/proxy_util.c
modules/ssl/mod_ssl.c