diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-02-19 21:20:15 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-02-19 21:20:15 +0100 |
| commit | d8f1ee4b41352b870f617b01099b2877f754d32c (patch) | |
| tree | dd6bdf1d1ded6aab7bb926109a24e942fc740b73 /actionpack/lib/action_controller/cgi_process.rb | |
| parent | 8ba1fc18e13c03966d411947180022c1730e81ff (diff) | |
| parent | 7c0e008973e594ebf53607362c1dfbe34b693600 (diff) | |
| download | rails-d8f1ee4b41352b870f617b01099b2877f754d32c.tar.gz rails-d8f1ee4b41352b870f617b01099b2877f754d32c.tar.bz2 rails-d8f1ee4b41352b870f617b01099b2877f754d32c.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'actionpack/lib/action_controller/cgi_process.rb')
| -rw-r--r-- | actionpack/lib/action_controller/cgi_process.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/cgi_process.rb b/actionpack/lib/action_controller/cgi_process.rb index 7e5e95e135..54ff04cfd2 100644 --- a/actionpack/lib/action_controller/cgi_process.rb +++ b/actionpack/lib/action_controller/cgi_process.rb @@ -47,6 +47,11 @@ module ActionController #:nodoc: out.sync = false if out.respond_to?(:sync=) headers['Status'] = status.to_s + + if headers.include?('Set-Cookie') + headers['cookie'] = headers.delete('Set-Cookie').split("\n") + end + out.write(cgi.header(headers)) body.each { |part| |