From: Ruediger Pluem <rpluem@apache.org>
Date: Mon, 16 Oct 2023 11:45:19 +0000 (+0000)
Subject: Merge r1912015 from trunk:
X-Git-Tag: 2.4.58-rc2-candidate~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb64cfe22f5f80f73db617db2d966bd055340e24;p=thirdparty%2Fapache%2Fhttpd.git

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@1913010 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 3e46c0ae6a8..4a2aa4ac56f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,11 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.58
 
+  *) 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]
+
   *) mod_http2: improved early cleanup of streams.
      [Stefan Eissing]
 
diff --git a/STATUS b/STATUS
index 5510333e4b7..ccd1ba47f9b 100644
--- a/STATUS
+++ b/STATUS
@@ -152,15 +152,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) 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]
-     Trunk version of patch:
-        https://svn.apache.org/r1912015
-     Backport version for 2.4.x of patch:
-        svn merge -c 1912015 ^/httpd/httpd/trunk .
-     +1: rjung, gbechis, rpluem
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]