Commit 2a53b048 authored by Colm MacCarthaigh's avatar Colm MacCarthaigh
Browse files 

Implement graceful stop in the event MPM. Implementation is identical to
the worker MPM implementation. 



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

CHANGES

+3 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ Changes with Apache 2.3.0 














  *) Doxygen fixup [Neale Ranns neale ranns.org, Ian Holsman]



























  *) prefork and worker MPMs: Support a graceful-stop procedure:













  *) prefork, worker and event MPMs: Support a graceful-stop procedure:















     Server will wait until existing requests are finished or until  















     "GracefulShutdownTimeout" number of seconds before exiting. 















     [Colm MacCarthaigh, Ken Coar, Bill Stoddard]









@@ -12,8 +12,8 @@ Changes with Apache 2.3.0













  *) mod_cgid: Append .PID to the script socket filename and remove the















     script socket on exit. [Colm MacCarthaigh]



























  *) prefork and worker MPMs: Prevent children from holding open listening













     ports upon graceful restart or stop. PR28167. 













  *) prefork, worker and event MPMs: Prevent children from holding open 













     listening ports upon graceful restart or stop. PR28167. 















     [Colm MacCarthaigh, Brian Pinkerton <bp thinkpink.com>]





























  *) Linux 2.0: remove support for threaded MPM's due to linuxthreads use

































docs/manual/mod/mpm_common.html.en



+1
−1






























Original line number
Diff line number
Diff line








@@ -181,7 +181,7 @@ will exit.</td></tr>













<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>GracefulShutDownTimeout 0</code></td></tr>















<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>















<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>MPM</td></tr>













<tr><th><a href="directive-dict.html#Module">Module:</a></th><td><code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>













<tr><th><a href="directive-dict.html#Module">Module:</a></th><td><code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/event.html">event</a></code></td></tr>















<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.2 and later</td></tr>















</table>















    <p>The <code class="directive">GracefulShutdownTimeout</code> specifies

































docs/manual/mod/mpm_common.xml



+2
−1






























Original line number
Diff line number
Diff line








@@ -163,7 +163,8 @@ will exit.</description>













<syntax>GracefulShutDownTimeout <var>seconds</var></syntax>















<default>GracefulShutDownTimeout 0</default>















<contextlist><context>server config</context></contextlist>













<modulelist><module>prefork</module><module>worker</module></modulelist>













<modulelist><module>prefork</module><module>worker</module>













<module>event</module></modulelist>















<compatibility>Available in version 2.2 and later</compatibility>































<usage>

































docs/manual/new_features_2_2.html.en



+3
−2






























Original line number
Diff line number
Diff line








@@ -53,8 +53,9 @@













          setups.</dd>































      <dt>Graceful stop</dt>













      <dd>The <code class="module"><a href="./mod/prefork.html">prefork</a></code> and <code class="module"><a href="./mod/worker.html">worker</a></code> MPMs now













          allow <code class="program"><a href="./programs/httpd.html">httpd</a></code> to be shutdown gracefully via the













      <dd>The <code class="module"><a href="./mod/prefork.html">prefork</a></code>, <code class="module"><a href="./mod/worker.html">worker</a></code> and 













          <code class="module"><a href="./mod/event.html">event</a></code>  MPMs now allow <code class="program"><a href="./programs/httpd.html">httpd</a></code> 













          to be shutdown gracefully via the















          <a href="stopping.html#gracefulstop"><code>graceful-stop</code></a> 















          signal. The <code class="directive"><a href="./mod/mpm_common.html#gracefulshutdowntimeout">GracefulShutdownTimeout</a></code> directive















          has been added to specify an optional timeout, after which

































docs/manual/new_features_2_2.xml



+3
−2






























Original line number
Diff line number
Diff line








@@ -49,8 +49,9 @@













          setups.</dd>































      <dt>Graceful stop</dt>













      <dd>The <module>prefork</module> and <module>worker</module> MPMs now













          allow <program>httpd</program> to be shutdown gracefully via the













      <dd>The <module>prefork</module>, <module>worker</module> and 













          <module>event</module>  MPMs now allow <program>httpd</program> 













          to be shutdown gracefully via the















          <a href="stopping.html#gracefulstop"><code>graceful-stop</code></a> 















          signal. The <directive 















          module="mpm_common">GracefulShutdownTimeout</directive> directive