httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r153116 - in httpd/httpd/trunk/docs/manual: mod/ platform/
Date Wed, 09 Feb 2005 20:47:53 GMT
Author: jim
Date: Wed Feb  9 12:47:47 2005
New Revision: 153116

URL: http://svn.apache.org/viewcvs?view=rev&rev=153116
Log:
Docs update. Refresh as well as fold in (better??) docs
about balancer.

Modified:
    httpd/httpd/trunk/docs/manual/mod/allmodules.xml.ja
    httpd/httpd/trunk/docs/manual/mod/index.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_authnz_ldap.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_authz_owner.html
    httpd/httpd/trunk/docs/manual/mod/mod_authz_owner.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_authz_owner.xml.meta
    httpd/httpd/trunk/docs/manual/mod/mod_authz_user.html
    httpd/httpd/trunk/docs/manual/mod/mod_authz_user.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_authz_user.xml.meta
    httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml
    httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.xml
    httpd/httpd/trunk/docs/manual/mod/quickreference.html.en
    httpd/httpd/trunk/docs/manual/platform/netware.html.en
    httpd/httpd/trunk/docs/manual/platform/netware.xml.ko

Modified: httpd/httpd/trunk/docs/manual/mod/allmodules.xml.ja
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/allmodules.xml.ja?view=diff&r1=153115&r2=153116
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/allmodules.xml.ja (original)
+++ httpd/httpd/trunk/docs/manual/mod/allmodules.xml.ja Wed Feb  9 12:47:47 2005
@@ -16,8 +16,8 @@
   <modulefile>mod_authz_default.xml.ja</modulefile>
   <modulefile>mod_authz_groupfile.xml.ja</modulefile>
   <modulefile>mod_authz_host.xml.ja</modulefile>
-  <modulefile>mod_authz_owner.xml</modulefile>
-  <modulefile>mod_authz_user.xml</modulefile>
+  <modulefile>mod_authz_owner.xml.ja</modulefile>
+  <modulefile>mod_authz_user.xml.ja</modulefile>
   <modulefile>mod_autoindex.xml.ja</modulefile>
   <modulefile>mod_cache.xml.ja</modulefile>
   <modulefile>mod_cern_meta.xml</modulefile>

Modified: httpd/httpd/trunk/docs/manual/mod/index.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/index.html.en?view=diff&r1=153115&r2=153116
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/index.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/index.html.en Wed Feb  9 12:47:47 2005
@@ -147,8 +147,7 @@
 <dt><a href="mod_proxy.html" id="P" name="P">mod_proxy</a></dt><dd>HTTP/1.1
proxy/gateway server</dd>
 <dt><a href="mod_proxy_ajp.html">mod_proxy_ajp</a></dt><dd>AJP
support module for
 <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></dd>
-<dt><a href="mod_proxy_balancer.html">mod_proxy_balancer</a></dt><dd><code
class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> extension
for
-load balancing </dd>
+<dt><a href="mod_proxy_balancer.html">mod_proxy_balancer</a></dt><dd><code
class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> extension
for load balancing </dd>
 <dt><a href="mod_proxy_connect.html">mod_proxy_connect</a></dt><dd><code
class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> extension
for
 <code>CONNECT</code> request handling</dd>
 <dt><a href="mod_proxy_ftp.html">mod_proxy_ftp</a></dt><dd>FTP
support module for

Modified: httpd/httpd/trunk/docs/manual/mod/mod_authnz_ldap.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mod_authnz_ldap.html.en?view=diff&r1=153115&r2=153116
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_authnz_ldap.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_authnz_ldap.html.en Wed Feb  9 12:47:47 2005
@@ -542,12 +542,18 @@
 <div class="section">
 <h2><a name="usingtls" id="usingtls">Using TLS</a></h2>
 
