From 50cea7a5c90eb70539c07ccc63532b4e880e0557 Mon Sep 17 00:00:00 2001 From: mame Date: Thu, 16 Apr 2009 15:58:23 +0000 Subject: [PATCH] * lib/cgi/core.rb (read_multipart): When path is not defined, define local_path as a method always returning nil instead of aliasing. This is because StringIO#path no longer exists. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23196 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ lib/cgi/core.rb | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b386de37a6cf22..8f4b87658c9dcd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Apr 17 00:53:47 2009 Yusuke Endoh + + * lib/cgi/core.rb (read_multipart): When path is not defined, + define local_path as a method always returning nil instead of + aliasing. This is because StringIO#path no longer exists. + Fri Apr 17 00:45:09 2009 Yusuke Endoh * dir.c (bracket): fix escape handling for range character in bracket diff --git a/lib/cgi/core.rb b/lib/cgi/core.rb index 69c7f28603b143..4ca0bcf050a2f4 100644 --- a/lib/cgi/core.rb +++ b/lib/cgi/core.rb @@ -440,7 +440,13 @@ def read_multipart(boundary, content_length) ## create body (StringIO or Tempfile) body = create_body(bufsize < content_length) class << body - alias local_path path + if method_defined?(:path) + alias local_path path + else + def local_path + nil + end + end attr_reader :original_filename, :content_type end ## find head and boundary