Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 94400 invoked from network); 10 Oct 2005 21:25:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 10 Oct 2005 21:25:42 -0000 Received: (qmail 24916 invoked by uid 500); 10 Oct 2005 21:25:42 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 24882 invoked by uid 500); 10 Oct 2005 21:25:41 -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 24871 invoked by uid 99); 10 Oct 2005 21:25:41 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 10 Oct 2005 14:25:41 -0700 Received: (qmail 94320 invoked by uid 65534); 10 Oct 2005 21:25:21 -0000 Message-ID: <20051010212521.94319.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r312756 - /httpd/httpd/dist/.htaccess Date: Mon, 10 Oct 2005 21:25:21 -0000 To: cvs@httpd.apache.org From: nd@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: nd Date: Mon Oct 10 14:25:17 2005 New Revision: 312756 URL: http://svn.apache.org/viewcvs?rev=312756&view=rev Log: use RedirectMatch instead of RewriteRule - chances are higher that mod_alias is installed on the mirrors. Further I'm not sure that the Rules would have worked correctly in non-root-.htaccess files Modified: httpd/httpd/dist/.htaccess Modified: httpd/httpd/dist/.htaccess URL: http://svn.apache.org/viewcvs/httpd/httpd/dist/.htaccess?rev=312756&r1=312755&r2=312756&view=diff ============================================================================== --- httpd/httpd/dist/.htaccess (original) +++ httpd/httpd/dist/.htaccess Mon Oct 10 14:25:17 2005 @@ -65,7 +65,7 @@ AddCharset UTF-8 .txt .html -RewriteRule ^(.*)/Announcement\.(.*) $1/Announcement1.3.$2 [R] -RewriteRule ^(.*)/Announcement2\.([th].*) $1/Announcement2.0.$2 [R] -RewriteRule ^(.*)/Announcement21\.(.*) $1/Announcement2.1.$2 [R] +RedirectMatch 301 ^(.*)/Announcement\.(.*) $1/Announcement1.3.$2 +RedirectMatch 301 ^(.*)/Announcement2\.([th].*) $1/Announcement2.0.$2 +RedirectMatch 301 ^(.*)/Announcement21\.(.*) $1/Announcement2.1.$2