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/03/19 15:58:55 UTC
cvs commit: httpd-2.0/docs/manual/mod mod_nw_ssl.html.en mod_rewrite.html.en mod_rewrite.xml quickreference.html.de quickreference.html.en quickreference.html.ru.koi8-r
nd 2003/03/19 06:58:55
Modified: docs/manual/mod Tag: APACHE_2_0_BRANCH mod_rewrite.html.en
mod_rewrite.xml quickreference.html.de
quickreference.html.en
quickreference.html.ru.koi8-r
Added: docs/manual/mod Tag: APACHE_2_0_BRANCH mod_nw_ssl.html.en
Log:
backport from 2.1:
uh, I forgot to add the transformated mod_nw_ssl.html ;-)
additionally RewriteOptions was now introduced in 2.0.45.
Revision Changes Path
No revision
No revision
1.16.2.3 +21 -10 httpd-2.0/docs/manual/mod/mod_rewrite.html.en
Index: mod_rewrite.html.en
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mod_rewrite.html.en,v
retrieving revision 1.16.2.2
retrieving revision 1.16.2.3
diff -u -r1.16.2.2 -r1.16.2.3
--- mod_rewrite.html.en 19 Jan 2003 03:48:29 -0000 1.16.2.2
+++ mod_rewrite.html.en 19 Mar 2003 14:58:53 -0000 1.16.2.3
@@ -1153,11 +1153,14 @@
<div class="directive-section"><h2><a name="RewriteOptions" id="RewriteOptions">RewriteOptions</a> <a name="rewriteoptions" id="rewriteoptions">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets some special options for the rewrite engine</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RewriteOptions <em>Options</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RewriteOptions <var>Options</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>RewriteOptions MaxRedirects=10</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>Extension</td></tr>
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_rewrite</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td><code>MaxRedirects</code> is available in Apache 2.0.45 and
+later</td></tr>
</table>
<p>The <code class="directive">RewriteOptions</code> directive sets some
@@ -1165,15 +1168,23 @@
configuration. The <em>Option</em> strings can be one of the
following:</p>
- <ul>
- <li>'<strong><code>inherit</code></strong>'<br />
- This forces the current configuration to inherit the
- configuration of the parent. In per-virtual-server context
- this means that the maps, conditions and rules of the main
- server are inherited. In per-directory context this means
- that conditions and rules of the parent directory's
- <code>.htaccess</code> configuration are inherited.</li>
- </ul>
+ <dl>
+ <dt><code>inherit</code></dt>
+ <dd>This forces the current configuration to inherit the
+ configuration of the parent. In per-virtual-server context
+ this means that the maps, conditions and rules of the main
+ server are inherited. In per-directory context this means
+ that conditions and rules of the parent directory's
+ <code>.htaccess</code> configuration are inherited.</dd>
+
+ <dt><code>MaxRedirects=<var>number</var></code></dt>
+ <dd>In order to prevent endless loops of internal redirects
+ issued by per-directory <code class="directive"><a href="#rewriterule">RewriteRule</a></code>s, <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> aborts
+ the request after reaching a maximum number of such redirects and
+ responds with an 500 Internal Server Error. If you really need
+ more internal redirects than 10 per request, you may increase
+ the default to the desired value.</dd>
+ </dl>
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
1.11.2.2 +22 -10 httpd-2.0/docs/manual/mod/mod_rewrite.xml
Index: mod_rewrite.xml
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mod_rewrite.xml,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -r1.11.2.1 -r1.11.2.2
--- mod_rewrite.xml 19 Jan 2003 03:48:30 -0000 1.11.2.1
+++ mod_rewrite.xml 19 Mar 2003 14:58:54 -0000 1.11.2.2
@@ -308,10 +308,13 @@
<directivesynopsis>
<name>RewriteOptions</name>
<description>Sets some special options for the rewrite engine</description>
-<syntax>RewriteOptions <em>Options</em></syntax>
+<syntax>RewriteOptions <var>Options</var></syntax>
+<default>RewriteOptions MaxRedirects=10</default>
<contextlist><context>server config</context><context>virtual host</context>
<context>directory</context><context>.htaccess</context></contextlist>
<override>FileInfo</override>
+<compatibility><code>MaxRedirects</code> is available in Apache 2.0.45 and
+later</compatibility>
<usage>
<p>The <directive>RewriteOptions</directive> directive sets some
@@ -319,15 +322,24 @@
configuration. The <em>Option</em> strings can be one of the
following:</p>
- <ul>
- <li>'<strong><code>inherit</code></strong>'<br />
- This forces the current configuration to inherit the
- configuration of the parent. In per-virtual-server context
- this means that the maps, conditions and rules of the main
- server are inherited. In per-directory context this means
- that conditions and rules of the parent directory's
- <code>.htaccess</code> configuration are inherited.</li>
- </ul>
+ <dl>
+ <dt><code>inherit</code></dt>
+ <dd>This forces the current configuration to inherit the
+ configuration of the parent. In per-virtual-server context
+ this means that the maps, conditions and rules of the main
+ server are inherited. In per-directory context this means
+ that conditions and rules of the parent directory's
+ <code>.htaccess</code> configuration are inherited.</dd>
+
+ <dt><code>MaxRedirects=<var>number</var></code></dt>
+ <dd>In order to prevent endless loops of internal redirects
+ issued by per-directory <directive module="mod_rewrite"
+ >RewriteRule</directive>s, <module>mod_rewrite</module> aborts
+ the request after reaching a maximum number of such redirects and
+ responds with an 500 Internal Server Error. If you really need
+ more internal redirects than 10 per request, you may increase
+ the default to the desired value.</dd>
+ </dl>
</usage>
</directivesynopsis>
1.1.2.11 +1 -1 httpd-2.0/docs/manual/mod/quickreference.html.de
Index: quickreference.html.de
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/mod/quickreference.html.de,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- quickreference.html.de 19 Mar 2003 00:47:28 -0000 1.1.2.10
+++ quickreference.html.de 19 Mar 2003 14:58:54 -0000 1.1.2.11
@@ -534,7 +534,7 @@
engine</td></tr>
<tr><td><a href="mod_rewrite.html#rewritemap">RewriteMap <em>MapName</em> <em>MapType</em>:<em>MapSource</em>
</a></td><td /><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Defines a mapping function for key-lookup</td></tr>
-<tr class="odd"><td><a href="mod_rewrite.html#rewriteoptions">RewriteOptions <em>Options</em></a></td><td /><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets some special options for the rewrite engine</td></tr>
+<tr class="odd"><td><a href="mod_rewrite.html#rewriteoptions">RewriteOptions <var>Options</var></a></td><td> MaxRedirects=10 </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets some special options for the rewrite engine</td></tr>
<tr><td><a href="mod_rewrite.html#rewriterule">RewriteRule
<em>Pattern</em> <em>Substitution</em></a></td><td /><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Defines rules for the rewriting engine</td></tr>
<tr class="odd"><td><a href="core.html#rlimitcpu">RLimitCPU <var>Sekunden</var>|max [<var>Sekunden</var>|max]</a></td><td /><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Begrenzt den CPU-Verbrauch von Prozessen, die von
1.47.2.24 +1 -1 httpd-2.0/docs/manual/mod/quickreference.html.en
Index: quickreference.html.en
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/mod/quickreference.html.en,v
retrieving revision 1.47.2.23
retrieving revision 1.47.2.24
diff -u -r1.47.2.23 -r1.47.2.24
--- quickreference.html.en 19 Mar 2003 00:47:28 -0000 1.47.2.23
+++ quickreference.html.en 19 Mar 2003 14:58:54 -0000 1.47.2.24
@@ -525,7 +525,7 @@
engine</td></tr>
<tr><td><a href="mod_rewrite.html#rewritemap">RewriteMap <em>MapName</em> <em>MapType</em>:<em>MapSource</em>
</a></td><td /><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Defines a mapping function for key-lookup</td></tr>
-<tr class="odd"><td><a href="mod_rewrite.html#rewriteoptions">RewriteOptions <em>Options</em></a></td><td /><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets some special options for the rewrite engine</td></tr>
+<tr class="odd"><td><a href="mod_rewrite.html#rewriteoptions">RewriteOptions <var>Options</var></a></td><td> MaxRedirects=10 </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets some special options for the rewrite engine</td></tr>
<tr><td><a href="mod_rewrite.html#rewriterule">RewriteRule
<em>Pattern</em> <em>Substitution</em></a></td><td /><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Defines rules for the rewriting engine</td></tr>
<tr class="odd"><td><a href="core.html#rlimitcpu">RLimitCPU <var>seconds</var>|max [<var>seconds</var>|max]</a></td><td /><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Limits the CPU consumption of processes launched
1.1.2.4 +1 -1 httpd-2.0/docs/manual/mod/Attic/quickreference.html.ru.koi8-r
Index: quickreference.html.ru.koi8-r
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/mod/Attic/quickreference.html.ru.koi8-r,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- quickreference.html.ru.koi8-r 19 Mar 2003 00:47:29 -0000 1.1.2.3
+++ quickreference.html.ru.koi8-r 19 Mar 2003 14:58:55 -0000 1.1.2.4
@@ -527,7 +527,7 @@
engine</td></tr>
<tr><td><a href="mod_rewrite.html#rewritemap">RewriteMap <em>MapName</em> <em>MapType</em>:<em>MapSource</em>
</a></td><td /><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Defines a mapping function for key-lookup</td></tr>
-<tr class="odd"><td><a href="mod_rewrite.html#rewriteoptions">RewriteOptions <em>Options</em></a></td><td /><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets some special options for the rewrite engine</td></tr>
+<tr class="odd"><td><a href="mod_rewrite.html#rewriteoptions">RewriteOptions <var>Options</var></a></td><td> MaxRedirects=10 </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets some special options for the rewrite engine</td></tr>
<tr><td><a href="mod_rewrite.html#rewriterule">RewriteRule
<em>Pattern</em> <em>Substitution</em></a></td><td /><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Defines rules for the rewriting engine</td></tr>
<tr class="odd"><td><a href="core.html#rlimitcpu">RLimitCPU <var>seconds</var>|max [<var>seconds</var>|max]</a></td><td /><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Limits the CPU consumption of processes launched
No revision
No revision
1.1.2.1 +2 -2 httpd-2.0/docs/manual/mod/mod_nw_ssl.html.en
Index: mod_nw_ssl.html.en
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mod_nw_ssl.html.en,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- mod_nw_ssl.html.en 19 Mar 2003 14:57:40 -0000 1.1
+++ mod_nw_ssl.html.en 19 Mar 2003 14:58:53 -0000 1.1.2.1
@@ -13,11 +13,11 @@
<body>
<div id="page-header">
<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>
-<p class="apache">Apache HTTP Server Version 2.1</p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
<img alt="" src="../images/feather.gif" /></div>
<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
<div id="path">
-<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.1</a> > <a href="./">Modules</a></div>
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
<div id="page-content">
<div id="preamble"><h1>Apache Module mod_nw_ssl</h1>
<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Enable SSL encryption for NetWare</td></tr>