diff options
| author | ktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-07 10:40:27 +0000 |
|---|---|---|
| committer | ktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-07 10:40:27 +0000 |
| commit | eebb6bfc79db53559e3cc5d3972f0f4d69651f46 (patch) | |
| tree | d965ec3ad2ec96491473fc38d12db9cd89b5c5e8 | |
| parent | c63800069b23df6e46af0a38fe21885315286068 (diff) | |
* ext/socket/basicsocket.c, ext/socket/sockssocket.c:
remove code for $SAFE=4.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48737 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/socket/basicsocket.c | 9 | ||||
| -rw-r--r-- | ext/socket/sockssocket.c | 3 |
3 files changed, 5 insertions, 12 deletions
@@ -1,3 +1,8 @@ +Sun Dec 7 19:36:12 2014 Kazuki Tsujimoto <kazuki@callcc.net> + + * ext/socket/basicsocket.c, ext/socket/sockssocket.c: + remove code for $SAFE=4. + Sun Dec 7 10:20:55 2014 Eric Hodel <drbrain@segment7.net> * lib/rdoc: Update to RDoc 4.2.0. diff --git a/ext/socket/basicsocket.c b/ext/socket/basicsocket.c index 088234aa85..54559779cf 100644 --- a/ext/socket/basicsocket.c +++ b/ext/socket/basicsocket.c @@ -66,9 +66,6 @@ bsock_shutdown(int argc, VALUE *argv, VALUE sock) int how; rb_io_t *fptr; - if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) { - rb_raise(rb_eSecurityError, "Insecure: can't shutdown socket"); - } rb_scan_args(argc, argv, "01", &howto); if (howto == Qnil) how = SHUT_RDWR; @@ -100,9 +97,6 @@ bsock_close_read(VALUE sock) { rb_io_t *fptr; - if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) { - rb_raise(rb_eSecurityError, "Insecure: can't close socket"); - } GetOpenFile(sock, fptr); shutdown(fptr->fd, 0); if (!(fptr->mode & FMODE_WRITABLE)) { @@ -133,9 +127,6 @@ bsock_close_write(VALUE sock) { rb_io_t *fptr; - if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) { - rb_raise(rb_eSecurityError, "Insecure: can't close socket"); - } GetOpenFile(sock, fptr); if (!(fptr->mode & FMODE_READABLE)) { return rb_io_close(sock); diff --git a/ext/socket/sockssocket.c b/ext/socket/sockssocket.c index 48be4fcf99..81f77a67c5 100644 --- a/ext/socket/sockssocket.c +++ b/ext/socket/sockssocket.c @@ -41,9 +41,6 @@ socks_s_close(VALUE sock) { rb_io_t *fptr; - if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) { - rb_raise(rb_eSecurityError, "Insecure: can't close socket"); - } GetOpenFile(sock, fptr); shutdown(fptr->fd, 2); return rb_io_close(sock); |