]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r551843, r551889 from trunk:
authorJoe Orton <jorton@apache.org>
Tue, 17 Jul 2007 14:48:25 +0000 (14:48 +0000)
committerJoe Orton <jorton@apache.org>
Tue, 17 Jul 2007 14:48:25 +0000 (14:48 +0000)
commite56a5ff187317a055d38b63f5f76706f8907e18e
treec2d289bc050df95d5a2288ff710b0fc7246f5dea
parent97c93c17252c62e736b6848b042f09c02d431ef0
Merge r551843, r551889 from trunk:

Add alternative fixes for CVE-2007-3304:

* configure.in: Check for getpgid.

* include/mpm_common.h (ap_mpm_safe_kill): New prototype.

* server/mpm_common.c (reclaim_one_pid): Ensure pid validity before
calling apr_proc_wait().
(ap_mpm_safe_kill): New function.

* server/mpm/prefork/prefork.c, server/mpm/worker/worker.c,
server/mpm/experimental/event/event.c: Use ap_mpm_safe_kill() on pids
from the scoreboard, throughout.

* include/ap_mmn.h: Minor bump.

* server/mpm_common.c: getpgid() returns a pid_t

Submitted by: jorton, jim
Reviewed by: jorton, jim, rpluem

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@556936 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
configure.in
include/ap_mmn.h
include/mpm_common.h
server/mpm/experimental/event/event.c
server/mpm/prefork/prefork.c
server/mpm/worker/worker.c
server/mpm_common.c