Skip to content

Commit 37ad28a

Browse files
committed
merge revision(s) 45130: [Backport ruby#9554]
* ext/io/console/console.c (console_dev): need read access for conout$ because some functions need it. [Bug#9554] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@45131 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent 94b616f commit 37ad28a

3 files changed

Lines changed: 7 additions & 2 deletions

File tree

ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
Sat Feb 22 19:14:25 2014 NAKAMURA Usaku <usa@ruby-lang.org>
2+
3+
* ext/io/console/console.c (console_dev): need read access for conout$
4+
because some functions need it. [Bug#9554]
5+
16
Sat Feb 22 10:09:42 2014 Eric Wong <e@80x24.org>
27

38
* ext/socket/ancdata.c (bsock_sendmsg_internal): only retry on error

ext/io/console/console.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@ console_dev(VALUE klass)
684684
int fd;
685685

686686
#ifdef CONSOLE_DEVICE_FOR_WRITING
687-
fd = open(CONSOLE_DEVICE_FOR_WRITING, O_WRONLY);
687+
fd = open(CONSOLE_DEVICE_FOR_WRITING, O_RDWR);
688688
if (fd < 0) return Qnil;
689689
rb_update_max_fd(fd);
690690
args[1] = INT2FIX(O_WRONLY);

version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#define RUBY_VERSION "1.9.3"
2-
#define RUBY_PATCHLEVEL 541
2+
#define RUBY_PATCHLEVEL 542
33

44
#define RUBY_RELEASE_DATE "2014-02-22"
55
#define RUBY_RELEASE_YEAR 2014

0 commit comments

Comments
 (0)