delta/apache/httpd.git/include/mpm_common.h, branch httpd-2.2-proxy

Merge r551843, r551889 from trunk:

2007-07-17T14:48:25+00:00

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

update license header text

2006-07-12T03:38:44+00:00

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@421103 13f79535-47bb-0310-9956-ffa450edef68

Revert r395231 from the 2.2.x branch. This gets us back to the old place with regard to the copyright statements.

2006-04-22T01:53:06+00:00

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@396056 13f79535-47bb-0310-9956-ffa450edef68

Update the last year of copyright for the 2.2.x branch

2006-04-19T12:33:16+00:00

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@395231 13f79535-47bb-0310-9956-ffa450edef68

Backport the Doxygen changes to the 2.2.x branch. No functional changes,

2005-09-29T20:44:53+00:00

however backporting these doxygen fixes makes it significantly easier to diff
trunk and the 2.2.x branch, to sort out what's what. And we might as well
release with nicer doxygen markup.

Submitted by: Neale Ranns 
Reviewed by:  Ian Holsman


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292540 13f79535-47bb-0310-9956-ffa450edef68

Backport graceful-stop to the 2.2.x branch.

2005-09-19T15:51:22+00:00

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290189 13f79535-47bb-0310-9956-ffa450edef68

Backport r239430 to the 2.2.x branch. Lets make sure WINCH is kept free.

2005-09-18T19:39:02+00:00

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@289961 13f79535-47bb-0310-9956-ffa450edef68

Add monitor hook (discussed under "watchdog" thread).

2005-06-07T19:13:37+00:00

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@188846 13f79535-47bb-0310-9956-ffa450edef68

2005-02-04T20:28:49+00:00

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151408 13f79535-47bb-0310-9956-ffa450edef68

worker MPM: Fix a problem which could cause httpd processes to

2004-12-02T17:39:22+00:00

remain active after shutdown.

The problem occurred when a scoreboard entry currently
in use by an exiting child process was used for a new child
process.  At that point, the MPM forgot about the exiting
child process, so ap_reclaim_child_processes() wouldn't be
able to forceably terminate it.

(An exiting child process may *never* exit due to a stuck
or long-running request being handled on one of the threads.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@109510 13f79535-47bb-0310-9956-ffa450edef68