diff options
| author | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-12-01 22:38:47 +0000 |
|---|---|---|
| committer | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-12-01 22:38:47 +0000 |
| commit | b326623cef742e63a076abcab010b6e2fea977a3 (patch) | |
| tree | bdcfe5081b85571bc8b8bd764f5d5bb096c8ab1a | |
| parent | 38093bc1299653d4fa8d012f930f99525aab41dd (diff) | |
| download | ruby-b326623cef742e63a076abcab010b6e2fea977a3.tar.gz | |
* lib/webrick/httputils.rb (WEBrick::HTTPUtils::FormData::<<):
HTTPUtils::parse_header() takes a string. [ruby-dev:29931]
* lib/webrick/httputils.rb (WEBrick::HTTPUtils::parse_header):
String does no longer have each method.
* lib/webrick/httputils.rb (WEBrick::HTTPUtils::parse_form_data):
ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11321 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | lib/webrick/httputils.rb | 6 |
2 files changed, 14 insertions, 3 deletions
@@ -1,3 +1,14 @@ +Sat Dec 2 07:33:53 2006 GOTOU Yuuzou <gotoyuzo@notwork.org> + + * lib/webrick/httputils.rb (WEBrick::HTTPUtils::FormData::<<): + HTTPUtils::parse_header() takes a string. [ruby-dev:29931] + + * lib/webrick/httputils.rb (WEBrick::HTTPUtils::parse_header): + String does no longer have each method. + + * lib/webrick/httputils.rb (WEBrick::HTTPUtils::parse_form_data): + ditto. + Sat Dec 2 07:09:04 2006 GOTOU Yuuzou <gotoyuzo@notwork.org> * ext/openssl/ossl_ocsp.c: OpenSSL::OCSP::OSCPError should be diff --git a/lib/webrick/httputils.rb b/lib/webrick/httputils.rb index 38a42b98f8..b9bd5ae91d 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.lines.each{|line| + raw.each_line{|line| case line when /^([A-Za-z0-9!\#$%&'*+\-.^_`|~]+):\s*(.*?)\s*\z/om field, value = $1, $2 @@ -244,7 +244,7 @@ module WEBrick if @header super elsif str == CRLF - @header = HTTPUtils::parse_header(@raw_header) + @header = HTTPUtils::parse_header(@raw_header.join) if cd = self['content-disposition'] if /\s+name="(.*?)"/ =~ cd then @name = $1 end if /\s+filename="(.*?)"/ =~ cd then @filename = $1 end @@ -317,7 +317,7 @@ module WEBrick form_data = Hash.new return form_data unless io data = nil - io.each{|line| + io.each_line{|line| if boundary_regexp =~ line if data data.chop! |