* bin/erb: $SAFE=3 is obsolete.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50963 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kazu 2015-06-18 14:53:26 +00:00
parent 2c23924e91
commit 6c45fa78cb
2 changed files with 6 additions and 2 deletions

View File

@ -1,3 +1,7 @@
Thu Jun 18 23:51:51 2015 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* bin/erb: $SAFE=3 is obsolete.
Thu Jun 18 23:45:11 2015 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> Thu Jun 18 23:45:11 2015 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* safe.c: removed needless doc related $SAFE=2 * safe.c: removed needless doc related $SAFE=2

View File

@ -76,7 +76,7 @@ class ERB
require ARGV.req_arg require ARGV.req_arg
when '-S' # security level when '-S' # security level
arg = ARGV.req_arg arg = ARGV.req_arg
raise "invalid safe_level #{arg.dump}" unless arg =~ /\A[0-3]\z/ raise "invalid safe_level #{arg.dump}" unless arg =~ /\A[0-1]\z/
safe_level = arg.to_i safe_level = arg.to_i
when '-T' # trim mode when '-T' # trim mode
arg = ARGV.req_arg arg = ARGV.req_arg
@ -112,7 +112,7 @@ class ERB
-v enable verbose mode -v enable verbose mode
-d set $DEBUG to true -d set $DEBUG to true
-r library load a library -r library load a library
-S safe_level set $SAFE (0..3) -S safe_level set $SAFE (0..1)
-E ex[:in] set default external/internal encodings -E ex[:in] set default external/internal encodings
-U set default encoding to UTF-8. -U set default encoding to UTF-8.
-T trim_mode specify trim_mode (0..2, -) -T trim_mode specify trim_mode (0..2, -)