]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
projects / thirdparty / apache / httpd.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 24f2c9e) | patch
Merge r1740910, r1741277, r1820809 from trunk:
authorYann Ylavic <ylavic@apache.org>
Sat, 13 Jan 2018 15:31:05 +0000 (15:31 +0000)
committerYann Ylavic <ylavic@apache.org>
Sat, 13 Jan 2018 15:31:05 +0000 (15:31 +0000)
commit0514fb4a44a892ae0f4899eeadd709e287a8fc37
treeab8667e89f104248af7854baa2e876bab75c52c7tree
parent24f2c9ef937ac007feaf5891b8c9fffe26643286commit | diff
Merge r1740910, r1741277, r1820809 from trunk:

event: update worker score keepalive status.

Correct regressions introduced in r1137358 and r1740910.

The conn_rec context may be passed only when setting up the
initial connection, otherwise the request info is trashed.

Follow up to r1740910: CHANGES entry.

Submitted by: ylavic, wrowe, ylavic
Reviewed by: ylavic, icing, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1821068 13f79535-47bb-0310-9956-ffa450edef68
CHANGES diff | blob | blame | history
server/mpm/event/event.c diff | blob | blame | history
Mirror of https://github.com/apache/httpd.git