From cde491005e3776b73c25cb7ec45e8750f7ade770 Mon Sep 17 00:00:00 2001 From: naruse Date: Tue, 16 Jun 2009 22:42:13 +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/trunk@23715 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 a3cd2bb010..b190eecf2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jun 17 07:36:22 2009 NARUSE, Yui + + * 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 * array.c (rb_ary_memsize): added. diff --git a/lib/webrick/httputils.rb b/lib/webrick/httputils.rb index bed24e09dd..6f6f05a199 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 -- cgit v1.2.3