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/28 20:44:40 UTC
svn commit: r263901 - in /httpd/httpd/trunk/docs/manual: ./ faq/ mod/
Author: colm
Date: Sun Aug 28 11:44:28 2005
New Revision: 263901
URL: http://svn.apache.org/viewcvs?rev=263901&view=rev
Log:
Update transformations to reflect the graceful-stop XML documentation.
Modified:
httpd/httpd/trunk/docs/manual/env.html.en
httpd/httpd/trunk/docs/manual/env.xml.ja
httpd/httpd/trunk/docs/manual/env.xml.ko
httpd/httpd/trunk/docs/manual/env.xml.meta
httpd/httpd/trunk/docs/manual/faq/all_in_one.xml.ja
httpd/httpd/trunk/docs/manual/faq/all_in_one.xml.ko
httpd/httpd/trunk/docs/manual/faq/all_in_one.xml.meta
httpd/httpd/trunk/docs/manual/mod/mod_alias.xml.ja
httpd/httpd/trunk/docs/manual/mod/mod_alias.xml.ko
httpd/httpd/trunk/docs/manual/mod/mod_alias.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/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
Modified: httpd/httpd/trunk/docs/manual/env.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/env.html.en?rev=263901&r1=263900&r2=263901&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/env.html.en (original)
+++ httpd/httpd/trunk/docs/manual/env.html.en Sun Aug 28 11:44:28 2005
@@ -309,7 +309,7 @@
<h3><a name="suppress-error-charset" id="suppress-error-charset">suppress-error-charset</a></h3>
- <p><em>Available in versions 2.2 and later</em></p>
+ <p><em>Available in versions after 2.0.54</em></p>
<p>When Apache issues a redirect in response to a client request,
the response includes some actual text to be displayed in case
Modified: httpd/httpd/trunk/docs/manual/env.xml.ja
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/env.xml.ja?rev=263901&r1=263900&r2=263901&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/env.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/trunk/docs/manual/env.xml.ja [iso-2022-jp] Sun Aug 28 11:44:28 2005
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-2022-jp" ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 170354 -->
+<!-- English Revision: 170354:240426 (outdated) -->
<!--
Copyright 2002-2005 The Apache Software Foundation or its licensors, as
Modified: httpd/httpd/trunk/docs/manual/env.xml.ko
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/env.xml.ko?rev=263901&r1=263900&r2=263901&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/env.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/env.xml.ko [euc-kr] Sun Aug 28 11:44:28 2005
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="EUC-KR" ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 105989:170354 (outdated) -->
+<!-- English Revision: 105989:240426 (outdated) -->
<!--
Copyright 2003-2005 The Apache Software Foundation or its licensors,
Modified: httpd/httpd/trunk/docs/manual/env.xml.meta
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/env.xml.meta?rev=263901&r1=263900&r2=263901&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/env.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/env.xml.meta Sun Aug 28 11:44:28 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/faq/all_in_one.xml.ja
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/faq/all_in_one.xml.ja?rev=263901&r1=263900&r2=263901&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/faq/all_in_one.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/trunk/docs/manual/faq/all_in_one.xml.ja [iso-2022-jp] Sun Aug 28 11:44:28 2005
@@ -3,7 +3,7 @@
<!ENTITY categories SYSTEM "categories.xml.ja">
]>
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 151408 -->
+<!-- English Revision: 151408:240306 (outdated) -->
<!--
Copyright 2004-2005 The Apache Software Foundation or its licensors,
Modified: httpd/httpd/trunk/docs/manual/faq/all_in_one.xml.ko
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/faq/all_in_one.xml.ko?rev=263901&r1=263900&r2=263901&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/faq/all_in_one.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/faq/all_in_one.xml.ko [euc-kr] Sun Aug 28 11:44:28 2005
@@ -3,7 +3,7 @@
<!ENTITY categories SYSTEM "categories.xml.ko">
]>
<?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 151408 -->
+<!-- English Revision: 151408:240306 (outdated) -->
<!--
Copyright 2004-2005 The Apache Software Foundation or its licensors,
Modified: httpd/httpd/trunk/docs/manual/faq/all_in_one.xml.meta
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/faq/all_in_one.xml.meta?rev=263901&r1=263900&r2=263901&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/faq/all_in_one.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/faq/all_in_one.xml.meta Sun Aug 28 11:44:28 2005
@@ -7,7 +7,7 @@
<variants>
<variant>en</variant>
- <variant>ja</variant>
- <variant>ko</variant>
+ <variant outdated="yes">ja</variant>
+ <variant outdated="yes">ko</variant>
</variants>
</metafile>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_alias.xml.ja
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mod_alias.xml.ja?rev=263901&r1=263900&r2=263901&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_alias.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_alias.xml.ja [iso-2022-jp] Sun Aug 28 11:44:28 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:240299 (outdated) -->
<!--
Copyright 2002-2005 The Apache Software Foundation or its licensors,
Modified: httpd/httpd/trunk/docs/manual/mod/mod_alias.xml.ko
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mod_alias.xml.ko?rev=263901&r1=263900&r2=263901&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_alias.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_alias.xml.ko [euc-kr] Sun Aug 28 11:44:28 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: 151408 -->
+<!-- English Revision: 151408:240299 (outdated) -->
<!--
Copyright 2004-2005 The Apache Software Foundation or its licensors,
Modified: httpd/httpd/trunk/docs/manual/mod/mod_alias.xml.meta
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mod_alias.xml.meta?rev=263901&r1=263900&r2=263901&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_alias.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_alias.xml.meta Sun Aug 28 11:44:28 2005
@@ -7,7 +7,7 @@
<variants>
<variant>en</variant>
- <variant>ja</variant>
- <variant>ko</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=263901&r1=263900&r2=263901&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mpm_common.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mpm_common.html.en Sun Aug 28 11:44:28 2005
@@ -181,8 +181,8 @@
<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>
+<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#Compatibility">Compatibility:</a></th><td>Available in version 2.2 and later</td></tr>
</table>
<p>The <code class="directive">GracefulShutdownTimeout</code> specifies
how many seconds after receiving a "graceful-stop" signal, a
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=263901&r1=263900&r2=263901&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.de (original)
+++ httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.de Sun Aug 28 11:44:28 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:240271 (outdated) -->
+<!-- English Revision: 151408:263854 (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=263901&r1=263900&r2=263901&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] Sun Aug 28 11:44:28 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:240271 (outdated) -->
+<!-- English Revision: 190982:263854 (outdated) -->
<!--
Copyright 2002-2005 The Apache Software Foundation or its licensors, as
Modified: httpd/httpd/trunk/docs/manual/stopping.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/stopping.html.en?rev=263901&r1=263900&r2=263901&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/stopping.html.en (original)
+++ httpd/httpd/trunk/docs/manual/stopping.html.en Sun Aug 28 11:44:28 2005
@@ -200,6 +200,24 @@
as the <code class="directive"><a href="./mod/mpm_common.html#pidfile">PidFile</a></code> will
have been removed, you will not be able to use
<code>apachectl</code> or <code>httpd</code> to send this signal,</p>
+
+ <div class="note"><p>The <code>graceful-stop</code> signal allows you to run multiple
+ identically configured instances of <code class="program"><a href="./programs/httpd.html">httpd</a></code> at the
+ same time. This is a powerful feature when performing graceful
+ upgrades of Apache, however it can also cause deadlocks and race
+ conditions with some configurations.</p>
+
+ <p>Care has been taken to ensure that on-disk files
+ such as the <code class="directive"><a href="./mod/core.html#lockfile">Lockfile</a></code> and <code class="directive"><a href="./mod/mod_cgid.html#scriptsock">ScriptSock</a></code> files contain the server
+ PID, and should co-exist without problem. However, if a configuration
+ directive, third-party module or persistent CGI utilises any other on-disk
+ lock or state files; care should be taken to ensure that multiple running
+ instances of <code class="program"><a href="./programs/httpd.html">httpd</a></code> do not clobber each others files.</p>
+
+ <p>You should also be wary of other potential race conditions, such as
+ using <code class="program"><a href="./programs/rotatelogs.html">rotatelogs</a></code> style piped logging. Multiple running
+ instances of <code class="program"><a href="./programs/rotatelogs.html">rotatelogs</a></code> attempting to rotate the same
+ logfiles at the same time may destroy each other's logfiles.</p></div>
</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
<div class="section">
<h2><a name="race" id="race">Appendix: signals and race conditions</a></h2>
Modified: httpd/httpd/trunk/docs/manual/stopping.xml.de
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/stopping.xml.de?rev=263901&r1=263900&r2=263901&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/stopping.xml.de (original)
+++ httpd/httpd/trunk/docs/manual/stopping.xml.de Sun Aug 28 11:44:28 2005
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.de.xsl"?>
-<!-- English Revision: 239255:240271 (outdated) -->
+<!-- English Revision: 239255:263857 (outdated) -->
<!--
Copyright 2002-2005 The Apache Software Foundation or its licensors,
Modified: httpd/httpd/trunk/docs/manual/stopping.xml.es
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/stopping.xml.es?rev=263901&r1=263900&r2=263901&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/stopping.xml.es (original)
+++ httpd/httpd/trunk/docs/manual/stopping.xml.es Sun Aug 28 11:44:28 2005
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.es.xsl"?>
-<!-- English Revision: 105989:240271 (outdated) -->
+<!-- English Revision: 105989:263857 (outdated) -->
<!--
Copyright 2004-2005 The Apache Software Foundation or its licensors,
Modified: httpd/httpd/trunk/docs/manual/stopping.xml.ja
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/stopping.xml.ja?rev=263901&r1=263900&r2=263901&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/stopping.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/trunk/docs/manual/stopping.xml.ja [iso-2022-jp] Sun Aug 28 11:44:28 2005
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-2022-jp"?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 151408:240271 (outdated) -->
+<!-- English Revision: 151408:263857 (outdated) -->
<!--
Copyright 2002-2005 The Apache Software Foundation or its licensors,
Modified: httpd/httpd/trunk/docs/manual/stopping.xml.ko
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/stopping.xml.ko?rev=263901&r1=263900&r2=263901&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/stopping.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/stopping.xml.ko [euc-kr] Sun Aug 28 11:44:28 2005
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='EUC-KR' ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 105989:240271 (outdated) -->
+<!-- English Revision: 105989:263857 (outdated) -->
<!--
Copyright 2003-2005 The Apache Software Foundation or its licensors,