diff options
author | Hongli Lai (Phusion) <hongli@phusion.nl> | 2008-12-03 19:30:35 +0100 |
---|---|---|
committer | Hongli Lai (Phusion) <hongli@phusion.nl> | 2008-12-03 19:30:35 +0100 |
commit | ccb96f2297e8783165cba764e9b5d51e1a15ff87 (patch) | |
tree | 3229e6fdddc42054615514d843c555e341003033 /railties/configs/lighttpd.conf | |
parent | fb2325e35855d62abd2c76ce03feaa3ca7992e4f (diff) | |
parent | 761a633a9c0a45d76ef3ed10da97e3696c3ded79 (diff) | |
download | rails-ccb96f2297e8783165cba764e9b5d51e1a15ff87.tar.gz rails-ccb96f2297e8783165cba764e9b5d51e1a15ff87.tar.bz2 rails-ccb96f2297e8783165cba764e9b5d51e1a15ff87.zip |
Merge commit 'origin/master' into savepoints
Conflicts:
activerecord/lib/active_record/fixtures.rb
activerecord/test/cases/defaults_test.rb
Diffstat (limited to 'railties/configs/lighttpd.conf')
-rw-r--r-- | railties/configs/lighttpd.conf | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/railties/configs/lighttpd.conf b/railties/configs/lighttpd.conf deleted file mode 100644 index ed68d714bb..0000000000 --- a/railties/configs/lighttpd.conf +++ /dev/null @@ -1,54 +0,0 @@ -# Default configuration file for the lighttpd web server -# Start using ./script/server lighttpd - -server.bind = "0.0.0.0" -server.port = 3000 - -server.modules = ( "mod_rewrite", "mod_accesslog", "mod_fastcgi", "mod_compress", "mod_expire" ) - -server.error-handler-404 = "/dispatch.fcgi" -server.pid-file = CWD + "/tmp/pids/lighttpd.pid" -server.document-root = CWD + "/public/" - -server.errorlog = CWD + "/log/lighttpd.error.log" -accesslog.filename = CWD + "/log/lighttpd.access.log" - -url.rewrite = ( "^/$" => "index.html", "^([^.]+)$" => "$1.html" ) - -compress.filetype = ( "text/plain", "text/html", "text/css", "text/javascript" ) -compress.cache-dir = CWD + "/tmp/cache" - -expire.url = ( "/favicon.ico" => "access 3 days", - "/images/" => "access 3 days", - "/stylesheets/" => "access 3 days", - "/javascripts/" => "access 3 days" ) - - -# Change *-procs to 2 if you need to use Upload Progress or other tasks that -# *need* to execute a second request while the first is still pending. -fastcgi.server = ( ".fcgi" => ( "localhost" => ( - "min-procs" => 1, - "max-procs" => 1, - "socket" => CWD + "/tmp/sockets/fcgi.socket", - "bin-path" => CWD + "/public/dispatch.fcgi", - "bin-environment" => ( "RAILS_ENV" => "development" ) -) ) ) - -mimetype.assign = ( - ".css" => "text/css", - ".gif" => "image/gif", - ".htm" => "text/html", - ".html" => "text/html", - ".jpeg" => "image/jpeg", - ".jpg" => "image/jpeg", - ".js" => "text/javascript", - ".png" => "image/png", - ".swf" => "application/x-shockwave-flash", - ".txt" => "text/plain" -) - -# Making sure file uploads above 64k always work when using IE or Safari -# For more information, see http://trac.lighttpd.net/trac/ticket/360 -$HTTP["useragent"] =~ "^(.*MSIE.*)|(.*AppleWebKit.*)$" { - server.max-keep-alive-requests = 0 -} |