aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-02-15 23:34:21 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-02-15 23:34:21 +0000
commitd4aead0d508d30b57cf2a338d6c8cd2f2b954699 (patch)
tree4f95d721588253426dfff24325ef02b358ffd4d5 /railties
parent55b6e884c5ac59a685d3e4bdb9c5beb97e7d185e (diff)
downloadrails-d4aead0d508d30b57cf2a338d6c8cd2f2b954699.tar.gz
rails-d4aead0d508d30b57cf2a338d6c8cd2f2b954699.tar.bz2
rails-d4aead0d508d30b57cf2a338d6c8cd2f2b954699.zip
Made apache start out on cgi and added back the default apache options
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@635 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
-rwxr-xr-xrailties/configs/apache.conf11
1 files changed, 9 insertions, 2 deletions
diff --git a/railties/configs/apache.conf b/railties/configs/apache.conf
index 0b2f4cd99e..28c4c57aad 100755
--- a/railties/configs/apache.conf
+++ b/railties/configs/apache.conf
@@ -1,5 +1,12 @@
+# General Apache options
+AddHandler fastcgi-script .fcgi
+AddHandler cgi-script .cgi
+Options +FollowSymLinks +ExecCGI
+
+# Redirect all requests not available on the filesystem to Rails
RewriteEngine On
RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^(.*)$ /dispatch.fcgi?$1 [QSA,L]
+RewriteRule ^(.*)$ /dispatch.cgi?$1 [QSA,L]
-ErrorDocument 500 /500.html
+# In case Rails experiences terminal errors
+ErrorDocument 500 /500.html \ No newline at end of file