SHIBATA Hiroshi
syste****@okkez*****
2013年 6月 17日 (月) 12:33:34 JST
SHIBATA Hiroshi 2013-06-17 12:33:34 +0900 (Mon, 17 Jun 2013) New Revision: 8af2c04f3cfa8b592e0b411ae7275fc3fbeef95f https://github.com/hiki/hiki/commit/8af2c04f3cfa8b592e0b411ae7275fc3fbeef95f Merged f0abfab: Merge pull request #39 from hiki/disable-safelevel4 Message: disabled $SAFE=4 when running with ruby-trunk Modified files: hiki/config.rb Modified: hiki/config.rb (+6 -2) =================================================================== --- hiki/config.rb 2013-06-17 12:23:55 +0900 (80f6967) +++ hiki/config.rb 2013-06-17 12:33:34 +0900 (f37df35) @@ -228,8 +228,12 @@ module Hiki b = binding.taint eval( def_vars1, b ) Thread.start { - $SAFE = 4 - eval( cgi_conf, b, "(hiki.conf)", 1 ) + begin + $SAFE = 4 + rescue ArgumentError + ensure + eval( cgi_conf, b, "(hiki.conf)", 1 ) + end }.join eval( def_vars2, b ) rescue IOError, Errno::ENOENT
