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 2013/07/26 16:34:06 UTC
svn commit: r1507336 - /httpd/httpd/branches/2.2.x/docs/manual/mod/
Author: covener
Date: Fri Jul 26 14:34:06 2013
New Revision: 1507336
URL: http://svn.apache.org/r1507336
Log:
xforms
Modified:
httpd/httpd/branches/2.2.x/docs/manual/mod/mod_authnz_ldap.html.en
httpd/httpd/branches/2.2.x/docs/manual/mod/mod_env.html.en
httpd/httpd/branches/2.2.x/docs/manual/mod/mod_env.xml.ja
httpd/httpd/branches/2.2.x/docs/manual/mod/mod_env.xml.ko
httpd/httpd/branches/2.2.x/docs/manual/mod/mod_env.xml.tr
httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.html.en
httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_http.html.en
httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_http.xml.fr
httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_http.xml.ja
httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_http.xml.meta
httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.en
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_authnz_ldap.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_authnz_ldap.html.en?rev=1507336&r1=1507335&r2=1507336&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_authnz_ldap.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_authnz_ldap.html.en Fri Jul 26 14:34:06 2013
@@ -720,6 +720,21 @@ Require group <em>mygroupfile</em>
properly protected. You should only use the <code class="directive"><a href="#authldapbinddn">AuthLDAPBindDN</a></code> and <code class="directive"><a href="#authldapbindpassword">AuthLDAPBindPassword</a></code> if you
absolutely need them to search the directory.</p>
+ <p>If the value begins with exec: the resulting command will be
+ executed and the first line returned to standard output by the
+ program will be used as the password.</p>
+<div class="example"><pre>
+#Password used as-is
+AuthLDAPBindPassword secret
+
+#Run /path/to/program to get my password
+AuthLDAPBindPassword exec:/path/to/program
+
+#Run /path/to/otherProgram and provide arguments
+AuthLDAPBindPassword "exec:/path/to/otherProgram argument1"
+</pre></div>
+
+
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="AuthLDAPCharsetConfig" id="AuthLDAPCharsetConfig">AuthLDAPCharsetConfig</a> <a name="authldapcharsetconfig" id="authldapcharsetconfig">Directive</a></h2>
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_env.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_env.html.en?rev=1507336&r1=1507335&r2=1507336&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_env.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_env.html.en Fri Jul 26 14:34:06 2013
@@ -81,7 +81,7 @@ SSI pages</td></tr>
<div class="directive-section"><h2><a name="SetEnv" id="SetEnv">SetEnv</a> <a name="setenv" id="setenv">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets environment variables</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SetEnv <var>env-variable</var> <var>value</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SetEnv <var>env-variable</var> [<var>value</var>]</code></td></tr>
<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory, .htaccess</td></tr>
<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>FileInfo</td></tr>
<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Base</td></tr>
@@ -93,6 +93,9 @@ SSI pages</td></tr>
<div class="example"><h3>Example</h3><p><code>
SetEnv SPECIAL_PATH /foo/bin
</code></p></div>
+
+ <p> If you omit the <var>value</var> argument, the variable is set to
+ an empty string.</p>
<div class="note"><p>The internal environment variables set by this directive are set
<em>after</em> most early request processing directives are run, such as access
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_env.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_env.xml.ja?rev=1507336&r1=1507335&r2=1507336&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_env.xml.ja [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_env.xml.ja [utf-8] Fri Jul 26 14:34:06 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 421100:1479257 (outdated) -->
+<!-- English Revision: 421100:1507323 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_env.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_env.xml.ko?rev=1507336&r1=1507335&r2=1507336&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_env.xml.ko [euc-kr] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_env.xml.ko [euc-kr] Fri Jul 26 14:34:06 2013
@@ -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:1479257 (outdated) -->
+<!-- English Revision: 105989:1507323 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_env.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_env.xml.tr?rev=1507336&r1=1507335&r2=1507336&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_env.xml.tr [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_env.xml.tr [utf-8] Fri Jul 26 14:34:06 2013
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1040519:1479257 (outdated) -->
+<!-- English Revision: 1040519:1507323 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.html.en?rev=1507336&r1=1507335&r2=1507336&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.html.en Fri Jul 26 14:34:06 2013
@@ -1161,6 +1161,13 @@ through</td></tr>
in the list. Worker recovery behaves the same as other worker errors.
Available with Apache HTTP Server 2.2.17 and later.
</td></tr>
+ <tr><td>failontimeout</td>
+ <td>Off</td>
+ <td>If set, an IO read timeout after a request is sent to the backend will
+ force the worker into error state. Worker recovery behaves the same as other
+ worker errors.
+ Available with Apache HTTP Server 2.2.25 and later.
+ </td></tr>
<tr><td>forcerecovery</td>
<td>On</td>
<td>Force the immediate recovery of all workers without considering the
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_http.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_http.html.en?rev=1507336&r1=1507335&r2=1507336&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_http.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_http.html.en Fri Jul 26 14:34:06 2013
@@ -69,7 +69,8 @@
<p>In addition to the configuration directives that control the
behaviour of <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code>, there are a number of
<dfn>environment variables</dfn> that control the HTTP protocol
- provider:</p>
+ provider. Environment variables below that don't specify specific values
+ are enabled when set to any value.</p>
<dl>
<dt>proxy-sendextracrlf</dt>
<dd>Causes proxy to send an extra CR-LF newline on the end of a
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_http.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_http.xml.fr?rev=1507336&r1=1507335&r2=1507336&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_http.xml.fr (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_http.xml.fr Fri Jul 26 14:34:06 2013
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision : 910322 -->
+<!-- English Revision: 910322:1507329 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_http.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_http.xml.ja?rev=1507336&r1=1507335&r2=1507336&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_http.xml.ja [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_http.xml.ja [utf-8] Fri Jul 26 14:34:06 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
-<!-- English Revision: 910322 -->
+<!-- English Revision: 910322:1507329 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_http.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_http.xml.meta?rev=1507336&r1=1507335&r2=1507336&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_http.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_http.xml.meta Fri Jul 26 14:34:06 2013
@@ -8,7 +8,7 @@
<variants>
<variant>en</variant>
- <variant>fr</variant>
- <variant>ja</variant>
+ <variant outdated="yes">fr</variant>
+ <variant outdated="yes">ja</variant>
</variants>
</metafile>
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.en?rev=1507336&r1=1507335&r2=1507336&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.en Fri Jul 26 14:34:06 2013
@@ -664,7 +664,7 @@ is accessed by an incompatible browser</
<tr><td><a href="core.html#serversignature">ServerSignature On|Off|EMail</a></td><td> Off </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Configures the footer on server-generated documents</td></tr>
<tr class="odd"><td><a href="core.html#servertokens">ServerTokens Major|Minor|Min[imal]|Prod[uctOnly]|OS|Full</a></td><td> Full </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Configures the <code>Server</code> HTTP response
header</td></tr>
-<tr><td><a href="mod_env.html#setenv">SetEnv <var>env-variable</var> <var>value</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets environment variables</td></tr>
+<tr><td><a href="mod_env.html#setenv">SetEnv <var>env-variable</var> [<var>value</var>]</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets environment variables</td></tr>
<tr class="odd"><td><a href="mod_setenvif.html#setenvif">SetEnvIf <em>attribute
regex [!]env-variable</em>[=<em>value</em>]
[[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets environment variables based on attributes of the request