diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2007-01-05 04:09:38 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-01-05 04:09:38 +0000 |
| commit | 73499158df05ed68fb9cf2679286a603db91f1ef (patch) | |
| tree | e4bb59545ef2636a204337d39c92031430c24bef /railties | |
| parent | fbe05067be9d5a575b29d62a1a1bc490663c5e17 (diff) | |
| download | rails-73499158df05ed68fb9cf2679286a603db91f1ef.tar.gz rails-73499158df05ed68fb9cf2679286a603db91f1ef.tar.bz2 rails-73499158df05ed68fb9cf2679286a603db91f1ef.zip | |
Fixed that webrick would strip leading newlines and hang connection (closes #4156) [psross]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5847 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/webrick_server.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 302782c73a..956814f17f 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed that webrick would strip leading newlines and hang connection #4156 [psross] + * Ensure plugins are in the Dependencies.load_once_paths collection by default. [Rick] If you really want your plugins to reload, add this to the very top of init.rb: diff --git a/railties/lib/webrick_server.rb b/railties/lib/webrick_server.rb index 71ef275ba4..ad4ca926ba 100644 --- a/railties/lib/webrick_server.rb +++ b/railties/lib/webrick_server.rb @@ -142,7 +142,7 @@ class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet data.rewind data = data.read - raw_header, body = *data.split(/^[\xd\xa]+/on, 2) + raw_header, body = *data.split(/^[\xd\xa]{2}/on, 2) header = WEBrick::HTTPUtils::parse_header(raw_header) return header, body |