From f4d964bb723791f06ae2135b2dfce368c34c1b99 Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 21 Jun 2009 09:16:30 +0000 Subject: 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 --- lib/webrick/httputils.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') 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 -- cgit