]> granicus.if.org Git - apache/commit
Merge r1739008, r1739146, r1739151, r1739193 from trunk:
authorJim Jagielski <jim@apache.org>
Wed, 27 Apr 2016 12:24:54 +0000 (12:24 +0000)
committerJim Jagielski <jim@apache.org>
Wed, 27 Apr 2016 12:24:54 +0000 (12:24 +0000)
commit666bf9a300a101898b38d1274152b2855f981a75
treedb03a04501394c60533d4bebbc64d366b364c8cf
parentcfc300a82a65ef780753a83eb64e199cc05efd54
Merge r1739008, r1739146, r1739151, r1739193 from trunk:

scoreboard/status: Keep previous worker connection/request data when idle as
prior to 2.4.20.

scoreboard/status: follow up to r1739008.
Restore (completely) pre-2.4.20 behaviour w.r.t. preserved values.
r1739008 was still unnessessarily blanking some values for the time of
BUSY_READ -> BUSY_WRITE (with blocking MPMs).

scoreboard/status: follow up to 1739146.
Comment not needed anymore...

Clarify CHANGES entry, including the correct version for the
restored behaviour.

Submitted by: ylavic
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1741240 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
STATUS
server/scoreboard.c