From 7eb5dcf325ae01bdade65191f247c2410d3decbe 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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23792 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/webrick/httputils.rb | 2 +- version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9a4b45a830..b6fb9e3565 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. + Tue Jun 16 22:47:37 2009 Yukihiro Matsumoto * io.c (fptr_finalize): skip close(2) for fd 0,1,2. diff --git a/lib/webrick/httputils.rb b/lib/webrick/httputils.rb index f921364786..696c4aaaed 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 diff --git a/version.h b/version.h index d466695b30..39806036eb 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "1.9.1" #define RUBY_RELEASE_DATE "2009-05-22" -#define RUBY_PATCHLEVEL 182 +#define RUBY_PATCHLEVEL 183 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit v1.2.3