Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 96610 invoked from network); 21 Sep 2010 13:02:27 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 21 Sep 2010 13:02:27 -0000 Received: (qmail 97026 invoked by uid 500); 21 Sep 2010 13:02:27 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 96804 invoked by uid 500); 21 Sep 2010 13:02:24 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 96797 invoked by uid 99); 21 Sep 2010 13:02:24 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Sep 2010 13:02:24 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Sep 2010 13:02:23 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id F2BF823888C2; Tue, 21 Sep 2010 13:02:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r999383 - in /httpd/httpd/trunk/docs/manual/mod: mod_rewrite.html.en mod_rewrite.xml Date: Tue, 21 Sep 2010 13:02:02 -0000 To: cvs@httpd.apache.org From: rbowen@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100921130202.F2BF823888C2@eris.apache.org> Author: rbowen Date: Tue Sep 21 13:02:02 2010 New Revision: 999383 URL: http://svn.apache.org/viewvc?rev=999383&view=rev Log: Add descriptions of the new RewriteCond test flags, -L, -h, and the new >= and <= syntax, added by wrowe in r997553. Modified: httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml 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=999383&r1=999382&r2=999383&view=diff ============================================================================== --- httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en (original) +++ httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en Tue Sep 21 13:02:02 2010 @@ -442,6 +442,22 @@ RewriteRule ^index\.html$ newsite.html is "" (two quotation marks) this compares TestString to the empty string. +
  • '<=CondPattern' (lexicographically + less than or equal to)
    + Treats the CondPattern as a plain string and + compares it lexicographically to TestString. True + if TestString lexicographically precedes + CondPattern, or is equal to CondPattern + (the two strings are equal, character for character).
    • + +
  • '>=CondPattern' (lexicographically + greater than or equal to)
    + Treats the CondPattern as a plain string and + compares it lexicographically to TestString. True + if TestString lexicographically follows + CondPattern, or is equal to CondPattern + (the two strings are equal, character for character).
    • +
  • '-d' (is directory)
    Treats the TestString as a pathname and tests @@ -452,24 +468,6 @@ RewriteRule ^index\.html$ newsite.html Treats the TestString as a pathname and tests whether or not it exists, and is a regular file.
    • -
  • '-s' (is regular file, with - size)
    - Treats the TestString as a pathname and tests - whether or not it exists, and is a regular file with size greater - than zero.
    • - -
  • '-l' (is symbolic - link)
    - Treats the TestString as a pathname and tests - whether or not it exists, and is a symbolic link.
    • - -
  • '-x' (has executable - permissions)
    - Treats the TestString as a pathname and tests - whether or not it exists, and has executable permissions. - These permissions are determined according to - the underlying OS.
    • -
  • '-F' (is existing file, via subrequest)
    Checks whether or not TestString is a valid file, @@ -478,6 +476,26 @@ RewriteRule ^index\.html$ newsite.html subrequest to do the check, so use it with care - it can impact your server's performance!
    • +
  • '-H' (is symbolic link, bash convention)
    + See -l.
    • + +
  • '-l' (is symbolic + link)
    + Treats the TestString as a pathname and tests + whether or not it exists, and is a symbolic link. May also + use the bash convention of -L or + -h if there's a possibility of confusion + such as when using the -lt test.
    • + +
  • '-L' (is symbolic link, bash convention)
    + See -l.
    • + +
  • '-s' (is regular file, with + size)
    + Treats the TestString as a pathname and tests + whether or not it exists, and is a regular file with size greater + than zero.
    • +
  • '-U' (is existing URL, via subrequest)
    Checks whether or not TestString is a valid URL, @@ -485,6 +503,14 @@ RewriteRule ^index\.html$ newsite.html access controls for that path. This uses an internal subrequest to do the check, so use it with care - it can impact your server's performance!
    • + +
  • '-x' (has executable + permissions)
    + Treats the TestString as a pathname and tests + whether or not it exists, and has executable permissions. + These permissions are determined according to + the underlying OS.
    • +

    Note:

    Modified: httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml?rev=999383&r1=999382&r2=999383&view=diff ============================================================================== --- httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml (original) +++ httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml Tue Sep 21 13:02:02 2010 @@ -596,6 +596,22 @@ RewriteRule ^index\.html$ newsite.html is "" (two quotation marks) this compares TestString to the empty string. +
  • '<=CondPattern' (lexicographically + less than or equal to)
    + Treats the CondPattern as a plain string and + compares it lexicographically to TestString. True + if TestString lexicographically precedes + CondPattern, or is equal to CondPattern + (the two strings are equal, character for character).
    • + +
  • '>=CondPattern' (lexicographically + greater than or equal to)
    + Treats the CondPattern as a plain string and + compares it lexicographically to TestString. True + if TestString lexicographically follows + CondPattern, or is equal to CondPattern + (the two strings are equal, character for character).
    • +
  • '-d' (is directory)
    Treats the TestString as a pathname and tests @@ -606,24 +622,6 @@ RewriteRule ^index\.html$ newsite.html Treats the TestString as a pathname and tests whether or not it exists, and is a regular file.
    • -
  • '-s' (is regular file, with - size)
    - Treats the TestString as a pathname and tests - whether or not it exists, and is a regular file with size greater - than zero.
    • - -
  • '-l' (is symbolic - link)
    - Treats the TestString as a pathname and tests - whether or not it exists, and is a symbolic link.
    • - -
  • '-x' (has executable - permissions)
    - Treats the TestString as a pathname and tests - whether or not it exists, and has executable permissions. - These permissions are determined according to - the underlying OS.
    • -
  • '-F' (is existing file, via subrequest)
    Checks whether or not TestString is a valid file, @@ -632,6 +630,26 @@ RewriteRule ^index\.html$ newsite.html subrequest to do the check, so use it with care - it can impact your server's performance!
    • +
  • '-H' (is symbolic link, bash convention)
    + See -l.
    • + +
  • '-l' (is symbolic + link)
    + Treats the TestString as a pathname and tests + whether or not it exists, and is a symbolic link. May also + use the bash convention of -L or + -h if there's a possibility of confusion + such as when using the -lt test.
    • + +
  • '-L' (is symbolic link, bash convention)
    + See -l.
    • + +
  • '-s' (is regular file, with + size)
    + Treats the TestString as a pathname and tests + whether or not it exists, and is a regular file with size greater + than zero.
    • +
  • '-U' (is existing URL, via subrequest)
    Checks whether or not TestString is a valid URL, @@ -639,6 +657,14 @@ RewriteRule ^index\.html$ newsite.html access controls for that path. This uses an internal subrequest to do the check, so use it with care - it can impact your server's performance!
    • + +
  • '-x' (has executable + permissions)
    + Treats the TestString as a pathname and tests + whether or not it exists, and has executable permissions. + These permissions are determined according to + the underlying OS.
    • + Note: