* lib/cgi.rb (CGI::Cookie::initialize): use Array() again.

  [ruby-core:09781]


* object.c (rb_Array): returns 1-element array if the argument
  does not have to_ary nor to_a.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11426 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 2 deletions

diff --git a/object.c b/object.c
index b5f183fbf..78e930ff3 100644
--- a/object.c
+++ b/object.c
@@ -2148,7 +2148,7 @@ rb_String(VALUE val)
  *  <code>to_s</code> method.
  *     
  *     String(self)        #=> "main"
- *     String(self.class   #=> "Object"
+ *     String(self.class)  #=> "Object"
  *     String(123456)      #=> "123456"
  */
 
@@ -2164,7 +2164,10 @@ rb_Array(VALUE val)
     VALUE tmp = rb_check_array_type(val);
 
     if (NIL_P(tmp)) {
-	return rb_convert_type(val, T_ARRAY, "Array", "to_a");
+	tmp = rb_check_convert_type(val, T_ARRAY, "Array", "to_a");
+	if (NIL_P(tmp)) {
+	    return rb_ary_new3(1, val);
+	}
     }
     return tmp;
 }