You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2005/08/26 18:14:58 UTC
svn commit: r240275 [1/3] - in /httpd/httpd/trunk/docs: man/ manual/
manual/mod/ manual/programs/
Author: colm
Date: Fri Aug 26 09:14:46 2005
New Revision: 240275
URL: http://svn.apache.org/viewcvs?rev=240275&view=rev
Log:
Update the transformations to reflect the new graceful-stop argument.
Modified:
httpd/httpd/trunk/docs/man/apachectl.8
httpd/httpd/trunk/docs/man/httpd.8
httpd/httpd/trunk/docs/manual/mod/directives.html.en
httpd/httpd/trunk/docs/manual/mod/mod_cgid.xml.ja
httpd/httpd/trunk/docs/manual/mod/mod_cgid.xml.ko
httpd/httpd/trunk/docs/manual/mod/mod_cgid.xml.meta
httpd/httpd/trunk/docs/manual/mod/mpm_common.html.en
httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.de
httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.ja
httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.meta
httpd/httpd/trunk/docs/manual/mod/quickreference.html.en
httpd/httpd/trunk/docs/manual/programs/apachectl.html.en
httpd/httpd/trunk/docs/manual/programs/apachectl.xml.ko
httpd/httpd/trunk/docs/manual/programs/httpd.html.en
httpd/httpd/trunk/docs/manual/programs/httpd.xml.ko
httpd/httpd/trunk/docs/manual/stopping.html.en
httpd/httpd/trunk/docs/manual/stopping.xml.de
httpd/httpd/trunk/docs/manual/stopping.xml.es
httpd/httpd/trunk/docs/manual/stopping.xml.ja
httpd/httpd/trunk/docs/manual/stopping.xml.ko
httpd/httpd/trunk/docs/manual/stopping.xml.meta
Modified: httpd/httpd/trunk/docs/man/apachectl.8
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/man/apachectl.8?rev=240275&r1=240274&r2=240275&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/man/apachectl.8 (original)
+++ httpd/httpd/trunk/docs/man/apachectl.8 Fri Aug 26 09:14:46 2005
@@ -19,7 +19,7 @@
.el .ne 3
.IP "\\$1" \\$2
..
-.TH "APACHECTL" 8 "2005-05-03" "Apache HTTP Server" "apachectl"
+.TH "APACHECTL" 8 "2005-08-26" "Apache HTTP Server" "apachectl"
.SH NAME
apachectl \- Apache HTTP Server Control Interface
@@ -78,6 +78,9 @@
.TP
graceful
Gracefully restarts the Apache httpd daemon\&. If the daemon is not running, it is started\&. This differs from a normal restart in that currently open connections are not aborted\&. A side effect is that old log files will not be closed immediately\&. This means that if used in a log rotation script, a substantial delay may be necessary to ensure that the old log files are closed before processing them\&. This command automatically checks the configuration files as in configtest before initiating the restart to make sure Apache doesn't die\&. This is equivalent to apachectl -k graceful\&.
+.TP
+graceful-stop
+Gracefully stops the Apache httpd daemon\&. This differs from a normal stop in that currently open connections are not aborted\&. A side effect is that old log files will not be closed immediately\&. This is equivalent to apachectl -k graceful-stop\&.
.TP
configtest
Run a configuration file syntax test\&. It parses the configuration files and either reports Syntax Ok or detailed information about the particular syntax error\&. This is equivalent to apachectl -t\&.
Modified: httpd/httpd/trunk/docs/man/httpd.8
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/man/httpd.8?rev=240275&r1=240274&r2=240275&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/man/httpd.8 (original)
+++ httpd/httpd/trunk/docs/man/httpd.8 Fri Aug 26 09:14:46 2005
@@ -19,7 +19,7 @@
.el .ne 3
.IP "\\$1" \\$2
..
-.TH "HTTPD" 8 "2004-07-10" "Apache HTTP Server" "httpd"
+.TH "HTTPD" 8 "2005-08-26" "Apache HTTP Server" "httpd"
.SH NAME
httpd \- Apache Hypertext Transfer Protocol Server
@@ -27,7 +27,7 @@
.SH "SYNOPSIS"
.PP
-\fBhttpd\fR [ -\fBd\fR \fIserverroot\fR ] [ -\fBf\fR \fIconfig\fR ] [ -\fBC\fR \fIdirective\fR ] [ -\fBc\fR \fIdirective\fR ] [ -\fBD\fR \fIparameter\fR ] [ -\fBe\fR \fIlevel\fR ] [ -\fBE\fR \fIfile\fR ] [ \fB-k\fR start|restart|graceful|stop ] [ -\fBR\fR \fIdirectory\fR ] [ -\fBh\fR ] [ -\fBl\fR ] [ -\fBL\fR ] [ -\fBS\fR ] [ -\fBt\fR ] [ -\fBv\fR ] [ -\fBV\fR ] [ -\fBX\fR ] [ -\fBM\fR ]
+\fBhttpd\fR [ -\fBd\fR \fIserverroot\fR ] [ -\fBf\fR \fIconfig\fR ] [ -\fBC\fR \fIdirective\fR ] [ -\fBc\fR \fIdirective\fR ] [ -\fBD\fR \fIparameter\fR ] [ -\fBe\fR \fIlevel\fR ] [ -\fBE\fR \fIfile\fR ] [ \fB-k\fR start|restart|graceful|stop|graceful-stop ] [ -\fBR\fR \fIdirectory\fR ] [ -\fBh\fR ] [ -\fBl\fR ] [ -\fBL\fR ] [ -\fBS\fR ] [ -\fBt\fR ] [ -\fBv\fR ] [ -\fBV\fR ] [ -\fBX\fR ] [ -\fBM\fR ]
.PP
On Windows systems, the following additional arguments are available:
@@ -55,7 +55,7 @@
-f \fIconfig\fR
Uses the directives in the file \fIconfig\fR on startup\&. If \fIconfig\fR does not begin with a /, then it is taken to be a path relative to the ServerRoot\&. The default is conf/httpd\&.conf\&.
.TP
--k start|restart|graceful|stop
+-k start|restart|graceful|stop|graceful-stop
Signals httpd to start, restart, or stop\&. See Stopping Apache for more information\&.
.TP
-C \fIdirective\fR
Modified: httpd/httpd/trunk/docs/manual/mod/directives.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/directives.html.en?rev=240275&r1=240274&r2=240275&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/directives.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/directives.html.en Fri Aug 26 09:14:46 2005
@@ -197,7 +197,8 @@
<li><a href="mod_negotiation.html#forcelanguagepriority">ForceLanguagePriority</a></li>
<li><a href="core.html#forcetype">ForceType</a></li>
<li><a href="mod_log_forensic.html#forensiclog">ForensicLog</a></li>
-<li><a href="mpm_common.html#group" id="G" name="G">Group</a></li>
+<li><a href="mpm_common.html#gracefulshutdowntimeout" id="G" name="G">GracefulShutdownTimeout</a></li>
+<li><a href="mpm_common.html#group">Group</a></li>
<li><a href="mod_headers.html#header" id="H" name="H">Header</a></li>
<li><a href="mod_autoindex.html#headername">HeaderName</a></li>
<li><a href="core.html#hostnamelookups">HostnameLookups</a></li>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_cgid.xml.ja
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mod_cgid.xml.ja?rev=240275&r1=240274&r2=240275&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_cgid.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_cgid.xml.ja [iso-2022-jp] Fri Aug 26 09:14:46 2005
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-2022-jp"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 151408 -->
+<!-- English Revision: 151408:240049 (outdated) -->
<!--
Copyright 2004-2005 The Apache Software Foundation or its licensors,
Modified: httpd/httpd/trunk/docs/manual/mod/mod_cgid.xml.ko
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mod_cgid.xml.ko?rev=240275&r1=240274&r2=240275&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_cgid.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_cgid.xml.ko [euc-kr] Fri Aug 26 09:14:46 2005
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="EUC-KR" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105989:151408 (outdated) -->
+<!-- English Revision: 105989:240049 (outdated) -->
<!--
Copyright 2003-2005 The Apache Software Foundation or its licensors,
Modified: httpd/httpd/trunk/docs/manual/mod/mod_cgid.xml.meta
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mod_cgid.xml.meta?rev=240275&r1=240274&r2=240275&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_cgid.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_cgid.xml.meta Fri Aug 26 09:14:46 2005
@@ -7,7 +7,7 @@
<variants>
<variant>en</variant>
- <variant>ja</variant>
+ <variant outdated="yes">ja</variant>
<variant outdated="yes">ko</variant>
</variants>
</metafile>
Modified: httpd/httpd/trunk/docs/manual/mod/mpm_common.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mpm_common.html.en?rev=240275&r1=240274&r2=240275&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mpm_common.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mpm_common.html.en Fri Aug 26 09:14:46 2005
@@ -34,6 +34,7 @@
<li><img alt="" src="../images/down.gif" /> <a href="#acceptmutex">AcceptMutex</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#coredumpdirectory">CoreDumpDirectory</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#enableexceptionhook">EnableExceptionHook</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#gracefulshutdowntimeout">GracefulShutdownTimeout</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#group">Group</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#listen">Listen</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#listenbacklog">ListenBackLog</a></li>
@@ -169,6 +170,26 @@
<p>There are already two modules, <code>mod_whatkilledus</code> and
<code>mod_backtrace</code> that make use of this hook. Please have a
look at Jeff Trawick's <a href="http://www.apache.org/~trawick/exception_hook.html">EnableExceptionHook site</a> for more information about these.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="GracefulShutdownTimeout" id="GracefulShutdownTimeout">GracefulShutdownTimeout</a> <a name="gracefulshutdowntimeout" id="gracefulshutdowntimeout">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Specify a timeout after which a gracefully shutdown server
+will exit.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>GracefulShutDownTimeout <var>seconds</var></code></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></td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.4 and later</td></tr>
+</table>
+ <p>The <code class="directive">GracefulShutdownTimeout</code> specifies
+ how many seconds after receiving a "graceful-stop" signal, a
+ server should continue to run, handling the existing connections.</p>
+
+ <p>Setting this value to zero means that the server will wait
+ indefinitely until all remaining requests have been fully served.</p>
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
Modified: httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.de
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.de?rev=240275&r1=240274&r2=240275&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.de (original)
+++ httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.de Fri Aug 26 09:14:46 2005
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 151408:190982 (outdated) -->
+<!-- English Revision: 151408:240271 (outdated) -->
<!--
Copyright 2003-2005 The Apache Software Foundation or its licensors,
Modified: httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.ja
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.ja?rev=240275&r1=240274&r2=240275&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.ja [iso-2022-jp] Fri Aug 26 09:14:46 2005
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-2022-jp"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 190982 -->
+<!-- English Revision: 190982:240271 (outdated) -->
<!--
Copyright 2002-2005 The Apache Software Foundation or its licensors, as
Modified: httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.meta
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.meta?rev=240275&r1=240274&r2=240275&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.meta Fri Aug 26 09:14:46 2005
@@ -8,6 +8,6 @@
<variants>
<variant outdated="yes">de</variant>
<variant>en</variant>
- <variant>ja</variant>
+ <variant outdated="yes">ja</variant>
</variants>
</metafile>