aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2004-11-25 22:07:29 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2004-11-25 22:07:29 +0000
commit55f2fcff1dc623f85fc14c7e916a02d3731da71d (patch)
tree0468f35523bd78c5880b3d013394b03d8f83c66c /railties
parent18d614040a709918ce97b9ef49781b0db78ed0cd (diff)
downloadrails-55f2fcff1dc623f85fc14c7e916a02d3731da71d.tar.gz
rails-55f2fcff1dc623f85fc14c7e916a02d3731da71d.tar.bz2
rails-55f2fcff1dc623f85fc14c7e916a02d3731da71d.zip
Fixed bad chars in public/.htaccess [imajes]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@13 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
-rwxr-xr-xrailties/configs/apache.conf16
1 files changed, 8 insertions, 8 deletions
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