You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by nd...@apache.org on 2003/02/22 23:20:21 UTC
cvs commit: httpd-2.0/docs/manual/mod mod_setenvif.html.en mod_setenvif.xml
nd 2003/02/22 14:20:21
Modified: docs/manual content-negotiation.html.en
content-negotiation.xml env.html.en env.xml
docs/manual/mod mod_setenvif.html.en mod_setenvif.xml
Log:
document new features of setenvif and mod_negotiation.
Revision Changes Path
1.40 +13 -0 httpd-2.0/docs/manual/content-negotiation.html.en
Index: content-negotiation.html.en
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/content-negotiation.html.en,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- content-negotiation.html.en 9 Jan 2003 20:03:15 -0000 1.39
+++ content-negotiation.html.en 22 Feb 2003 22:20:20 -0000 1.40
@@ -483,6 +483,19 @@
specification and to work effectively with properly configured
clients.</p>
+ <p>In order to support advanced techniques (such as Cookies or
+ special URL-paths) to determine the user's preferred language,
+ since Apache 2.1 <code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code> recognizes
+ the <a href="env.html">environment variable</a>
+ <code>prefer-language</code>. If it exists and contains an
+ appropriate language tag, <code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code> will
+ try to select a matching variant. If there's no such variant,
+ the normal negotiation process applies.</p>
+
+ <div class="example"><h3>Example</h3><p><code>
+ SetEnvIf Cookie "language=(.+)" prefer-language=$1
+ </code></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="extensions" id="extensions">Extensions to Transparent Content
1.3 +13 -0 httpd-2.0/docs/manual/content-negotiation.xml
Index: content-negotiation.xml
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/content-negotiation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- content-negotiation.xml 9 Jan 2003 20:03:15 -0000 1.2
+++ content-negotiation.xml 22 Feb 2003 22:20:20 -0000 1.3
@@ -469,6 +469,19 @@
This is necessary to maintain compliance with the HTTP/1.1
specification and to work effectively with properly configured
clients.</p>
+
+ <p>In order to support advanced techniques (such as Cookies or
+ special URL-paths) to determine the user's preferred language,
+ since Apache 2.1 <module>mod_negotiation</module> recognizes
+ the <a href="env.html">environment variable</a>
+ <code>prefer-language</code>. If it exists and contains an
+ appropriate language tag, <module>mod_negotiation</module> will
+ try to select a matching variant. If there's no such variant,
+ the normal negotiation process applies.</p>
+
+ <example><title>Example</title>
+ SetEnvIf Cookie "language=(.+)" prefer-language=$1
+ </example>
</section>
</section>
1.37 +15 -5 httpd-2.0/docs/manual/env.html.en
Index: env.html.en
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/env.html.en,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- env.html.en 11 Dec 2002 21:33:36 -0000 1.36
+++ env.html.en 22 Feb 2003 22:20:20 -0000 1.37
@@ -213,10 +213,7 @@
mechanisms to modify the way Apache behaves when talking to
particular clients. To make these mechanisms as flexible as
possible, they are invoked by defining environment variables,
- typically with <code class="directive"><a href="./mod/mod_setenvif.html#browsermatch">BrowserMatch</a></code>,
- though <code class="directive"><a href="./mod/mod_env.html#setenv">SetEnv</a></code> and
- <code class="directive"><a href="./mod/mod_env.html#passenv">PassEnv</a></code> could also be used,
- for example.</p>
+ typically with <code class="directive"><a href="./mod/mod_setenvif.html#browsermatch">BrowserMatch</a></code>, though <code class="directive"><a href="./mod/mod_env.html#setenv">SetEnv</a></code> and <code class="directive"><a href="./mod/mod_env.html#passenv">PassEnv</a></code> could also be used, for example.</p>
<h3><a name="downgrade" id="downgrade">downgrade-1.0</a></h3>
@@ -265,9 +262,22 @@
<h3><a name="nokeepalive" id="nokeepalive">nokeepalive</a></h3>
- <p>This disables <code class="directive"><a href="./mod/core.html#keepalive">KeepAlive</a></code> when set.</p>
+ <p>This disables <code class="directive"><a href="./mod/core.html#keepalive">KeepAlive</a></code>
+ when set.</p>
+
+ <h3><a name="prefer-language" id="prefer-language">prefer-language</a></h3>
+
+ <p>This influences <code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code>'s behaviour. If
+ it contains a language tag (such as <code>en</code>, <code>ja</code>
+ or <code>x-klingon</code>), <code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code> tries
+ to deliver a variant with that language. If there's no such variant,
+ the normal <a href="content-negotiation.html">negotiation</a> process
+ applies.</p>
+
+
+
<h3><a name="redirect-carefully" id="redirect-carefully">redirect-carefully</a></h3>
1.9 +18 -5 httpd-2.0/docs/manual/env.xml
Index: env.xml
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/env.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- env.xml 2 Dec 2002 21:58:34 -0000 1.8
+++ env.xml 22 Feb 2003 22:20:20 -0000 1.9
@@ -239,10 +239,10 @@
mechanisms to modify the way Apache behaves when talking to
particular clients. To make these mechanisms as flexible as
possible, they are invoked by defining environment variables,
- typically with <directive module="mod_setenvif">BrowserMatch</directive>,
- though <directive module="mod_env">SetEnv</directive> and
- <directive module="mod_env">PassEnv</directive> could also be used,
- for example.</p>
+ typically with <directive module="mod_setenvif"
+ >BrowserMatch</directive>, though <directive module="mod_env"
+ >SetEnv</directive> and <directive module="mod_env"
+ >PassEnv</directive> could also be used, for example.</p>
<section id="downgrade">
<title>downgrade-1.0</title>
@@ -292,9 +292,22 @@
<section id="nokeepalive">
<title>nokeepalive</title>
- <p>This disables <directive module="core">KeepAlive</directive> when set.</p>
+ <p>This disables <directive module="core">KeepAlive</directive>
+ when set.</p>
</section>
+
+ <section id="prefer-language"><title>prefer-language</title>
+
+ <p>This influences <module>mod_negotiation</module>'s behaviour. If
+ it contains a language tag (such as <code>en</code>, <code>ja</code>
+ or <code>x-klingon</code>), <module>mod_negotiation</module> tries
+ to deliver a variant with that language. If there's no such variant,
+ the normal <a href="content-negotiation.html">negotiation</a> process
+ applies.</p>
+
+ </section>
+
<section id="redirect-carefully">
<title>redirect-carefully</title>
1.17 +4 -1 httpd-2.0/docs/manual/mod/mod_setenvif.html.en
Index: mod_setenvif.html.en
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mod_setenvif.html.en,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mod_setenvif.html.en 11 Dec 2002 21:18:13 -0000 1.16
+++ mod_setenvif.html.en 22 Feb 2003 22:20:21 -0000 1.17
@@ -207,7 +207,10 @@
<p>In the first form, the value will be set to "1". The second
will remove the given variable if already defined, and the
third will set the variable to the literal value given by
- <code><em>value</em></code>.</p>
+ <code><em>value</em></code>. Since version 2.1 Apache will
+ recognize occurrences of <code>$1</code>..<code>$9</code> within
+ <var>value</var> and replace them by parenthesized subexpressions
+ of <var>regex</var>.</p>
<div class="example"><h3>Example:</h3><p><code>
1.8 +4 -1 httpd-2.0/docs/manual/mod/mod_setenvif.xml
Index: mod_setenvif.xml
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mod_setenvif.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mod_setenvif.xml 12 Nov 2002 19:11:36 -0000 1.7
+++ mod_setenvif.xml 22 Feb 2003 22:20:21 -0000 1.8
@@ -189,7 +189,10 @@
<p>In the first form, the value will be set to "1". The second
will remove the given variable if already defined, and the
third will set the variable to the literal value given by
- <code><em>value</em></code>.</p>
+ <code><em>value</em></code>. Since version 2.1 Apache will
+ recognize occurrences of <code>$1</code>..<code>$9</code> within
+ <var>value</var> and replace them by parenthesized subexpressions
+ of <var>regex</var>.</p>
<example>
<title>Example:</title>