From c2b2aa8b27101fa76be45debfc6a96b9a58dab23 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
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: http://svn.ruby-lang.org/repos/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 a3cd2bb01..b190eecf2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
-- 
cgit