naruse	2014-02-22 22:27:49 +0900 (Sat, 22 Feb 2014)

  New Revision: 45139

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

  Log:
    merge revision(s) 45130: [Backport #9554]
    
    * ext/io/console/console.c (console_dev): need read access for conout$
      because some functions need it.  [Bug#9554]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/ext/io/console/console.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 45138)
+++ ruby_2_1/ChangeLog	(revision 45139)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Sat Feb 22 22:26:43 2014  NAKAMURA Usaku  <usa@r...>
+
+	* ext/io/console/console.c (console_dev): need read access for conout$
+	  because some functions need it.  [Bug#9554]
+
 Sat Feb 22 21:56:26 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* compile.c (iseq_set_arguments): set arg_keyword_check from
Index: ruby_2_1/ext/io/console/console.c
===================================================================
--- ruby_2_1/ext/io/console/console.c	(revision 45138)
+++ ruby_2_1/ext/io/console/console.c	(revision 45139)
@@ -710,7 +710,7 @@ console_dev(VALUE klass) https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/io/console/console.c#L710
 	int fd;
 
 #ifdef CONSOLE_DEVICE_FOR_WRITING
-	fd = rb_cloexec_open(CONSOLE_DEVICE_FOR_WRITING, O_WRONLY, 0);
+	fd = rb_cloexec_open(CONSOLE_DEVICE_FOR_WRITING, O_RDWR, 0);
 	if (fd < 0) return Qnil;
         rb_update_max_fd(fd);
 	args[1] = INT2FIX(O_WRONLY);
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 45138)
+++ ruby_2_1/version.h	(revision 45139)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.1"
 #define RUBY_RELEASE_DATE "2014-02-22"
-#define RUBY_PATCHLEVEL 74
+#define RUBY_PATCHLEVEL 75
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r45130


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