-    <p>To use TLS, see the <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code>
directives <code class="directive"><a href="../mod/mod_ldap.html#ldaptrustedca">LDAPTrustedCA</a></code>
and <code class="directive"><a href="../mod/mod_ldap.html#ldaptrustedcatype">LDAPTrustedCAType</a></code>.</p>
+    <p>To use TLS, see the <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code>
directives <code class="directive"><a href="../mod/mod_ldap.html#ldaptrustedclientcert">LDAPTrustedClientCert</a></code>,
<code class="directive"><a href="../mod/mod_ldap.html#ldaptrustedglobalcert">LDAPTrustedGlobalCert</a></code>
and <code class="directive"><a href="../mod/mod_ldap.html#ldaptrustedmode">LDAPTrustedMode</a></code>.</p>
+
+    <p>An optional second parameter can be added to the 
+    <code class="directive"><a href="#authldapurl">AuthLDAPURL</a></code>
to override
+    the default connection type set by <code class="directive"><a href="../mod/mod_ldap.html#ldaptrustedmode">LDAPTrustedMode</a></code>.
+    This will allow the connection established by an <em>ldap://</em> Url 
+    to be upgraded to a secure connection on the same port.</p>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"
/></a></div>
 <div class="section">
 <h2><a name="usingssl" id="usingssl">Using SSL</a></h2>
 
-    <p>To use SSL, see the <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code>
directives <code class="directive"><a href="../mod/mod_ldap.html#ldaptrustedca">LDAPTrustedCA</a></code>
and <code class="directive"><a href="../mod/mod_ldap.html#ldaptrustedcatype">LDAPTrustedCAType</a></code>.</p>
+    <p>To use SSL, see the <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code>
directives <code class="directive"><a href="../mod/mod_ldap.html#ldaptrustedclientcert">LDAPTrustedClientCert</a></code>,
<code class="directive"><a href="../mod/mod_ldap.html#ldaptrustedglobalcert">LDAPTrustedGlobalCert</a></code>
and <code class="directive"><a href="../mod/mod_ldap.html#ldaptrustedmode">LDAPTrustedMode</a></code>.</p>
 
     <p>To specify a secure LDAP server, use <em>ldaps://</em> in the
     <code class="directive"><a href="#authldapurl">AuthLDAPURL</a></code>
@@ -799,7 +805,7 @@
 <div class="directive-section"><h2><a name="AuthLDAPUrl" id="AuthLDAPUrl">AuthLDAPUrl</a>
<a name="authldapurl" id="authldapurl">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>URL
specifying the LDAP search parameters</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPUrl
<em>url</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPUrl
<em>url [NONE|SSL|TLS|STARTTLS]</em></code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory,
.htaccess</td></tr>
 <tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
@@ -886,6 +892,22 @@
     a client attempts to connect using a username of <code>Babs
     Jenson</code>, the resulting search filter will be
     <code>(&amp;(posixid=*)(cn=Babs Jenson))</code>.</p>
+
+    <p>An optional parameter can be added to allow the LDAP Url to override 
+    the connection type.  This parameter can be one of the following:</p>
+
+<dl>
+    <dt>NONE</dt>
+        <dd>Establish an unsecure connection on the default LDAP port. This
+        is the same as <code>ldap://</code> on port 389.</dd>
+    <dt>SSL</dt>
+        <dd>Establish a secure connection on the default secure LDAP port.
+        This is the same as <code>ldaps://</code></dd>
+    <dt>TLS | STARTTLS</dt>
+        <dd>Establish an upgraded secure connection on the default LDAP port.
+        This connection will be initiated on port 389 by default and then 
+        upgraded to a secure connection on the same port.</dd>
+</dl>
 
     <p>See above for examples of <code class="directive"><a href="#authldapurl">AuthLDAPURL</a></code>
URLs.</p>
 

