summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-02 19:27:59 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-02 19:27:59 +0000
commit55a1b1d97a090eec8987c4a9c8541c2d3efc1110 (patch)
tree6f90046ca4b06517fd1eac43227775801434211c
parentab8e05cc451249202e32a4f8a901a9edf7101b14 (diff)
* thread.c (rb_thread_select): preserve errno if no error
occurred. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31412 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--thread.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0f753b0828..f40f3eeefc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May 3 04:27:53 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * thread.c (rb_thread_select): preserve errno if no error
+ occurred.
+
Tue May 3 03:57:04 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/intern.h (rb_w32_fdcopy): add prototype. fixes
diff --git a/thread.c b/thread.c
index dd40be0ece..c272256d4b 100644
--- a/thread.c
+++ b/thread.c
@@ -2672,7 +2672,7 @@ rb_thread_select(int max, fd_set * read, fd_set * write, fd_set * except,
return 0;
}
else {
- int lerrno;
+ int lerrno = errno;
int result;
BLOCKING_REGION({