aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/webrick_server.rb
diff options
context:
space:
mode:
authorJamis Buck <jamis@37signals.com>2005-10-13 00:05:32 +0000
committerJamis Buck <jamis@37signals.com>2005-10-13 00:05:32 +0000
commita91423ed5bcf9d81ba4f31dd2e91d905c4f51c74 (patch)
tree1cb688a254a1c395a43fa9cbda3268d2461ba207 /railties/lib/webrick_server.rb
parentaf0df03fd3bd020edbdeb00a18d11129fef1a60b (diff)
downloadrails-a91423ed5bcf9d81ba4f31dd2e91d905c4f51c74.tar.gz
rails-a91423ed5bcf9d81ba4f31dd2e91d905c4f51c74.tar.bz2
rails-a91423ed5bcf9d81ba4f31dd2e91d905c4f51c74.zip
Make webrick work with session(:off)
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2547 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib/webrick_server.rb')
-rw-r--r--railties/lib/webrick_server.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/webrick_server.rb b/railties/lib/webrick_server.rb
index 0b82a99075..734f87f6fd 100644
--- a/railties/lib/webrick_server.rb
+++ b/railties/lib/webrick_server.rb
@@ -117,7 +117,7 @@ class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet
set_charset(header)
assign_status(res, header)
- res.cookies.concat(header.delete('set-cookie'))
+ res.cookies.concat(header.delete('set-cookie') || [])
header.each { |key, val| res[key] = val.join(", ") }
res.body = body