diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-20 16:44:48 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-20 16:44:48 +0000 |
| commit | 694aafaa9d06cd6c49698cc73f6dd105400313d8 (patch) | |
| tree | df5dfe1e034f48d82f612e2490535f1ce673b859 | |
| parent | ce2386280086e8ebb978b16025a778980953c6ea (diff) | |
| download | rails-694aafaa9d06cd6c49698cc73f6dd105400313d8.tar.gz rails-694aafaa9d06cd6c49698cc73f6dd105400313d8.tar.bz2 rails-694aafaa9d06cd6c49698cc73f6dd105400313d8.zip | |
Fixed webrick_server cookie handling to allow multiple cookes to be set at once #800, #813 [dave@cherryville.org]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@937 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/webrick_server.rb | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 9c4ef1823e..4396def23e 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed webrick_server cookie handling to allow multiple cookes to be set at once #800, #813 [dave@cherryville.org] + * Fixed the Rakefile's interaction with postgresql use PGPASSWORD and PGHOST in the environment to fix prompting for passwords when connecting to a remote db and local socket connections. Also added a '-x' flag to pg_dump which stops it dumping privileges #807 [rasputnik] * Fixed the Rakefile's interaction with postgresql to quote the user name and use template0 when dumping so the functions doesn't get dumped too #855 [pburleson] diff --git a/railties/lib/webrick_server.rb b/railties/lib/webrick_server.rb index 49244837ef..cc45867128 100644 --- a/railties/lib/webrick_server.rb +++ b/railties/lib/webrick_server.rb @@ -94,6 +94,7 @@ class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet res.status = $1.to_i header.delete('status') end + res.cookies.concat header.delete('set-cookie') header.each { |key, val| res[key] = val.join(", ") } res.body = body |