github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-26 06:48:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Ruby 1.9 compat: don't confuse with headers method call

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9188 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jeremy Kemper
2008-04-01 06:11:40 +00:00
parent b79f7d127a
commit 09ca8a6701
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
actionpack/lib/action_controller/integration.rb
View File

@@ -306,10 +306,10 @@ module ActionController
# Parses the result of the response and extracts the various values,
# like cookies, status, headers, etc.
def parse_result
headers, result_body = @result.split(/\r\n\r\n/, 2)
response_headers, result_body = @result.split(/\r\n\r\n/, 2)
@headers = Hash.new { |h,k| h[k] = [] }
headers.each_line do |line|
response_headers.to_s.each_line do |line|
key, value = line.strip.split(/:\s*/, 2)
@headers[key.downcase] << value
end
@@ -319,7 +319,7 @@ module ActionController
@cookies[name] = value
end
@status, @status_message = @headers["status"].first.split(/ /)
@status, @status_message = @headers["status"].first.to_s.split(/ /)
@status = @status.to_i
end