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

1 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 9a4b45a83..b6fb9e356 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.
+
 Tue Jun 16 22:47:37 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (fptr_finalize): skip close(2) for fd 0,1,2.