aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--railties/CHANGELOG2
-rw-r--r--railties/configs/lighttpd.conf6
2 files changed, 8 insertions, 0 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index b7a0c231ce..da14d3d526 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Added fix for upload problems with lighttpd from Safari/IE to config/lighttpd.conf #3999 [thijs@fngtps.com]
+
* Added test:uncommitted to test changes since last checkin to Subversion #4035 [technomancy@gmail.com]
* Help script/about print the correct svn revision when in a non-English locale. #4026 [babie7a0@ybb.ne.jp]
diff --git a/railties/configs/lighttpd.conf b/railties/configs/lighttpd.conf
index 6d421c8de0..7ffe7b2ddd 100644
--- a/railties/configs/lighttpd.conf
+++ b/railties/configs/lighttpd.conf
@@ -38,3 +38,9 @@ mimetype.assign = (
".swf" => "application/x-shockwave-flash",
".txt" => "text/plain"
)
+
+# Making sure file uploads above 64k always work when using IE or Safari
+# Form more information, see http://trac.lighttpd.net/trac/ticket/360
+$HTTP["useragent"] =~ "^(.*MSIE.*)|(.*AppleWebKit.*)$" {
+ server.max-keep-alive-requests = 0
+} \ No newline at end of file