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
rails · Feb 15, 2005 · d4aead0 · d4aead0
1 parent 55b6e88
commit d4aead0
Showing 1 changed file with 9 additions and 2 deletions.
diff --git 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