From 55f2fcff1dc623f85fc14c7e916a02d3731da71d Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 25 Nov 2004 22:07:29 +0000 Subject: Fixed bad chars in public/.htaccess [imajes] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@13 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/configs/apache.conf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'railties/configs/apache.conf') diff --git a/railties/configs/apache.conf b/railties/configs/apache.conf index feb2e32c4e..2edf69beb7 100755 --- a/railties/configs/apache.conf +++ b/railties/configs/apache.conf @@ -2,30 +2,30 @@ AddHandler fastcgi-script .fcgi AddHandler cgi-script .cgi Options +FollowSymLinks +ExecCGI -   + # Make sure that mod_ruby.c has been added and loaded as a module with Apache RewriteEngine On -  + # Change extension from .cgi to .fcgi to switch to FCGI and to .rb to switch to mod_ruby RewriteBase /dispatch.cgi -  + RewriteRule ^dispatch.servlet$ / [R] -  + # Enable this rewrite rule to point to the controller/action that should serve root. # RewriteRule ^$ /controller/action -  + # Add missing slash RewriteRule ^([-_a-zA-Z0-9]+)$ /$1/ [R] -  + # Default rewriting rules. RewriteRule ^([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)/([0-9]+)$ ?controller=$1&action=$2&id=$3 [QSA,L] RewriteRule ^([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)$ ?controller=$1&action=$2 [QSA,L] RewriteRule ^([-_a-zA-Z0-9]+)/$ ?controller=$1&action=index [QSA,L] -  + RewriteRule ^([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)/([0-9]+)$ ?module=$1&controller=$2&action=$3&id=$4 [QSA,L] RewriteRule ^([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)$ ?module=$1&controller=$2&action=$3 [QSA,L] RewriteRule ^([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)/$ ?module=$1&controller=$2&action=index [QSA,L] -  + # You can also point these error messages to a controller/action ErrorDocument 500 /500.html ErrorDocument 404 /404.html \ No newline at end of file -- cgit v1.2.3