summaryrefslogtreecommitdiff
path: root/safe.c
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-06-17 05:29:51 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-06-17 05:29:51 +0000
commitbbf440c90b036c733729b1a5c996978ac2adaa9d (patch)
tree63a68dca7be09eb7be8a1d5e9c58bb5726688ee9 /safe.c
parent3759dfa23e6d6106d93a5c9bf845b0fc620a2512 (diff)
* include/ruby/ruby.h: $SAFE=3 is now obsolete.
* ext/socket/init.c, ext/socket/socket.c, ext/socket/tcpsocket.c ext/socket/udpsocket.c, gc.c, object.c, re.c, safe.c: removed code for $SAFE=3 * bootstraptest/test_method.rb, test/erb/test_erb.rb, test/ruby/test_dir.rb test/ruby/test_file.rb, test/ruby/test_method.rb, test/ruby/test_regexp.rb test/ruby/test_thread.rb: remove tests for $SAFE=3 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50932 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'safe.c')
-rw-r--r--safe.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/safe.c b/safe.c
index 1f954ec8b9..68adfb7a3b 100644
--- a/safe.c
+++ b/safe.c
@@ -25,7 +25,7 @@
#undef rb_secure
#undef rb_set_safe_level
-#undef ruby_safe_level_4_warning
+#undef ruby_safe_level_3_warning
int
ruby_safe_level_4_warning(void)
@@ -52,7 +52,7 @@ rb_set_safe_level(int level)
if (level > th->safe_level) {
if (level > SAFE_LEVEL_MAX) {
- rb_raise(rb_eArgError, "$SAFE=4 is obsolete");
+ rb_raise(rb_eArgError, "$SAFE=3 and 4 is obsolete");
}
th->safe_level = level;
}
@@ -79,7 +79,7 @@ safe_setter(VALUE val)
rb_warning("$SAFE=3 does no sandboxing");
}
if (level > SAFE_LEVEL_MAX) {
- rb_raise(rb_eArgError, "$SAFE=4 is obsolete");
+ rb_raise(rb_eArgError, "$SAFE=3 and 4 is obsolete");
}
th->safe_level = level;
}