]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1705539, r1877263, r1877291, r1879445 from trunk:
authorJim Jagielski <jim@apache.org>
Tue, 7 Jul 2020 16:57:22 +0000 (16:57 +0000)
committerJim Jagielski <jim@apache.org>
Tue, 7 Jul 2020 16:57:22 +0000 (16:57 +0000)
commit1d6cc695f25c60baabef99908d32d511d28ff4ac
tree5936d36bf924f9a32f78a61a02bafa379d384039
parentbf7560b60ba7712875e3685b02b5ba851751037d
Merge r1705539, r1877263, r1877291, r1879445 from trunk:

deduplicate the code handling the directory traversal for the
SSL[Proxy]CACertificatePath and SSLProxyMachineCertificatePath
directives

* modules/ssl/ssl_engine_init.c (ssl_add_version_components,
  ssl_init_Module): Use temporary pool for variable lookup results
  which don't need to live in pconf.

mod_ssl: Factor out code to read a BIO into a palloc'ed string:

* modules/ssl/ssl_util_ssl.c (modssl_bio_free_read): New function.
  (asn1_string_convert): Use it here.

* modules/ssl/ssl_engine_vars.c: Use it throughout.

* modules/ssl/ssl_scache.c (ssl_scache_init): Use <16 character
  cname argument for socache ->init() per the API constraint.

Submitted by: kbrand, jorton, jorton, jorton
Reviewed by: jailletc36, minfrin, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879598 13f79535-47bb-0310-9956-ffa450edef68
STATUS
modules/ssl/ssl_engine_init.c
modules/ssl/ssl_engine_vars.c
modules/ssl/ssl_scache.c
modules/ssl/ssl_util_ssl.c
modules/ssl/ssl_util_ssl.h