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 3e46c0ae6a8cec875055c6df700d1235bf166b0a..4a2aa4ac56fd3a9aaa39766ec78f81b7c8e37745 100644 (file)
--- 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 5510333e4b71585d2d237ed256d28431571a9c9a..ccd1ba47f9bca3b2d9e430bb7a7c4bd1823eb67d 100644 (file)
--- 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 ]