From d4aead0d508d30b57cf2a338d6c8cd2f2b954699 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Tue, 15 Feb 2005 23:34:21 +0000
Subject: 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
---
 railties/configs/apache.conf | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'railties/configs')

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
-- 
cgit v1.2.3