From: Rich Bowen Date: Tue, 27 Jun 2006 10:48:14 +0000 (+0000) Subject: A variety of small tweaks, including the changes that Noirin and Joshua X-Git-Tag: 2.3.0~2306 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95e8595e96273cd5eef8d5c0ab904ade211c9a9a;p=thirdparty%2Fapache%2Fhttpd.git A variety of small tweaks, including the changes that Noirin and Joshua suggested in phrasing in the flags document. Still a lot left to do. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@417413 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/rewrite/flags.html.en b/docs/manual/rewrite/flags.html.en index add1212626c..4e2510e6913 100644 --- a/docs/manual/rewrite/flags.html.en +++ b/docs/manual/rewrite/flags.html.en @@ -27,9 +27,8 @@ providing more detailed explanations and examples of each.

See also

+

See also

top

Introduction

@@ -37,6 +36,14 @@ advanced problems
their behavior modified by one or more flags. Flags are included in square brackets at the end of the rule, and multiple flags are separated by commas.

+

+RewriteRule pattern target [Flag1,Flag2,Flag3] +

+ +

The flags all have a short form, such as CO, as well as +a longer form, such as cookie. Some flags take one or more +arguments. Flags are not case sensitive.

+
top

The flags

@@ -52,7 +59,7 @@ of how you might use them.

The [C] or [chain] flag indicates that the RewriteRule is chained to the next rule. That is, if the rule matches, then it is processed as usual and control moves on to the next rule. However, if it does not match, then -the next rule, and any other ruls that are chained together, will be +the next rule, and any other rules that are chained together, will be skipped.

@@ -87,9 +94,10 @@ minutes (24 hours) and will be returned for all URIs.

E|env

With the [E], or [env] flag, you can set the value of an environment -variable. Note that some variables may be set after the rule is run, and -so setting them in the RewriteRule won't work, since it will -be changed afterwards.

+variable. Note that some environment variables may be set after the rule +is run, thus unsetting what you have set. See the +Environment Variables document for more details on how Environment +variables work.

The following example sets an evironment variable called 'image' to a value of '1' if the requested URI is an image file. Then, that @@ -110,7 +118,7 @@ an example, not as a recommendation.

G|gone

-

Forbidden flag

+

Gone flag

H|handler

diff --git a/docs/manual/rewrite/flags.xml b/docs/manual/rewrite/flags.xml index d3ffaf61a77..12ed6d2bb34 100644 --- a/docs/manual/rewrite/flags.xml +++ b/docs/manual/rewrite/flags.xml @@ -33,10 +33,9 @@ providing more detailed explanations and examples of each.

Module documentation Technical details -Practical solutions to common -problems -Practical solutions to -advanced problems +Rewrite Guide - useful examples +Advanced Rewrite Guide - +advanced useful examples
Introduction

RewriteRules can have @@ -67,7 +66,7 @@ of how you might use them.

module="mod_rewrite">RewriteRule is chained to the next rule. That is, if the rule matches, then it is processed as usual and control moves on to the next rule. However, if it does not match, then -the next rule, and any other ruls that are chained together, will be +the next rule, and any other rules that are chained together, will be skipped.

@@ -102,10 +101,10 @@ minutes (24 hours) and will be returned for all URIs.

E|env

With the [E], or [env] flag, you can set the value of an environment -variable. Note that some variables may be set after the rule is run, and -so setting them in the RewriteRule won't work, since it will -be changed afterwards.

+variable. Note that some environment variables may be set after the rule +is run, thus unsetting what you have set. See the +Environment Variables document for more details on how Environment +variables work.

The following example sets an evironment variable called 'image' to a value of '1' if the requested URI is an image file. Then, that diff --git a/docs/manual/rewrite/index.html.en b/docs/manual/rewrite/index.html.en index 2dd84798ab8..bbd54df05c2 100644 --- a/docs/manual/rewrite/index.html.en +++ b/docs/manual/rewrite/index.html.en @@ -71,7 +71,7 @@

See also

+advanced useful examples
top

Documentation

diff --git a/docs/manual/rewrite/index.xml b/docs/manual/rewrite/index.xml index 901b0873c5e..f74f9b1a221 100644 --- a/docs/manual/rewrite/index.xml +++ b/docs/manual/rewrite/index.xml @@ -81,7 +81,7 @@ documentation Technical details Rewrite Guide - useful examples Advanced Rewrite Guide - -more useful examples +advanced useful examples
Documentation

See also

