diff options
Diffstat (limited to 'ext/socket')
-rw-r--r-- | ext/socket/extconf.rb | 4 | ||||
-rw-r--r-- | ext/socket/socket.c | 20 |
2 files changed, 4 insertions, 20 deletions
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb index 3582c21c41..7dadd70078 100644 --- a/ext/socket/extconf.rb +++ b/ext/socket/extconf.rb @@ -338,9 +338,9 @@ if have_func(test_func) end if ENV["SOCKS_SERVER"] or enable_config("socks", false) if have_library("socks5", "SOCKSinit") - $CFLAGS="-DSOCKS5 -DSOCKS" + $CFLAGS+=" -DSOCKS5 -DSOCKS" elsif have_library("socks", "Rconnect") - $CFLAGS="-DSOCKS" + $CFLAGS+=" -DSOCKS" end end create_makefile("socket") diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 1ef2e894f0..891a354929 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -182,9 +182,7 @@ sock_new(class, fd) fp->f = rb_fdopen(fd, "r"); #ifdef NT fp->finalize = sock_finalize; - fd = myfddup(fd); #else - fd = dup(fd); #endif fp->f2 = rb_fdopen(fd, "w"); fp->mode = FMODE_READWRITE; @@ -233,18 +231,10 @@ bsock_close_read(sock) } GetOpenFile(sock, fptr); shutdown(fileno(fptr->f), 0); - if (fptr->f2 == 0) { + if (!(fptr->mode & FMODE_WRITABLE)) { return rb_io_close(sock); } - rb_thread_fd_close(fileno(fptr->f)); fptr->mode &= ~FMODE_READABLE; -#ifdef NT - myfdclose(fptr->f); -#else - fclose(fptr->f); -#endif - fptr->f = fptr->f2; - fptr->f2 = 0; return Qnil; } @@ -259,17 +249,11 @@ bsock_close_write(sock) rb_raise(rb_eSecurityError, "Insecure: can't close socket"); } GetOpenFile(sock, fptr); - if (fptr->f2 == 0) { + if (!(fptr->mode & FMODE_READABLE)) { return rb_io_close(sock); } shutdown(fileno(fptr->f2), 1); fptr->mode &= ~FMODE_WRITABLE; -#ifdef NT - myfdclose(fptr->f2); -#else - fclose(fptr->f2); -#endif - fptr->f2 = 0; return Qnil; } |