mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Make webrick work with session(:off)
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2547 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
af0df03fd3
commit
a91423ed5b
2 changed files with 3 additions and 1 deletions
|
@ -1,5 +1,7 @@
|
|||
*SVN*
|
||||
|
||||
* Make webrick work with session(:off)
|
||||
|
||||
* Add --version, -v option to the Rails command. Closes #1840. [stancell]
|
||||
|
||||
* Update Prototype to V1.4.0_pre11, script.aculo.us to V1.5_rc3 [2504] and fix the rails generator to include the new .js files [Thomas Fuchs]
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue