41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From 7564d3b12438bda322e699d059577b73c312f0f4 Mon Sep 17 00:00:00 2001
|
|
From: Ruediger Pluem <rpluem@apache.org>
|
|
Date: Mon, 16 Oct 2023 11:48:06 +0000
|
|
Subject: [PATCH] Merge r1912015 from trunk:
|
|
|
|
mod_ssl: Silence info log message "SSL Library Error: error:0A000126:
|
|
SSL routines::unexpected eof while reading" when using
|
|
OpenSSL 3 by setting SSL_OP_IGNORE_UNEXPECTED_EOF if
|
|
available. [Rainer Jung]
|
|
|
|
Reviewed by: rjung, gbechis, rpluem
|
|
|
|
|
|
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913012 13f79535-47bb-0310-9956-ffa450edef68
|
|
---
|
|
modules/ssl/ssl_engine_init.c | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
|
|
index 825621de94..e5d8f68a59 100644
|
|
--- a/modules/ssl/ssl_engine_init.c
|
|
+++ b/modules/ssl/ssl_engine_init.c
|
|
@@ -833,6 +833,14 @@ static apr_status_t ssl_init_ctx_protocol(server_rec *s,
|
|
SSL_CTX_set_keylog_callback(ctx, modssl_callback_keylog);
|
|
}
|
|
#endif
|
|
+
|
|
+#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF
|
|
+ /* For server-side SSL_CTX, enable ignoring unexpected EOF */
|
|
+ /* (OpenSSL 1.1.1 behavioural compatibility).. */
|
|
+ if (!mctx->pkp) {
|
|
+ SSL_CTX_set_options(ctx, SSL_OP_IGNORE_UNEXPECTED_EOF);
|
|
+ }
|
|
+#endif
|
|
|
|
return APR_SUCCESS;
|
|
}
|
|
--
|
|
2.27.0
|
|
|