diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 10:03:19 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 10:03:19 +0000 |
| commit | ac45e40b4d3cdc2497d5b6f5efe7d8a927beca21 (patch) | |
| tree | 96057c4c489cab1e8c112d689befe2b2b9fa34e7 /modules/tls | |
| parent | Releasing progress-linux version 2.4.57-2~progress6.99u1. (diff) | |
| download | apache2-ac45e40b4d3cdc2497d5b6f5efe7d8a927beca21.tar.xz apache2-ac45e40b4d3cdc2497d5b6f5efe7d8a927beca21.zip | |
Merging upstream version 2.4.59.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'modules/tls')
| -rw-r--r-- | modules/tls/config2.m4 | 3 | ||||
| -rw-r--r-- | modules/tls/tls_core.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/modules/tls/config2.m4 b/modules/tls/config2.m4 index af97178..8a32490 100644 --- a/modules/tls/config2.m4 +++ b/modules/tls/config2.m4 @@ -109,9 +109,10 @@ AC_DEFUN([APACHE_CHECK_RUSTLS],[ fi fi - AC_MSG_CHECKING([for rustls version >= 0.8.2]) + AC_MSG_CHECKING([for rustls version >= 0.9.2]) AC_TRY_COMPILE([#include <rustls.h>],[ rustls_version(); +rustls_acceptor_new(); ], [AC_MSG_RESULT(OK) ac_cv_rustls=yes], diff --git a/modules/tls/tls_core.c b/modules/tls/tls_core.c index 38c8873..2547939 100644 --- a/modules/tls/tls_core.c +++ b/modules/tls/tls_core.c @@ -507,8 +507,8 @@ static const rustls_certified_key *extract_client_hello_values( ap_log_cerror(APLOG_MARK, APLOG_TRACE2, 0, c, "extract client hello values"); if (!cc) goto cleanup; cc->client_hello_seen = 1; - if (hello->sni_name.len > 0) { - cc->sni_hostname = apr_pstrndup(c->pool, hello->sni_name.data, hello->sni_name.len); + if (hello->server_name.len > 0) { + cc->sni_hostname = apr_pstrndup(c->pool, hello->server_name.data, hello->server_name.len); ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, c, "sni detected: %s", cc->sni_hostname); } else { |