Commit ddb1a3b7 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

xforms... again. 

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

docs/manual/mod/mod_proxy.html.en

+14 −10
Original line number Diff line number Diff line
@@ -259,7 +259,8 @@ ProxyVia On 


      <p>This will create a worker associated with the origin server URL

      <code>http://backend.example.com</code> that will use the given timeout

      values. When used in a forward proxy, workers are usually defined

      values. All timeouts use the <a href="directive-dict.html#Syntax">time-interval</a>

      directive syntax. When used in a forward proxy, workers are usually defined

      via the <code class="directive"><a href="#proxyset">ProxySet</a></code> directive:</p>



      <pre class="prettyprint lang-config">ProxySet http://backend.example.com connectiontimeout=5 timeout=30</pre>
@@ -1189,7 +1190,7 @@ ProxyPass "/mirror/foo" "http://backend.example.com"</pre> 
        <td>Connect timeout in seconds.

        The number of seconds Apache httpd waits for the creation of a connection to

        the backend to complete. By adding a postfix of ms, the timeout can be

        also set in milliseconds.

        also set in milliseconds. Uses the <a href="directive-dict.html#Syntax">time-interval</a> directive syntax

    </td></tr>

    <tr><td>disablereuse</td>

        <td>Off</td>
@@ -1221,7 +1222,8 @@ ProxyPass "/mirror/foo" "http://backend.example.com"</pre> 
    <tr><td>flushwait</td>

        <td>10</td>

        <td>The time to wait for additional input, in milliseconds, before

        flushing the output brigade if 'flushpackets' is 'auto'. Uses time-interval directive syntax.

        flushing the output brigade if 'flushpackets' is 'auto'.

        Uses <a href="directive-dict.html#Syntax">time-interval</a> directive syntax.

    </td></tr>

    <tr><td>iobuffersize</td>

        <td>8192</td>
@@ -1240,7 +1242,7 @@ ProxyPass "/mirror/foo" "http://backend.example.com"</pre> 
    <p>The frequency of initial and subsequent TCP keepalive probes

    depends on global OS settings, and may be as high as 2 hours. To be useful,

    the frequency configured in the OS must be smaller than the threshold used

    by the firewall. Uses time-interval directive syntax.</p>

    by the firewall. Uses the <a href="directive-dict.html#Syntax">time-interval</a> directive syntax.</p>

    </td></tr>

    <tr><td>lbset</td>

        <td>0</td>
@@ -1267,7 +1269,7 @@ ProxyPass "/mirror/foo" "http://backend.example.com"</pre> 
        which could be an issue, but it will lower the

        traffic in case some of the cluster nodes are down or busy.

        By adding a postfix of ms, the delay can be also set in

        milliseconds. Uses time-interval directive syntax.

        milliseconds. Uses the <a href="directive-dict.html#Syntax">time-interval</a> directive syntax.

    </td></tr>

    <tr><td>receivebuffersize</td>

        <td>0</td>
@@ -1291,7 +1293,8 @@ ProxyPass "/mirror/foo" "http://backend.example.com"</pre> 
    Apache httpd will not forward any requests to that server until the timeout

    expires. This enables to shut down the backend server for maintenance

    and bring it back online later. A value of 0 means always retry workers

    in an error state with no timeout. Uses time-interval directive syntax.

    in an error state with no timeout.

    Uses the <a href="directive-dict.html#Syntax">time-interval</a> directive syntax.

    </td></tr>

    <tr><td>route</td>

        <td>-</td>
@@ -1323,14 +1326,14 @@ ProxyPass "/mirror/foo" "http://backend.example.com"</pre> 
        <td><code class="directive"><a href="#proxytimeout">ProxyTimeout</a></code></td>

        <td>Connection timeout in seconds.

        The number of seconds Apache httpd waits for data sent by / to the backend.

        Uses time-interval directive syntax.

        Uses the <a href="directive-dict.html#Syntax">time-interval</a> directive syntax.

    </td></tr>

    <tr><td>ttl</td>

        <td>-</td>

        <td>Time to live for inactive connections and associated connection

        pool entries, in seconds.  Once reaching this limit, a

        connection will not be used again; it will be closed at some

        later time. Uses time-interval directive syntax.

        later time. Uses the <a href="directive-dict.html#Syntax">time-interval</a> directive syntax.

    </td></tr>

    <tr><td>flusher</td>

        <td>flush</td>
@@ -1408,7 +1411,8 @@ ProxyPass "/mirror/foo" "http://backend.example.com"</pre> 
    <tr><td>timeout</td>

        <td>0</td>

        <td>Balancer timeout in seconds. If set, this will be the maximum time

        to wait for a free worker. The default is to not wait. Uses time-interval directive syntax.

        to wait for a free worker. The default is to not wait.

        Uses the <a href="directive-dict.html#Syntax">time-interval</a> directive syntax.

    </td></tr>

    <tr><td>failonstatus</td>

        <td>-</td>
@@ -1963,7 +1967,7 @@ expressions</td></tr> 
<div class="directive-section"><h2><a name="ProxyTimeout" id="ProxyTimeout">ProxyTimeout</a> <a name="proxytimeout" id="proxytimeout">Directive</a></h2>

<table class="directive">

<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Network timeout for proxied requests</td></tr>

<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyTimeout <var>seconds</var></code></td></tr>

<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyTimeout <var>time-interval</var>[s]</code></td></tr>

<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>Value of <code class="directive"><a href="../mod/core.html#timeout">Timeout</a></code></code></td></tr>

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

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

docs/manual/mod/mod_proxy.xml.fr

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" ?>

<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">

<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>

<!-- English Revision: 1792092:1799460 (outdated) -->

<!-- English Revision: 1792092:1799463 (outdated) -->

<!-- French translation : Lucien GENTIS -->

<!-- Reviewed by : Vincent Deffontaines -->

docs/manual/mod/mod_proxy.xml.ja

+1 −1
Original line number Diff line number Diff line 
<?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: 344971:1799460 (outdated) -->

<!-- English Revision: 344971:1799463 (outdated) -->



<!--

 Licensed to the Apache Software Foundation (ASF) under one or more

docs/manual/mod/quickreference.html.de

+1 −1
Original line number Diff line number Diff line
@@ -867,7 +867,7 @@ header</td></tr> 
<tr><td><a href="mod_proxy.html#proxyset">ProxySet <var>url</var> <var>key=value [key=value ...]</var></a></td><td></td><td>d</td><td>E</td></tr><tr><td class="descr" colspan="4">Set various Proxy balancer or member parameters</td></tr>

<tr class="odd"><td><a href="mod_proxy.html#proxysourceaddress">ProxySourceAddress <var>address</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Set local IP address for outgoing proxy connections</td></tr>

<tr><td><a href="mod_proxy.html#proxystatus">ProxyStatus Off|On|Full</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Show Proxy LoadBalancer status in mod_status</td></tr>

<tr class="odd"><td><a href="mod_proxy.html#proxytimeout">ProxyTimeout <var>seconds</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Network timeout for proxied requests</td></tr>

<tr class="odd"><td><a href="mod_proxy.html#proxytimeout">ProxyTimeout <var>time-interval</var>[s]</a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Network timeout for proxied requests</td></tr>

<tr><td><a href="mod_proxy.html#proxyvia">ProxyVia On|Off|Full|Block</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Information provided in the <code>Via</code> HTTP response

header for proxied requests</td></tr>

<tr class="odd"><td><a href="mod_proxy_wstunnel.html#proxywebsocketasync">ProxyWebsocketAsync ON|OFF</a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Instructs this module to try to create an asynchronous tunnel</td></tr>

docs/manual/mod/quickreference.html.en

+1 −1
Original line number Diff line number Diff line
@@ -859,7 +859,7 @@ header</td></tr> 
<tr><td><a href="mod_proxy.html#proxyset">ProxySet <var>url</var> <var>key=value [key=value ...]</var></a></td><td></td><td>d</td><td>E</td></tr><tr><td class="descr" colspan="4">Set various Proxy balancer or member parameters</td></tr>

<tr class="odd"><td><a href="mod_proxy.html#proxysourceaddress">ProxySourceAddress <var>address</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Set local IP address for outgoing proxy connections</td></tr>

<tr><td><a href="mod_proxy.html#proxystatus">ProxyStatus Off|On|Full</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Show Proxy LoadBalancer status in mod_status</td></tr>

<tr class="odd"><td><a href="mod_proxy.html#proxytimeout">ProxyTimeout <var>seconds</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Network timeout for proxied requests</td></tr>

<tr class="odd"><td><a href="mod_proxy.html#proxytimeout">ProxyTimeout <var>time-interval</var>[s]</a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Network timeout for proxied requests</td></tr>

<tr><td><a href="mod_proxy.html#proxyvia">ProxyVia On|Off|Full|Block</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Information provided in the <code>Via</code> HTTP response

header for proxied requests</td></tr>

<tr class="odd"><td><a href="mod_proxy_wstunnel.html#proxywebsocketasync">ProxyWebsocketAsync ON|OFF</a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Instructs this module to try to create an asynchronous tunnel</td></tr>