Modified: httpd/httpd/trunk/docs/manual/mod/mod_authz_owner.html
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mod_authz_owner.html?view=diff&r1=153115&r2=153116
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_authz_owner.html (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_authz_owner.html Wed Feb  9 12:47:47 2005
@@ -2,6 +2,10 @@
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
+URI: mod_authz_owner.html.ja.euc-jp
+Content-Language: ja
+Content-type: text/html; charset=EUC-JP
+
 URI: mod_authz_owner.html.ko.euc-kr
 Content-Language: ko
 Content-type: text/html; charset=EUC-KR

Modified: httpd/httpd/trunk/docs/manual/mod/mod_authz_owner.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mod_authz_owner.html.en?view=diff&r1=153115&r2=153116
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_authz_owner.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_authz_owner.html.en Wed Feb  9 12:47:47 2005
@@ -22,6 +22,7 @@
 <div id="preamble"><h1>Apache Module mod_authz_owner</h1>
 <div class="toplang">
 <p><span>Available Languages: </span><a href="../en/mod/mod_authz_owner.html"
title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_authz_owner.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a>
|
 <a href="../ko/mod/mod_authz_owner.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
 <table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Authorization
based on file ownership</td></tr>
@@ -176,6 +177,7 @@
 </div>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/mod/mod_authz_owner.html"
title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_authz_owner.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a>
|
 <a href="../ko/mod/mod_authz_owner.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
 <p class="apache">Copyright 1995-2005 The Apache Software Foundation or its licensors,
as applicable.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
License, Version 2.0</a>.</p>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_authz_owner.xml.meta
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mod_authz_owner.xml.meta?view=diff&r1=153115&r2=153116
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_authz_owner.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_authz_owner.xml.meta Wed Feb  9 12:47:47 2005
@@ -7,6 +7,7 @@
 
   <variants>
     <variant>en</variant>
+    <variant>ja</variant>
     <variant>ko</variant>
   </variants>
 </metafile>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_authz_user.html
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mod_authz_user.html?view=diff&r1=153115&r2=153116
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_authz_user.html (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_authz_user.html Wed Feb  9 12:47:47 2005
@@ -2,6 +2,10 @@
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
+URI: mod_authz_user.html.ja.euc-jp
+Content-Language: ja
+Content-type: text/html; charset=EUC-JP
+
 URI: mod_authz_user.html.ko.euc-kr
 Content-Language: ko
 Content-type: text/html; charset=EUC-KR

Modified: httpd/httpd/trunk/docs/manual/mod/mod_authz_user.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mod_authz_user.html.en?view=diff&r1=153115&r2=153116
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_authz_user.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_authz_user.html.en Wed Feb  9 12:47:47 2005
@@ -22,6 +22,7 @@
 <div id="preamble"><h1>Apache Module mod_authz_user</h1>
 <div class="toplang">
 <p><span>Available Languages: </span><a href="../en/mod/mod_authz_user.html"
title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_authz_user.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a>
|
 <a href="../ko/mod/mod_authz_user.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
 <table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>User
Authorization</td></tr>
@@ -75,6 +76,7 @@
 </div>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/mod/mod_authz_user.html"
title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_authz_user.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a>
|
 <a href="../ko/mod/mod_authz_user.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
 <p class="apache">Copyright 1995-2005 The Apache Software Foundation or its licensors,
as applicable.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
License, Version 2.0</a>.</p>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_authz_user.xml.meta
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mod_authz_user.xml.meta?view=diff&r1=153115&r2=153116
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_authz_user.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_authz_user.xml.meta Wed Feb  9 12:47:47 2005
@@ -7,6 +7,7 @@
 
   <variants>
     <variant>en</variant>
+    <variant>ja</variant>
     <variant>ko</variant>
   </variants>
 </metafile>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en?view=diff&r1=153115&r2=153116
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en Wed Feb  9 12:47:47 2005
@@ -99,6 +99,7 @@
 <li><code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code></li>
 <li><code class="module"><a href="../mod/mod_proxy_ftp.html">mod_proxy_ftp</a></code></li>
 <li><code class="module"><a href="../mod/mod_proxy_connect.html">mod_proxy_connect</a></code></li>
+<li><code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code></li>
 <li><code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code></li>
 </ul></div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"
/></a></div>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml?view=diff&r1=153115&r2=153116
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml Wed Feb  9 12:47:47 2005
@@ -65,6 +65,7 @@
 <seealso><module>mod_proxy_http</module></seealso>
 <seealso><module>mod_proxy_ftp</module></seealso>
 <seealso><module>mod_proxy_connect</module></seealso>
+<seealso><module>mod_proxy_balancer</module></seealso>
 <seealso><module>mod_ssl</module></seealso>
 
     <section id="forwardreverse"><title>Forward and Reverse Proxies</title>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.html.en?view=diff&r1=153115&r2=153116
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.html.en Wed Feb  9 12:47:47 2005
@@ -24,8 +24,7 @@
 <p><span>Available Languages: </span><a href="../en/mod/mod_proxy_balancer.html"
title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/mod_proxy_balancer.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div>
-<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td><code
class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> extension
for
-load balancing </td></tr>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td><code
class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> extension
for load balancing </td></tr>
 <tr><th><a href="module-dict.html#Status">Status:</a></th><td>Extension</td></tr>
 <tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>proxy_balancer_module</td></tr>
 <tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>proxy_balancer.c</td></tr>
@@ -52,6 +51,8 @@
 <h3>Topics</h3>
 <ul id="topics">
 <li><img alt="" src="../images/down.gif" /> <a href="#scheduler">Load balancer
scheduler algorithm</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#requests">Request
Counting Algorithm</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#traffic">Weighted
Traffic Counting Algorithm</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#enable">Enabling
Balancer Manager Support</a></li>
 </ul><h3>See also</h3>
 <ul class="seealso">
@@ -61,10 +62,25 @@
 <div class="section">
 <h2><a name="scheduler" id="scheduler">Load balancer scheduler algorithm</a></h2>
     
-    <p>The idea behind this scheduler is the following:</p>
+    <p>At present, there are 2 load balancer scheduler algorithms available
+    for use: Request Counting and Weighted Traffic Counting. These are controlled
+    via the <code>lbmethod</code> value of the Balancer definition. See
+    the <code class="directive"><a href="../mod/mod_proxy.html#proxy">Proxy</a></code>
directive for
+    more information.</p>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"
/></a></div>
+<div class="section">
+<h2><a name="requests" id="requests">Request Counting Algorithm</a></h2>
+    
+    <p>Enabled via <code>lbmethod=requests</code>, the idea behind this
+    scheduler is that we distribute the requests among the
+    various workers to ensure that each gets their configured share
+    of the number of requests. It works as follows:</p>
 
     <p><dfn>lbfactor</dfn> is <em>how much we expect this worker
-    to work</em>, or <em>the workers's work quota</em>.</p>
+    to work</em>, or <em>the workers's work quota</em>. This is
+    a normalized value representing their "share" of the amount of
+    work to be done.</p>
 
     <p><dfn>lbstatus</dfn> is <em>how urgent this worker has to work
     to fulfill its quota of work</em>.</p>
@@ -76,7 +92,8 @@
     which of them needs to work most urgently (biggest lbstatus).  This
     worker is then selected for work, and its lbstatus reduced by the
     total work quota we distributed to all workers.  Thus the sum of all
-    lbstatus does not change.(*)</p>
+    lbstatus does not change(*) and we distribute the requests
+    as desired.</p>
 
     <p>If some workers are disabled, the others will
     still be scheduled correctly.</p>
@@ -135,7 +152,49 @@
 
     <p>That is it schedules: <var>a</var> <var>c</var> <var>d</var>
     <var>a</var> <var>c</var> <var>d</var> <var>a</var>
<var>c</var>
-    <var>d</var> ...</p>
+    <var>d</var> ... Please note that:</p>
+
+    <table><tr><th>worker</th>
+        <th class="data">a</th>
+        <th class="data">b</th>
+        <th class="data">c</th>
+        <th class="data">d</th></tr>
+<tr><th>lbfactor</th>
+        <td class="data">25</td>
+        <td class="data">25</td>
+        <td class="data">25</td>
+        <td class="data">25</td></tr>
+</table>
+
+    <p>Has the exact same behavior as:</p>
+
+    <table><tr><th>worker</th>
+        <th class="data">a</th>
+        <th class="data">b</th>
+        <th class="data">c</th>
+        <th class="data">d</th></tr>
+<tr><th>lbfactor</th>
+        <td class="data">1</td>
+        <td class="data">1</td>
+        <td class="data">1</td>
+        <td class="data">1</td></tr>
+</table>
+
+    <p>This is because all values of <dfn>lbfactor</dfn> are normalized
+    with respect to the others. For:</p>
+
+    <table><tr><th>worker</th>
+        <th class="data">a</th>
+        <th class="data">b</th>
+        <th class="data">c</th></tr>
+<tr><th>lbfactor</th>
+        <td class="data">1</td>
+        <td class="data">4</td>
+        <td class="data">1</td></tr>
+</table>
+
+    <p>worker <var>b</var> will, on average, get 4 times the requests
+    that <var>a</var> and <var>c</var> will.</p>
 
     <p>The following asymmetric configuration works as one would expect:</p>
 
@@ -181,6 +240,39 @@
 
     <p>That is after 10 schedules, the schedule repeats and 7 <var>a</var>
     are selected with 3 <var>b</var> interspersed.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"
/></a></div>
+<div class="section">
+<h2><a name="traffic" id="traffic">Weighted Traffic Counting Algorithm</a></h2>
+    
+    <p>Enabled via <code>lbmethod=traffic</code>, the idea behind this
+    scheduler is very similar to the Request Counting method, with
+    the following changes:</p>
+
+    <p><dfn>lbfactor</dfn> is <em>how much traffic, in bytes, we
want
+    this worker to handle</em>. This is also a normalized value
+    representing their "share" of the amount of work to be done,
+    but instead of simply counting the number of requests, we take
+    into account the amount of traffic this worker has seen.</p>
+
+    <p>If a balancer is configured as follows:</p>
+    
+    <table><tr><th>worker</th>
+        <th class="data">a</th>
+        <th class="data">b</th>
+        <th class="data">c</th></tr>
+<tr><th>lbfactor</th>
+        <td class="data">1</td>
+        <td class="data">2</td>
+        <td class="data">1</td></tr>
+</table>
+
+    <p>Then we mean that we want <var>b</var> to process twice the
+    amount of bytes than <var>a</var> or <var>c</var> should. It
does
+    not necessarily mean that <var>b</var> would handle twice as
+    many requests, but it would process twice the I/O. Thus, the
+    size of the request and response are applied to the weighting
+    and selection algorithm.</p>
+
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"
/></a></div>
 <div class="section">
 <h2><a name="enable" id="enable">Enabling Balancer Manager Support</a></h2>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.xml?view=diff&r1=153115&r2=153116
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.xml Wed Feb  9 12:47:47 2005
@@ -23,8 +23,7 @@
 <modulesynopsis metafile="mod_proxy_balancer.xml.meta">
 
 <name>mod_proxy_balancer</name>
-<description><module>mod_proxy</module> extension for
-load balancing </description>
+<description><module>mod_proxy</module> extension for load balancing </description>
 <status>Extension</status>
 <sourcefile>proxy_balancer.c</sourcefile>
 <identifier>proxy_balancer_module</identifier>
@@ -51,10 +50,25 @@
 
 <section id="scheduler">
     <title>Load balancer scheduler algorithm</title>
-    <p>The idea behind this scheduler is the following:</p>
+    <p>At present, there are 2 load balancer scheduler algorithms available
+    for use: Request Counting and Weighted Traffic Counting. These are controlled
+    via the <code>lbmethod</code> value of the Balancer definition. See
+    the <directive module="mod_proxy">Proxy</directive> directive for
+    more information.</p>
+
+</section>
+
+<section id="requests">
+    <title>Request Counting Algorithm</title>
+    <p>Enabled via <code>lbmethod=requests</code>, the idea behind this
+    scheduler is that we distribute the requests among the
+    various workers to ensure that each gets their configured share
+    of the number of requests. It works as follows:</p>
 
     <p><dfn>lbfactor</dfn> is <em>how much we expect this worker
-    to work</em>, or <em>the workers's work quota</em>.</p>
+    to work</em>, or <em>the workers's work quota</em>. This is
+    a normalized value representing their "share" of the amount of
+    work to be done.</p>
 
     <p><dfn>lbstatus</dfn> is <em>how urgent this worker has to work
     to fulfill its quota of work</em>.</p>
@@ -66,7 +80,8 @@
     which of them needs to work most urgently (biggest lbstatus).  This
     worker is then selected for work, and its lbstatus reduced by the
     total work quota we distributed to all workers.  Thus the sum of all
-    lbstatus does not change.(*)</p>
+    lbstatus does not change(*) and we distribute the requests
+    as desired.</p>
 
     <p>If some workers are disabled, the others will
     still be scheduled correctly.</p>
@@ -128,7 +143,52 @@
 
     <p>That is it schedules: <var>a</var> <var>c</var> <var>d</var>
     <var>a</var> <var>c</var> <var>d</var> <var>a</var>
<var>c</var>
-    <var>d</var> ...</p>
+    <var>d</var> ... Please note that:</p>
+
+    <table style="data">
+    <tr><th>worker</th>
+        <th>a</th>
+        <th>b</th>
+        <th>c</th>
+        <th>d</th></tr>
+    <tr><th>lbfactor</th>
+        <td>25</td>
+        <td>25</td>
+        <td>25</td>
+        <td>25</td></tr>
+    </table>
+
+    <p>Has the exact same behavior as:</p>
+
+    <table style="data">
+    <tr><th>worker</th>
+        <th>a</th>
+        <th>b</th>
+        <th>c</th>
+        <th>d</th></tr>
+    <tr><th>lbfactor</th>
+        <td>1</td>
+        <td>1</td>
+        <td>1</td>
+        <td>1</td></tr>
+    </table>
+
+    <p>This is because all values of <dfn>lbfactor</dfn> are normalized
+    with respect to the others. For:</p>
+
+    <table style="data">
+    <tr><th>worker</th>
+        <th>a</th>
+        <th>b</th>
+        <th>c</th></tr>
+    <tr><th>lbfactor</th>
+        <td>1</td>
+        <td>4</td>
+        <td>1</td></tr>
+    </table>
+
+    <p>worker <var>b</var> will, on average, get 4 times the requests
+    that <var>a</var> and <var>c</var> will.</p>
 
     <p>The following asymmetric configuration works as one would expect:</p>
 
@@ -175,6 +235,40 @@
 
     <p>That is after 10 schedules, the schedule repeats and 7 <var>a</var>
     are selected with 3 <var>b</var> interspersed.</p>
+</section>
+
+<section id="traffic">
+    <title>Weighted Traffic Counting Algorithm</title>
+    <p>Enabled via <code>lbmethod=traffic</code>, the idea behind this
+    scheduler is very similar to the Request Counting method, with
+    the following changes:</p>
+
+    <p><dfn>lbfactor</dfn> is <em>how much traffic, in bytes, we
want
+    this worker to handle</em>. This is also a normalized value
+    representing their "share" of the amount of work to be done,
+    but instead of simply counting the number of requests, we take
+    into account the amount of traffic this worker has seen.</p>
+
+    <p>If a balancer is configured as follows:</p>
+    
+    <table style="data">
+    <tr><th>worker</th>
+        <th>a</th>
+        <th>b</th>
+        <th>c</th></tr>
+    <tr><th>lbfactor</th>
+        <td>1</td>
+        <td>2</td>
+        <td>1</td></tr>
+    </table>
+
+    <p>Then we mean that we want <var>b</var> to process twice the
+    amount of bytes than <var>a</var> or <var>c</var> should. It
does
+    not necessarily mean that <var>b</var> would handle twice as
+    many requests, but it would process twice the I/O. Thus, the
+    size of the request and response are applied to the weighting
+    and selection algorithm.</p>
+
 </section>
 
 <section id="enable">

Modified: httpd/httpd/trunk/docs/manual/mod/quickreference.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/quickreference.html.en?view=diff&r1=153115&r2=153116
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/quickreference.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/quickreference.html.en Wed Feb  9 12:47:47 2005
@@ -171,7 +171,7 @@
 group membership</td></tr>
 <tr class="odd"><td><a href="mod_authnz_ldap.html#authldapremoteuserisdn">AuthLDAPRemoteUserIsDN
on|off</a></td><td> off </td><td>dh</td><td>E</td></tr><tr
class="odd"><td class="descr" colspan="4">Use the DN of the client username to set
the REMOTE_USER
 environment variable</td></tr>
-<tr><td><a href="mod_authnz_ldap.html#authldapurl">AuthLDAPUrl <em>url</em></a></td><td></td><td>dh</td><td>E</td></tr><tr><td
class="descr" colspan="4">URL specifying the LDAP search parameters</td></tr>
+<tr><td><a href="mod_authnz_ldap.html#authldapurl">AuthLDAPUrl <em>url
[NONE|SSL|TLS|STARTTLS]</em></a></td><td></td><td>dh</td><td>E</td></tr><tr><td
class="descr" colspan="4">URL specifying the LDAP search parameters</td></tr>
 <tr class="odd"><td><a href="core.html#authname">AuthName <var>auth-domain</var></a></td><td></td><td>dh</td><td>C</td></tr><tr
class="odd"><td class="descr" colspan="4">Authorization realm for use in HTTP
 authentication</td></tr>
 <tr><td><a href="core.html#authtype">AuthType Basic|Digest</a></td><td></td><td>dh</td><td>C</td></tr><tr><td
class="descr" colspan="4">Type of user authentication</td></tr>

Modified: httpd/httpd/trunk/docs/manual/platform/netware.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/platform/netware.html.en?view=diff&r1=153115&r2=153116
==============================================================================
--- httpd/httpd/trunk/docs/manual/platform/netware.html.en (original)
+++ httpd/httpd/trunk/docs/manual/platform/netware.html.en Wed Feb  9 12:47:47 2005
@@ -514,28 +514,14 @@
         <li>Download the source code and unzip to an appropriate directory on
         your workstation.</li>
 
-        <li>Change directory to <code>\httpd-2.0\srclib\apr-util\uri</code>
and build
-        <code>GENURI.nlm</code> by running "<code>gmake -f nwgnumakefile</code>".</li>
-
-        <li>Copy the file <code>GENURI.nlm</code> to the <code>SYS:</code>
volume
-        of a NetWare server and run using the following command:
-          <div class="example"><p><code>SYS:\genuri &gt; sys:\uri_delims.h</code></p></div>
+        <li>Change directory to <code>\httpd-2.0</code> and build the prebuild
utilities
+        by running "<code>gmake -f nwgnumakefile prebuild</code>". This target
will create
+        the directory <code>\httpd-2.0\nwprebuild</code> and copy each of the
utilities 
+        to this location that are necessary to complete the following build steps.
         </li>
 
-        <li>Copy the file <code>uri_delims.h</code> to the directory
-        <code>\httpd-2.0\srclib\apr-util\uri</code> on the build machine.</li>
-
-        <li>Change directory to <code>\httpd-2.0\srclib\apr</code> and
build APR
-        by running "<code>gmake -f nwgnumakefile</code>"</li>
-
-        <li>Change directory to <code>\httpd-2.0\srclib\pcre</code> and
build
-        <code>DFTABLES.nlm</code> by running "<code>gmake -f nwgnumakefile</code>"</li>
-
-        <li>Change directory to <code>\httpd-2.0\server</code> and build
-        <code>GENCHARS.nlm</code> by running "<code>gmake -f nwgnumakefile</code>"</li>
-
-        <li>Copy the files <code>GENCHARS.nlm</code> and <code>DFTABLES.nlm</code>
-        from their respective directories to the <code>SYS:</code> volume of
a
+        <li>Copy the files <code>\httpd-2.0\nwprebuild\GENCHARS.nlm</code>
and 
+        <code>\httpd-2.0\nwprebuild\DFTABLES.nlm</code> to the <code>SYS:</code>
volume of a
         NetWare server and run them using the following commands:
           <div class="example"><p><code>
             SYS:\genchars &gt; sys:\test_char.h<br />
@@ -570,12 +556,15 @@
         distribution with binaries, docs and additional support files in a
         <code>\dist\Apache2</code> directory.</p></li>
 
+        <li><code>gmake -f nwgnumakefile prebuild</code><p>Builds
all of the prebuild utilities
+        and copies them to the <code>\nwprebuild</code> directory.</p></li>
+
         <li><code>gmake -f nwgnumakefile installdev</code><p>Same
as install but also creates a
         <code>\lib</code> and <code>\include</code> directory in
the destination directory
         and copies headers and import files.</p></li>
 
         <li><code>gmake -f nwgnumakefile clean</code><p>Cleans all
object files and binaries
-        from the <code>\release</code> or <code>\debug</code> build
areas depending on whether
+        from the <code>\release.o</code> or <code>\debug.o</code>
build areas depending on whether
         <code>DEBUG</code> has been defined.</p></li>
 
         <li><code>gmake -f nwgnumakefile clobber_all</code><p>Same
as clean and also deletes

Modified: httpd/httpd/trunk/docs/manual/platform/netware.xml.ko
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/platform/netware.xml.ko?view=diff&r1=153115&r2=153116
==============================================================================
--- httpd/httpd/trunk/docs/manual/platform/netware.xml.ko (original)
+++ httpd/httpd/trunk/docs/manual/platform/netware.xml.ko Wed Feb  9 12:47:47 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:151408 (outdated) -->
+<!-- English Revision: 105989:152957 (outdated) -->
 
 <!--
  Copyright 2004-2005 The Apache Software Foundation or its licensors,



Mime
View raw message