From c2903585ffc063ddc7885a9af7d2f6cd64fbc7c9 Mon Sep 17 00:00:00 2001 From: Christophe Jaillet Date: Sat, 30 Jun 2018 05:44:19 +0000 Subject: [PATCH] Propose git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834721 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/STATUS b/STATUS index eb40fc03fd..e6b26a1f35 100644 --- a/STATUS +++ b/STATUS @@ -219,6 +219,33 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 2.4.x patch: http://home.apache.org/~jailletc36/backport_1588806.patch +1: ylavic, + *) mod_ssl: Fix the error code returned in an error path of 'ssl_io_filter_handshake()' + This messes-up error handling performed in 'ssl_io_filter_error()' + trunk patch: http://svn.apache.org/r1645529 + 2.4.x patch: svn merge -c 1645529 ^/httpd/httpd/trunk . + +1: + + *) mpm_winnt: Don't forget to close the I/O completion port as part of the + cleanup in the child process. + trunk patch: http://svn.apache.org/r1801143 + 2.4.x patch: svn merge -c 1801143 ^/httpd/httpd/trunk . + +1: jailletc36 + jailletc36: untested, but looks straight forward enough to vote + + *) kotkov has made mamy improvements to the mpm_winnt about one year ago. + None of them have been merged or proposed for backport yet. + Start the merge process with the first easy steps in order to synch + 2.4.x and trunk and ease other merges + - mpm_winnt: Factor out a helper function to parse the type of an accept + filter and use an appropriate enum for it + - mpm_winnt: fix typo + - mpm_winnt: follow-up to r1801144 + trunk patch: http://svn.apache.org/r1801144 + http://svn.apache.org/r1801148 + http://svn.apache.org/r1801456 + 2.4.x patch: svn merge -c 1801144,1801148,1801456 ^/httpd/httpd/trunk . + +1: jailletc36 + PATCHES/ISSUES THAT ARE BEING WORKED [ New entries should be added at the START of the list ] -- 2.40.0