diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | win32/win32.c | 6 |
2 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Tue Nov 30 12:23:52 2010 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/win32.c (rb_w32_read): read only 1 byte at once on console. + workaround of Windows bug. see [ruby-core:33460]. + this is not the final solution. + Tue Nov 30 11:39:13 2010 NARUSE, Yui <naruse@ruby-lang.org> * lib/net/http.rb: improve rdoc. diff --git a/win32/win32.c b/win32/win32.c index 67160bdb71..3e1da087b9 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -5027,6 +5027,7 @@ rb_w32_read(int fd, void *buf, size_t size) size_t len; size_t ret; OVERLAPPED ol, *pol = NULL; + BOOL isconsole; int start = 0; if (is_socket(sock)) @@ -5049,11 +5050,12 @@ rb_w32_read(int fd, void *buf, size_t size) } ret = 0; + isconsole = is_console(_osfhnd(fd)); retry: /* get rid of console reading bug */ - if (is_console(_osfhnd(fd))) { + if (isconsole) { if (start) - len = min(16 * 1024, size); + len = 1; else { len = 0; start = 1; |