Add graceful-stop to the list of new features.

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

diff --git a/docs/manual/new_features_2_2.html.en b/docs/manual/new_features_2_2.html.en
index f8f134ec7ee1fff9e77557ef5eddb017dd8e7aea..7ebf1b2751b02ccedb6d4b3c5104be7359b1eda2 100644 (file)
--- a/docs/manual/new_features_2_2.html.en
+++ b/docs/manual/new_features_2_2.html.en
@@ -52,6 +52,15 @@
           has been introduced to cleanup <code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code>
           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
+          <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
+          <code class="program"><a href="./programs/httpd.html">httpd</a></code> will terminate regardless of the status
+          of any requests being served.</dd>
+
       <dt>Proxying</dt>
       <dd>The new <code class="module"><a href="./mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code> module provides 
           load balancing services for <code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code>.

diff --git a/docs/manual/new_features_2_2.xml b/docs/manual/new_features_2_2.xml
index 75781803b0d08a00cb1278e55be03299ed419e4e..7a886179480068a3ba36d8923140d0509b6a00af 100644 (file)
--- a/docs/manual/new_features_2_2.xml
+++ b/docs/manual/new_features_2_2.xml
@@ -48,6 +48,16 @@
           has been introduced to cleanup <module>mod_disk_cache</module>
           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
+          <a href="stopping.html#gracefulstop"><code>graceful-stop</code></a> 
+          signal. The <directive 
+          module="mpm_common">GracefulShutdownTimeout</directive> directive
+          has been added to specify an optional timeout, after which
+          <program>httpd</program> will terminate regardless of the status
+          of any requests being served.</dd>
+
       <dt>Proxying</dt>
       <dd>The new <module>mod_proxy_balancer</module> module provides 
           load balancing services for <module>mod_proxy</module>.