From 2e470cbf4cd200ccc477eeb269dfd860da419451 Mon Sep 17 00:00:00 2001 From: naruse Date: Tue, 16 Jun 2009 22:46:45 +0000 Subject: * lib/webrick/httputils.rb (parse_form_data): escape boundary of multipart/form-data when embed in regexp. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@23716 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/webrick/httputils.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8b05ddcb11..7f7f6b06f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jun 17 07:44:27 2009 NARUSE, Yui + + * lib/webrick/httputils.rb (parse_form_data): escape boundary of + multipart/form-data when embed in regexp. + Tue Jun 16 22:23:00 2009 Nobuyoshi Nakada * io.c (rb_io_open), math.c (domain_check), object.c (boot_defclass): diff --git a/lib/webrick/httputils.rb b/lib/webrick/httputils.rb index 976d3e915e..c5e847fcb2 100644 --- a/lib/webrick/httputils.rb +++ b/lib/webrick/httputils.rb @@ -304,7 +304,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 -- cgit v1.2.3