summaryrefslogtreecommitdiff
path: root/lib/webrick
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-11-02 00:21:28 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-11-02 00:21:28 +0000
commit84e2f5268a4844d7999a9424c7f6a94fd4a68cb7 (patch)
tree9bfd2df5a5e574ddae6685e70d720dcae09fcbb6 /lib/webrick
parent92ca42cb3e2fcfcee94a1f9718fcf94a9b31d947 (diff)
* lib/xmlrpc/create.rb (XMLRPC::Create::conv2value): Symbol should
come earlier than String. * lib/soap/mapping/rubytypeFactory.rb (RubytypeFactory::obj2soap): ditto. * lib/set.rb (TC_Set::test_s_new): strings are no longer Enumerable * lib/soap/property.rb (Property::load): ditto. * lib/webrick/httputils.rb (WEBrick::HTTPUtils::parse_header): ditto. * lib/soap/mimemessage.rb (MIMEMessage::Headers::parse): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11259 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/webrick')
-rw-r--r--lib/webrick/httprequest.rb2
-rw-r--r--lib/webrick/httputils.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/webrick/httprequest.rb b/lib/webrick/httprequest.rb
index 80188b8cfc..2dca0655d6 100644
--- a/lib/webrick/httprequest.rb
+++ b/lib/webrick/httprequest.rb
@@ -240,7 +240,7 @@ module WEBrick
end
end
begin
- @header = HTTPUtils::parse_header(@raw_header)
+ @header = HTTPUtils::parse_header(@raw_header.join)
rescue => ex
raise HTTPStatus::BadRequest, ex.message
end
diff --git a/lib/webrick/httputils.rb b/lib/webrick/httputils.rb
index c93146997f..38a42b98f8 100644
--- a/lib/webrick/httputils.rb
+++ b/lib/webrick/httputils.rb
@@ -127,7 +127,7 @@ module WEBrick
def parse_header(raw)
header = Hash.new([].freeze)
field = nil
- raw.each{|line|
+ raw.lines.each{|line|
case line
when /^([A-Za-z0-9!\#$%&'*+\-.^_`|~]+):\s*(.*?)\s*\z/om
field, value = $1, $2