]> granicus.if.org Git - apache/commit
projects / apache / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 21efb98) | patch
Merge r1757061, r1770750 from trunk:
authorJim Jagielski <jim@apache.org>
Fri, 2 Dec 2016 11:42:55 +0000 (11:42 +0000)
committerJim Jagielski <jim@apache.org>
Fri, 2 Dec 2016 11:42:55 +0000 (11:42 +0000)
commitc0d06c9ca9d9ada706e2343a930954b7f18438aa
tree183b5c9b4d9035548b160eaece52134a0ed661fbtree | snapshot
parent21efb981a27c694d3453355632b3afbd40001cfbcommit | diff
Merge r1757061, r1770750 from trunk:

ap_reclaim_child_processes() ignores its first argument

note this in the docs, add comment

ap_reclaim_child_processes(): Implement terminate immediately

The behavior for terminate == 1 was documented but not implemented. Do
that now.

Submitted by: sf
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1772332 13f79535-47bb-0310-9956-ffa450edef68
STATUS diff | blob | history
server/mpm_unix.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.