summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@ruby-lang.org>2011-10-29 11:02:32 +0000
committerakr <akr@ruby-lang.org>2011-10-29 11:02:32 +0000
commitd496f275812951818df1811e81a2dcd86627cadb (patch)
tree6a7cdeda83c02dc3982dd57aa186602f42818402
parent0556f6ce728cfd9d87c56669e17eb24c208d5d31 (diff)
downloadruby-openssl-history-d496f275812951818df1811e81a2dcd86627cadb.tar.gz
* include/ruby/intern.h (rb_cloexec_dup): declared.
* io.c (rb_cloexec_dup): new function. (ruby_dup): use rb_cloexec_dup. * ext/pty/pty.c (pty_getpty): use rb_cloexec_dup. * ext/openssl/ossl_bio.c (ossl_obj2bio): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33553 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ext/openssl/ossl_bio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/openssl/ossl_bio.c b/ext/openssl/ossl_bio.c
index da63c72..a11c08c 100644
--- a/ext/openssl/ossl_bio.c
+++ b/ext/openssl/ossl_bio.c
@@ -25,10 +25,10 @@ ossl_obj2bio(VALUE obj)
GetOpenFile(obj, fptr);
rb_io_check_readable(fptr);
- if ((fd = dup(FPTR_TO_FD(fptr))) < 0){
+ if ((fd = rb_cloexec_dup(FPTR_TO_FD(fptr))) < 0){
rb_sys_fail(0);
}
- rb_fd_set_cloexec(fd);
+ rb_update_max_fd(fd);
if (!(fp = fdopen(fd, "r"))){
close(fd);
rb_sys_fail(0);