diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-16 22:42:13 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-16 22:42:13 +0000 |
| commit | c2b2aa8b27101fa76be45debfc6a96b9a58dab23 (patch) | |
| tree | 9f56d04d25121aca6d8f27d598c1d25580ada4d5 | |
| parent | cdc9463126d14d1f0f24d16b20924dcb2c85e962 (diff) | |
| download | ruby-c2b2aa8b27101fa76be45debfc6a96b9a58dab23.tar.gz ruby-c2b2aa8b27101fa76be45debfc6a96b9a58dab23.tar.xz ruby-c2b2aa8b27101fa76be45debfc6a96b9a58dab23.zip | |
* 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/trunk@23715 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/webrick/httputils.rb | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Wed Jun 17 07:36:22 2009 NARUSE, Yui <naruse@ruby-lang.org> + + * lib/webrick/httputils.rb (parse_form_data): escape boundary of + multipart/form-data when embed in regexp. + Wed Jun 17 07:24:26 2009 Koichi Sasada <ko1@atdot.net> * array.c (rb_ary_memsize): added. diff --git a/lib/webrick/httputils.rb b/lib/webrick/httputils.rb index bed24e09d..6f6f05a19 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 |