diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/webrick/httputils.rb | 2 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -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. 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 @@ -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 |