/[Apache-SVN]
ViewVC logotype

Revision 410935


Jump to revision: Previous Next
Author: rpluem
Date: Thu Jun 1 20:12:51 2006 UTC (3 years, 5 months ago)
Changed paths: 4
Log Message:
Merge r377291 from trunk:

Make the worker and event MPMs support GracefulShutdownTimeout just like
the prefork MPM does.

Submitted by: Chris Darroch <chrisd pearsoncmg.com>
Ported to event MPM by: rooneg
Issue number: 38621

* server/mpm/worker/worker.c
  (ap_mpm_run): Make the graceful shutdown log message refer to the right
   signal, and respect the graceful shutdown timeout if there is one.

* server/mpm/experimental/event/event.c
  (ap_mpm_run): Ditto.

* CHANGES: Note change.

Submitted by: chrisd, rooneg
Reviewed by: chrisd, rpluem, trawick
PR: 38621

Changed paths:

Path Details
Directoryhttpd/httpd/branches/2.2.x/CHANGES modified , text changed
Directoryhttpd/httpd/branches/2.2.x/STATUS modified , text changed
Directoryhttpd/httpd/branches/2.2.x/server/mpm/experimental/event/event.c modified , text changed
Directoryhttpd/httpd/branches/2.2.x/server/mpm/worker/worker.c modified , text changed

apache@apache.org
ViewVC Help
Powered by ViewVC 1.1.2