merge revision(s) 23306:

	* file.c (rb_file_join): recursive array has no meaning as path
	  name.  [ruby-core:23329]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@24114 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 11 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index ece712f86b..83530a434b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul 15 11:40:34 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_join): recursive array has no meaning as path
+	  name.  [ruby-core:23329]
+
 Tue Jul 14 19:57:28 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (get_ts): use readtime clock.  [ruby-dev:38354]
diff --git a/file.c b/file.c
index 72700a6a10..acb6a548b9 100644
--- a/file.c
+++ b/file.c
@@ -3124,8 +3124,8 @@ rb_file_join(ary, sep)
 	  case T_STRING:
 	    break;
 	  case T_ARRAY:
-	    if (rb_inspecting_p(tmp)) {
-		tmp = rb_str_new2("[...]");
+	    if (tmp == ary || rb_inspecting_p(tmp)) {
+		rb_raise(rb_eArgError, "recursive array");
 	    }
 	    else {
 		VALUE args[2];
diff --git a/version.h b/version.h
index 9e3d37f1f9..222fc50f2b 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-07-14"
+#define RUBY_RELEASE_DATE "2009-07-15"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090714
-#define RUBY_PATCHLEVEL 183
+#define RUBY_RELEASE_CODE 20090715
+#define RUBY_PATCHLEVEL 184
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 14
+#define RUBY_RELEASE_DAY 15
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];