rpms
/
httpd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

mod_ssl: Silence info log message SSL Library Error: error:0A000126:

This commit is contained in:
Andrew Lukoshko 2024-01-04 15:19:51 +00:00
parent 361cfe7159
commit e10817eef3
2 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
SOURCES/httpd-2.4.58-r1912015.patch Normal file
View File

@ -0,0 +1,40 @@
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

10
SPECS/httpd.spec
View File

@ -122,6 +122,10 @@ Patch71: httpd-2.4.57-davenoent.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=...
# Patch200: ...
# AlmaLinux fixes
# https://github.com/apache/httpd/commit/7564d3b12438bda322e699d059577b73c312f0f4
Patch300: httpd-2.4.58-r1912015.patch
License: ASL 2.0
BuildRequires: gcc, autoconf, pkgconfig, findutils, xmlto
BuildRequires: perl-interpreter, perl-generators, systemd-devel
@ -291,6 +295,8 @@ written in the Lua programming language.
%patch71 -p1 -b .davenoent
%patch300 -p1 -b .r1912015
# Patch in the vendor string
sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h
sed -i 's/@RELEASE@/%{release}/' server/core.c
@ -850,8 +856,8 @@ exit $rv
%{_rpmconfigdir}/macros.d/macros.httpd
%changelog
* Tue Aug 01 2023 Eduard Abdullin <eabdullin@almalinux.org> - 2.4.57-5.alma.1
- Debrand for AlmaLinux
* Thu Jan 04 2023 Andrew Lukoshko <alukoshko@almalinux.org> - 2.4.57-5.alma.1
- Resolves: mod_ssl: Silence info log message SSL Library Error: error:0A000126:
* Thu Jul 20 2023 Tomas Korbar <tkorbar@redhat.com> - 2.4.57-5
- Fix issue found by covscan