diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/cgi.rb | 8 | ||||
-rw-r--r-- | version.h | 6 |
3 files changed, 12 insertions, 7 deletions
@@ -1,3 +1,8 @@ +Sun Dec 9 12:39:01 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/cgi.rb (read_multipart): exclude blanks from header values. + [ruby-list:44327] + Wed Dec 5 23:38:50 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * range.c (range_each): followed step_i change. diff --git a/lib/cgi.rb b/lib/cgi.rb index a442d44930..ccc48d8836 100644 --- a/lib/cgi.rb +++ b/lib/cgi.rb @@ -1032,13 +1032,13 @@ class CGI if "--" == $2 content_length = -1 end - boundary_end = $2.dup + boundary_end = $2.dup "" end body.rewind - /Content-Disposition:.* filename=(?:"((?:\\.|[^\"])*)"|([^;]*))/ni.match(head) + /Content-Disposition:.* filename=(?:"((?:\\.|[^\"\s])*)"|([^;\s]*))/ni.match(head) filename = ($1 or $2 or "") if /Mac/ni.match(env_table['HTTP_USER_AGENT']) and /Mozilla/ni.match(env_table['HTTP_USER_AGENT']) and @@ -1046,7 +1046,7 @@ class CGI filename = CGI::unescape(filename) end - /Content-Type: (.*)/ni.match(head) + /Content-Type: ([^\s]*)/ni.match(head) content_type = ($1 or "") (class << body; self; end).class_eval do @@ -1055,7 +1055,7 @@ class CGI define_method(:content_type) {content_type.dup.taint} end - /Content-Disposition:.* name="?([^\";]*)"?/ni.match(head) + /Content-Disposition:.* name="?([^\";\s]*)"?/ni.match(head) name = $1.dup if params.has_key?(name) @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2007-12-05" +#define RUBY_RELEASE_DATE "2007-12-09" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20071205 +#define RUBY_RELEASE_CODE 20071209 #define RUBY_PATCHLEVEL 5000 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 5 +#define RUBY_RELEASE_DAY 9 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |