You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2006/07/06 21:25:30 UTC
svn commit: r419671 [1/3] - in /httpd/httpd/trunk/docs/manual: ./ misc/ mod/
rewrite/
Author: wrowe
Date: Thu Jul 6 12:25:28 2006
New Revision: 419671
URL: http://svn.apache.org/viewvc?rev=419671&view=rev
Log:
Might be my imagination, but seems full set hasn't been
generated in quite a while.
Modified:
httpd/httpd/trunk/docs/manual/content-negotiation.html.en
httpd/httpd/trunk/docs/manual/content-negotiation.xml.ja
httpd/httpd/trunk/docs/manual/content-negotiation.xml.ko
httpd/httpd/trunk/docs/manual/content-negotiation.xml.meta
httpd/httpd/trunk/docs/manual/misc/perf-tuning.html.en
httpd/httpd/trunk/docs/manual/misc/perf-tuning.xml.ko
httpd/httpd/trunk/docs/manual/mod/core.xml.de
httpd/httpd/trunk/docs/manual/mod/core.xml.ja
httpd/httpd/trunk/docs/manual/mod/index.html.en
httpd/httpd/trunk/docs/manual/mod/mod_dbd.html.en
httpd/httpd/trunk/docs/manual/mod/mod_isapi.xml.ko
httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.en
httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.html.en
httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.xml.ja
httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.xml.meta
httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en
httpd/httpd/trunk/docs/manual/mod/quickreference.html.en
httpd/httpd/trunk/docs/manual/rewrite/flags.html
httpd/httpd/trunk/docs/manual/rewrite/flags.html.en
httpd/httpd/trunk/docs/manual/sitemap.html.en
Modified: httpd/httpd/trunk/docs/manual/content-negotiation.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/content-negotiation.html.en?rev=419671&r1=419670&r2=419671&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/content-negotiation.html.en (original)
+++ httpd/httpd/trunk/docs/manual/content-negotiation.html.en Thu Jul 6 12:25:28 2006
@@ -504,6 +504,7 @@
<div class="example"><h3>Example</h3><p><code>
SetEnvIf Cookie "language=(.+)" prefer-language=$1
+ Header append Vary cookie
</code></p></div>
</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
Modified: httpd/httpd/trunk/docs/manual/content-negotiation.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/content-negotiation.xml.ja?rev=419671&r1=419670&r2=419671&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/content-negotiation.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/trunk/docs/manual/content-negotiation.xml.ja [iso-2022-jp] Thu Jul 6 12:25:28 2006
@@ -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: 395228 -->
+<!-- English Revision: 395228:418354 (outdated) -->
<!--
Copyright 2002-2006 The Apache Software Foundation or its licensors, as
Modified: httpd/httpd/trunk/docs/manual/content-negotiation.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/content-negotiation.xml.ko?rev=419671&r1=419670&r2=419671&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/content-negotiation.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/content-negotiation.xml.ko [euc-kr] Thu Jul 6 12:25:28 2006
@@ -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: 151408:395228 (outdated) -->
+<!-- English Revision: 151408:418354 (outdated) -->
<!--
Copyright 2003-2006 The Apache Software Foundation or its licensors,
Modified: httpd/httpd/trunk/docs/manual/content-negotiation.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/content-negotiation.xml.meta?rev=419671&r1=419670&r2=419671&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/content-negotiation.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/content-negotiation.xml.meta Thu Jul 6 12:25:28 2006
@@ -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/misc/perf-tuning.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/misc/perf-tuning.html.en?rev=419671&r1=419670&r2=419671&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/misc/perf-tuning.html.en (original)
+++ httpd/httpd/trunk/docs/manual/misc/perf-tuning.html.en Thu Jul 6 12:25:28 2006
@@ -110,7 +110,7 @@
Apache 1.3 this setting defaults to <code>Off</code>. If you need
to have addresses in your log files resolved to hostnames, use the
<code class="program"><a href="../programs/logresolve.html">logresolve</a></code>
- program that comes with Apache, on one of the numerous log
+ program that comes with Apache, or one of the numerous log
reporting packages which are available.</p>
<p>It is recommended that you do this sort of postprocessing of
Modified: httpd/httpd/trunk/docs/manual/misc/perf-tuning.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/misc/perf-tuning.xml.ko?rev=419671&r1=419670&r2=419671&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/misc/perf-tuning.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/misc/perf-tuning.xml.ko [euc-kr] Thu Jul 6 12:25:28 2006
@@ -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:395228 (outdated) -->
+<!-- English Revision: 105989:418315 (outdated) -->
<!--
Copyright 2004-2006 The Apache Software Foundation or its licensors,
Modified: httpd/httpd/trunk/docs/manual/mod/core.xml.de
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml.de?rev=419671&r1=419670&r2=419671&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml.de (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml.de Thu Jul 6 12:25:28 2006
@@ -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: 167959:415199 (outdated) -->
+<!-- English Revision: 167959:417237 (outdated) -->
<!--
Copyright 2003-2006 The Apache Software Foundation or its licensors,
Modified: httpd/httpd/trunk/docs/manual/mod/core.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml.ja?rev=419671&r1=419670&r2=419671&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml.ja [iso-2022-jp] Thu Jul 6 12:25:28 2006
@@ -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:415199 (outdated) -->
+<!-- English Revision: 190982:417237 (outdated) -->
<!--
Copyright 2003-2006 The Apache Software Foundation or its licensors,
Modified: httpd/httpd/trunk/docs/manual/mod/index.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/index.html.en?rev=419671&r1=419670&r2=419671&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/index.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/index.html.en Thu Jul 6 12:25:28 2006
@@ -78,6 +78,8 @@
filesystem in the document tree and for URL redirection</dd>
<dt><a href="mod_asis.html">mod_asis</a></dt><dd>Sends files that contain their own
HTTP headers</dd>
+<dt><a href="mod_aspdotnet.html">mod_aspdotnet</a></dt><dd>Provides an interface for ASP.NET content between Apache HTTP
+Server 2.0 and Microsoft's ASP.NET host.</dd>
<dt><a href="mod_auth_basic.html">mod_auth_basic</a></dt><dd>Basic authentication</dd>
<dt><a href="mod_auth_digest.html">mod_auth_digest</a></dt><dd>User authentication using MD5
Digest Authentication</dd>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_dbd.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_dbd.html.en?rev=419671&r1=419670&r2=419671&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_dbd.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_dbd.html.en Thu Jul 6 12:25:28 2006
@@ -260,4 +260,4 @@
</div><div id="footer">
<p class="apache">Copyright 1995-2006 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>
<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
-</body></html>
+</body></html>
\ No newline at end of file
Modified: httpd/httpd/trunk/docs/manual/mod/mod_isapi.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_isapi.xml.ko?rev=419671&r1=419670&r2=419671&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_isapi.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_isapi.xml.ko [euc-kr] Thu Jul 6 12:25:28 2006
@@ -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: 395228:413220 (outdated) -->
+<!-- English Revision: 395228:417237 (outdated) -->
<!--
Copyright 2004-2006 The Apache Software Foundation or its licensors,
Modified: httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.en?rev=419671&r1=419670&r2=419671&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.en Thu Jul 6 12:25:28 2006
@@ -102,8 +102,8 @@
Order deny,allow<br />
Deny from all<br />
Allow from yourdomain.example.com<br />
- AuthLDAPEnabled on<br />
AuthLDAPURL ldap://127.0.0.1/dc=example,dc=com?uid?one<br />
+ AuthzLDAPAuthoritative off<br />
require valid-user<br />
</span>
</Location>
@@ -230,8 +230,8 @@
Order deny,allow<br />
Deny from all<br />
Allow from yourdomain.example.com<br />
- AuthLDAPEnabled on<br />
AuthLDAPURL ldaps://127.0.0.1/dc=example,dc=com?uid?one<br />
+ AuthzLDAPAuthoritative off<br />
require valid-user<br />
</span>
</Location>
@@ -250,8 +250,8 @@
Order deny,allow<br />
Deny from all<br />
Allow from yourdomain.example.com<br />
- AuthLDAPEnabled on<br />
AuthLDAPURL ldap://127.0.0.1/dc=example,dc=com?uid?one TLS<br />
+ AuthzLDAPAuthoritative off<br />
require valid-user<br />
</span>
</Location>
@@ -301,9 +301,9 @@
Order deny,allow<br />
Deny from all<br />
Allow from yourdomain.example.com<br />
- AuthLDAPEnabled on<br />
LDAPTrustedClientCert CERT_NICKNAME <nickname> [password]<br />
AuthLDAPURL ldaps://127.0.0.1/dc=example,dc=com?uid?one<br />
+ AuthzLDAPAuthoritative off<br />
require valid-user<br />
</span>
</Location>
@@ -367,10 +367,10 @@
Order deny,allow<br />
Deny from all<br />
Allow from yourdomain.example.com<br />
- AuthLDAPEnabled on<br />
LDAPTrustedClientCert CERT_BASE64 /certs/cert1.pem<br />
LDAPTrustedClientCert KEY_BASE64 /certs/key1.pem<br />
AuthLDAPURL ldaps://127.0.0.1/dc=example,dc=com?uid?one<br />
+ AuthzLDAPAuthoritative off<br />
require valid-user<br />
</span>
</Location>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.html.en?rev=419671&r1=419670&r2=419671&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.html.en Thu Jul 6 12:25:28 2006
@@ -53,6 +53,7 @@
<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="#environment">Exported Environment Variables</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">
@@ -272,6 +273,47 @@
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="environment" id="environment">Exported Environment Variables</a></h2>
+
+ <p>At present there are 5 environment variables exported:</p>
+
+
+ <dt><var><a name="balancer_session_sticky" id="balancer_session_sticky">BALANCER_SESSION_STICKY</a></var></dt>
+ <dd>
+ <p>This is assigned the <var>stickysession</var> value used in the current
+ request. It is the cookie or parameter name used for sticky sessions</p>
+ </dd>
+
+
+ <dt><var><a name="balancer_session_route" id="balancer_session_route">BALANCER_SESSION_ROUTE</a></var></dt>
+ <dd>
+ <p>This is assigned the <var>route</var> parsed from the current
+ request.</p>
+ </dd>
+
+
+ <dt><var><a name="balancer_name" id="balancer_name">BALANCER_NAME</a></var></dt>
+ <dd>
+ <p>This is assigned the name of the balancer used for the current
+ request. The value is something like <code>balancer://foo</code>.</p>
+ </dd>
+
+
+ <dt><var><a name="balancer_worker_name" id="balancer_worker_name">BALANCER_WORKER_NAME</a></var></dt>
+ <dd>
+ <p>This is assigned the name of the worker used for the current request.
+ The value is something like <code>http://hostA:1234</code>.</p>
+ </dd>
+
+
+ <dt><var><a name="balancer_worker_route" id="balancer_worker_route">BALANCER_WORKER_ROUTE</a></var></dt>
+ <dd>
+ <p>This is assigned the <var>route</var> of the worker that will be
+ used for the current request.</p>
+ </dd>
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.xml.ja?rev=419671&r1=419670&r2=419671&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.xml.ja [iso-2022-jp] Thu Jul 6 12:25:28 2006
@@ -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: 395228 -->
+<!-- English Revision: 395228:417238 (outdated) -->
<!--
Copyright 2004-2006 The Apache Software Foundation or its licensors, as
Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.xml.meta?rev=419671&r1=419670&r2=419671&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.xml.meta Thu Jul 6 12:25:28 2006
@@ -7,6 +7,6 @@
<variants>
<variant>en</variant>
- <variant>ja</variant>
+ <variant outdated="yes">ja</variant>
</variants>
</metafile>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en?rev=419671&r1=419670&r2=419671&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en Thu Jul 6 12:25:28 2006
@@ -1405,34 +1405,38 @@
</li>
</ul>
-<div class="note"><h3>Note: Enabling rewrites in per-directory context</h3>
- To enable the rewrite engine
- for per-directory configuration files you need to set
- ``<code>RewriteEngine On</code>'' in these files
- <strong>and</strong> ``<code>Options
- FollowSymLinks</code>'' must be enabled. If your
- administrator has disabled override of
- <code>FollowSymLinks</code> for a user's directory, then
- you cannot use the rewrite engine. This restriction is
- required for security reasons.
-</div>
+<div class="note"><h3>Per-directory Rewrites</h3>
+
+<p>The rewrite engine may be used in <a href="../howto/htaccess.html">.htaccess</a> files. To enable the
+rewrite engine for these files you need to set
+"<code>RewriteEngine On</code>" <strong>and</strong>
+"<code>Options FollowSymLinks</code>" must be enabled. If your
+administrator has disabled override of <code>FollowSymLinks</code> for
+a user's directory, then you cannot use the rewrite engine. This
+restriction is required for security reasons.</p>
-<div class="note"><h3>Note: Pattern matching in per-directory context</h3>
- Never forget that <em>Pattern</em> is
-applied to a complete URL in per-server configuration
-files. <strong>However, in per-directory configuration files, the
+<p>When using the rewrite engine in <code>.htaccess</code> files the
per-directory prefix (which always is the same for a specific
directory) is automatically <em>removed</em> for the pattern matching
and automatically <em>added</em> after the substitution has been
-done.</strong> This feature is essential for many sorts of rewriting -
-without this, you would always have to match the parent
-directory, which is not always possible.
+done. This feature is essential for many sorts of rewriting; without
+this, you would always have to match the parent directory, which is
+not always possible. There is one exception: If a substitution string
+starts with <code>http://</code>, then the directory prefix will
+<strong>not</strong> be added, and an external redirect (or proxy
+throughput, if using flag <strong>P</strong>) is forced. See the
+<code class="directive"><a href="#rewritebase">RewriteBase</a></code> directive for
+more information.</p>
+
+<p>The rewrite engine may also be used in <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> sections with the same
+prefix-matching rules as would be applied to <code>.htaccess</code>
+files. It is usually simpler, however, to avoid the prefix substitution
+complication by putting the rewrite rules in the main server or
+virtual host context, rather than in a <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> section.</p>
+
+<p>Although rewrite rules are syntactically permitted in <code class="directive"><a href="../mod/core.html#location"><Location></a></code> sections, this
+should never be necessary and is unsupported.</p>
- <p>There is one exception: If a substitution string
- starts with ``<code>http://</code>'', then the directory
- prefix will <strong>not</strong> be added ,and an
- external redirect (or proxy throughput, if using flag
- <strong>P</strong>) is forced!</p>
</div>
<div class="note"><h3>Note: Substitution of Absolute URLs</h3>