yugui	2009-06-21 18:16:18 +0900 (Sun, 21 Jun 2009)

  New Revision: 23791

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23791

  Log:
    merges 23699 and 23705 from trunk into ruby_1_9_1.
    --
    * io.c (fptr_finalize): skip close(2) for fd 0,1,2.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/io.c
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 23790)
+++ ruby_1_9_1/ChangeLog	(revision 23791)
@@ -1,3 +1,7 @@
+Tue Jun 16 22:47:37 2009  Yukihiro Matsumoto  <matz@r...>
+
+	* io.c (fptr_finalize): skip close(2) for fd 0,1,2.
+
 Wed Jun 17 00:31:30 2009  Yukihiro Matsumoto  <matz@r...>
 
 	* test/ruby/test_argf.rb (TestArgf#test_skip): updated test
Index: ruby_1_9_1/io.c
===================================================================
--- ruby_1_9_1/io.c	(revision 23790)
+++ ruby_1_9_1/io.c	(revision 23791)
@@ -3133,7 +3133,7 @@
             err = noraise ? Qtrue : INT2NUM(errno);
     }
     if (IS_PREP_STDIO(fptr) || fptr->fd <= 2) {
-        goto check_err;
+        goto skip_fd_close;
     }
     if (fptr->stdio_file) {
         /* fptr->stdio_file is deallocated anyway
@@ -3148,11 +3148,11 @@
         if (close(fptr->fd) < 0 && NIL_P(err))
             err = noraise ? Qtrue : INT2NUM(errno);
     }
+  skip_fd_close:
     fptr->fd = -1;
     fptr->stdio_file = 0;
     fptr->mode &= ~(FMODE_READABLE|FMODE_WRITABLE);
 
-  check_err:
     if (!NIL_P(err) && !noraise) {
         switch(TYPE(err)) {
           case T_FIXNUM:
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 23790)
+++ ruby_1_9_1/version.h	(revision 23791)
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-05-22"
-#define RUBY_PATCHLEVEL 181
+#define RUBY_PATCHLEVEL 182
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/