+introduction
  • Advanced Rewrite Guide - advanced +useful examples
  • Technical details
    • top

    Canonical URLs

    @@ -418,7 +418,7 @@ RewriteRule ^(/~.+) http://www.somewhere.com/$1 [R,L]
    top
    -

    Time-Dependent Rewriting

    +

    Time-Dependent Rewriting

    @@ -587,7 +587,8 @@ RewriteRule ^foo\.html$ bar.html [

    We just rewrite the URL to the CGI-script and force the - correct MIME-type so it gets really run as a CGI-script. + handler to be cgi-script so that it is + executed as a CGI program. This way a request to /~quux/foo.html internally leads to the invocation of /~quux/foo.cgi.

    @@ -595,7 +596,7 @@ RewriteRule ^foo\.html$ bar.html [
     RewriteEngine  on
 RewriteBase    /~quux/
-RewriteRule    ^foo\.html$  foo.cgi  [T=application/x-httpd-cgi]
+RewriteRule    ^foo\.html$  foo.cgi  [H=cgi-script]
    diff --git a/docs/manual/rewrite/rewrite_guide.xml b/docs/manual/rewrite/rewrite_guide.xml index e77d61c9b8d..4853089c1d6 100644 --- a/docs/manual/rewrite/rewrite_guide.xml +++ b/docs/manual/rewrite/rewrite_guide.xml @@ -49,8 +49,8 @@ documentation mod_rewrite introduction -Practical solutions to -advanced problems +Advanced Rewrite Guide - advanced +useful examples Technical details @@ -413,7 +413,7 @@ RewriteRule ^(/~.+) http://www.somewhere.com/$1 [R,L] -
    +
    Time-Dependent Rewriting @@ -582,7 +582,8 @@ RewriteRule ^foo\.html$ bar.html [

    We just rewrite the URL to the CGI-script and force the - correct MIME-type so it gets really run as a CGI-script. + handler to be cgi-script so that it is + executed as a CGI program. This way a request to /~quux/foo.html internally leads to the invocation of /~quux/foo.cgi.

    @@ -590,7 +591,7 @@ RewriteRule ^foo\.html$ bar.html [
     RewriteEngine  on
 RewriteBase    /~quux/
-RewriteRule    ^foo\.html$  foo.cgi  [T=application/x-httpd-cgi]
+RewriteRule    ^foo\.html$  foo.cgi  [H=cgi-script]
    diff --git a/docs/manual/rewrite/rewrite_guide_advanced.html.en b/docs/manual/rewrite/rewrite_guide_advanced.html.en index 021ade97617..0466db44f42 100644 --- a/docs/manual/rewrite/rewrite_guide_advanced.html.en +++ b/docs/manual/rewrite/rewrite_guide_advanced.html.en @@ -49,8 +49,8 @@
  • Access Restriction

    • See also

    +introduction
  • Rewrite Guide - useful +examples
  • Technical details
    • top

    Webcluster through Homogeneous URL Layout

    diff --git a/docs/manual/rewrite/rewrite_guide_advanced.xml b/docs/manual/rewrite/rewrite_guide_advanced.xml index 4583127c2ed..5de97e1f89c 100644 --- a/docs/manual/rewrite/rewrite_guide_advanced.xml +++ b/docs/manual/rewrite/rewrite_guide_advanced.xml @@ -49,8 +49,8 @@ documentation mod_rewrite introduction -Practical solutions to common -problems +Rewrite Guide - useful +examples Technical details diff --git a/docs/manual/rewrite/rewrite_intro.html.en b/docs/manual/rewrite/rewrite_intro.html.en index d6509ee4f53..461caea6aff 100644 --- a/docs/manual/rewrite/rewrite_intro.html.en +++ b/docs/manual/rewrite/rewrite_intro.html.en @@ -37,9 +37,8 @@ but this doc should help the beginner get their feet wet.
  • .htaccess files
  • Environment Variables

    • See also

    +documentation
  • Technical details
  • Rewrite Guide - useful examples
  • Advanced Rewrite Guide - +advanced useful examples
    • top

    Introduction

    diff --git a/docs/manual/rewrite/rewrite_intro.xml b/docs/manual/rewrite/rewrite_intro.xml index 94cd013330e..a024acc58d2 100644 --- a/docs/manual/rewrite/rewrite_intro.xml +++ b/docs/manual/rewrite/rewrite_intro.xml @@ -37,10 +37,9 @@ but this doc should help the beginner get their feet wet. Module documentation Technical details -Practical solutions to common -problems -Practical solutions to -advanced problems +Rewrite Guide - useful examples +Advanced Rewrite Guide - +advanced useful examples
    Introduction

    The Apache module mod_rewrite is a very powerful and diff --git a/docs/manual/rewrite/rewrite_tech.html.en b/docs/manual/rewrite/rewrite_tech.html.en index 23b982f123c..88a1996a634 100644 --- a/docs/manual/rewrite/rewrite_tech.html.en +++ b/docs/manual/rewrite/rewrite_tech.html.en @@ -29,9 +29,9 @@ and URL matching.

  • Ruleset Processing

    • See also

    +introduction
  • Rewrite Guide - useful +examples
  • Advanced Rewrite Guide - +advanced useful examples
    • top

    Internal Processing

    diff --git a/docs/manual/rewrite/rewrite_tech.xml b/docs/manual/rewrite/rewrite_tech.xml index 33af0b689aa..31491558454 100644 --- a/docs/manual/rewrite/rewrite_tech.xml +++ b/docs/manual/rewrite/rewrite_tech.xml @@ -33,10 +33,10 @@ and URL matching.

    documentation mod_rewrite introduction -Practical solutions to common -problems -Practical solutions to -advanced problems +Rewrite Guide - useful +examples +Advanced Rewrite Guide - +advanced useful examples
    Internal Processing