aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
Diffstat (limited to 'railties')
-rw-r--r--railties/CHANGELOG6
-rw-r--r--railties/configs/lighttpd.conf7
2 files changed, 9 insertions, 4 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 9c57222fe4..99fcd06c3b 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,11 +1,11 @@
*SVN*
-* Avoid passing escapeHTML non-string in Rails' info controller. [Nicholas Seckar]
-
-* Fix Rails info controller's tests. [Nicholas Seckar]
+* Added expiration settings for JavaScript, CSS, HTML, and images to default lighttpd.conf [DHH]
* Added gzip compression for JavaScript, CSS, and HTML to default lighttpd.conf [DHH]
+* Avoid passing escapeHTML non-string in Rails' info controller [Nicholas Seckar]
+
*1.1.0* (March 27th, 2005)
diff --git a/railties/configs/lighttpd.conf b/railties/configs/lighttpd.conf
index 38a337d43a..ab1d189c22 100644
--- a/railties/configs/lighttpd.conf
+++ b/railties/configs/lighttpd.conf
@@ -3,7 +3,7 @@
server.port = 3000
-server.modules = ( "mod_rewrite", "mod_accesslog", "mod_fastcgi", "mod_compress" )
+server.modules = ( "mod_rewrite", "mod_accesslog", "mod_fastcgi", "mod_compress", "mod_expire" )
server.error-handler-404 = "/dispatch.fcgi"
server.document-root = CWD + "/public/"
@@ -11,7 +11,12 @@ 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.