diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-21 09:16:30 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-21 09:16:30 +0000 |
| commit | f4d964bb723791f06ae2135b2dfce368c34c1b99 (patch) | |
| tree | ac3cfe9fc19bbb1264c12886c0acfea3c2191688 /lib/webrick | |
| parent | a3d2e5a7e7a2c5d1558ea00f5e32e19ed59f60ef (diff) | |
merges r23715 from trunk into ruby_1_9_1.
--
* lib/webrick/httputils.rb (parse_form_data): escape boundary of
multipart/form-data when embed in regexp.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23792 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/webrick')
| -rw-r--r-- | lib/webrick/httputils.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/webrick/httputils.rb b/lib/webrick/httputils.rb index f92136478..696c4aaae 100644 --- a/lib/webrick/httputils.rb +++ b/lib/webrick/httputils.rb @@ -305,7 +305,7 @@ module WEBrick module_function :parse_query def parse_form_data(io, boundary) - boundary_regexp = /\A--#{boundary}(--)?#{CRLF}\z/ + boundary_regexp = /\A--#{Regexp.quote(boundary)}(--)?#{CRLF}\z/ form_data = Hash.new return form_data unless io data = nil |