Fix upstream patch
This commit is contained in:
parent
e10817eef3
commit
05fa5a2a0d
@ -1,6 +1,6 @@
|
||||
From 7564d3b12438bda322e699d059577b73c312f0f4 Mon Sep 17 00:00:00 2001
|
||||
From cf0c926f81418c5f8c9c2ea3dc9b61802ccabc1e Mon Sep 17 00:00:00 2001
|
||||
From: Ruediger Pluem <rpluem@apache.org>
|
||||
Date: Mon, 16 Oct 2023 11:48:06 +0000
|
||||
Date: Thu, 4 Jan 2024 15:40:36 +0000
|
||||
Subject: [PATCH] Merge r1912015 from trunk:
|
||||
|
||||
mod_ssl: Silence info log message "SSL Library Error: error:0A000126:
|
||||
@ -12,16 +12,13 @@ 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
|
||||
index 689d33e..f34dc8c 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);
|
||||
@@ -876,6 +876,14 @@ static apr_status_t ssl_init_ctx_protocol(server_rec *s,
|
||||
SSL_CTX_set_options(ctx, SSL_OP_NO_RENEGOTIATION);
|
||||
}
|
||||
#endif
|
||||
+
|
||||
|
Loading…
Reference in New Issue
Block a user