From 18419a473b8e1a21118a8974df681c1e5e78a740 Mon Sep 17 00:00:00 2001 From: Rainer Jung Date: Sun, 8 May 2016 14:36:29 +0000 Subject: [PATCH] Enhance proposal. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1742828 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/STATUS b/STATUS index a96eabc1c3..54c0b0404f 100644 --- a/STATUS +++ b/STATUS @@ -184,14 +184,15 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: * Don't globber scoreboard request info if read_request_line() fails with a timeout. In that case there's not yet any new useful request info available. - Noticed via server-status showing request "NULL" after keep-alive - connections timed out. + Noticed via server-status for prefork showing request "NULL" after + keep-alive connections timed out. No CHANGES entry needed, because there's already one for PR 59333. - Sorry for the two patches. The second is better. Both change the same - line, so technically only the second is needed, but merging both keeps - mergeinfo more complete. + Sorry for the three patches. The first one is overwritten by the second + one, so technically only the second and third are needed, but merging all + keeps the mergeinfo more complete. trunk patch: http://svn.apache.org/r1742791 http://svn.apache.org/r1742792 + http://svn.apache.org/r1742822 2.4.x patch: trunk works +1: rjung -- 2.40.0