Skip to content

Commit 737ef3f

Browse files
author
matz
committed
* eval.c (eval): need not to protect $SAFE value.
[ruby-core:07177] * struct.c (rb_struct_select): update RDoc description. [ruby-core:7254] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9873 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent 2bde26b commit 737ef3f

File tree

4 files changed

+18
-9
lines changed

4 files changed

+18
-9
lines changed

ChangeLog

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
Thu Feb 2 16:01:24 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
2+
3+
* eval.c (eval): need not to protect $SAFE value.
4+
[ruby-core:07177]
5+
16
Thu Feb 2 14:45:53 2006 Ville Mattila <ville.mattila@stonesoft.com>
27

38
* configure.in: The isinf is not regognized by autoconf
@@ -12,6 +17,11 @@ Wed Feb 1 22:01:47 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
1217
* ruby.c (set_arg0): if use setenv(3), environ space cannot be used
1318
for altering argv[0].
1419

20+
Tue Jan 31 14:46:28 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
21+
22+
* struct.c (rb_struct_select): update RDoc description.
23+
[ruby-core:7254]
24+
1525
Tue Jan 31 11:58:51 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
1626

1727
* ext/tk/lib/multi-tk.rb: add MultiTkIp#eval and bg_eval.
@@ -228,6 +238,12 @@ Thu Dec 29 17:02:07 2005 Tanaka Akira <akr@m17n.org>
228238
* test/ruby/envutil.rb (EnvUtil.rubybin): search "ruby" instead of
229239
"miniruby". [ruby-dev:28140]
230240

241+
Tue Dec 27 16:59:52 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
242+
243+
* test/drb/drbtest.rb (DRbService::self.ext_service): increase
244+
timeout limit. a patch from Kazuhiro NISHIYAMA
245+
<zn at mbf.nifty.com>. [ruby-dev:28132]
246+
231247
Tue Dec 27 08:29:18 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
232248

233249
* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLSocket#post_connection_chech):

eval.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6366,7 +6366,6 @@ eval(self, src, scope, file, line)
63666366
POP_TAG();
63676367
POP_CLASS();
63686368
ruby_in_eval--;
6369-
ruby_safe_level = safe;
63706369
if (!NIL_P(scope)) {
63716370
int dont_recycle = ruby_scope->flags & SCOPE_DONT_RECYCLE;
63726371

struct.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -728,21 +728,15 @@ rb_struct_values_at(argc, argv, s)
728728

729729
/*
730730
* call-seq:
731-
* struct.select(fixnum, ... ) => array
732731
* struct.select {|i| block } => array
733732
*
734-
* The first form returns an array containing the elements in
735-
* <i>struct</i> corresponding to the given indices. The second
736-
* form invokes the block passing in successive elements from
733+
* Invokes the block passing in successive elements from
737734
* <i>struct</i>, returning an array containing those elements
738735
* for which the block returns a true value (equivalent to
739736
* <code>Enumerable#select</code>).
740737
*
741738
* Lots = Struct.new(:a, :b, :c, :d, :e, :f)
742739
* l = Lots.new(11, 22, 33, 44, 55, 66)
743-
* l.select(1, 3, 5) #=> [22, 44, 66]
744-
* l.select(0, 2, 4) #=> [11, 33, 55]
745-
* l.select(-1, -3, -5) #=> [66, 44, 22]
746740
* l.select {|v| (v % 2).zero? } #=> [22, 44, 66]
747741
*/
748742

test/drb/drbtest.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def self.server
3131
@server || @@server
3232
end
3333
def self.ext_service(name)
34-
timeout(10, RuntimeError) do
34+
timeout(100, RuntimeError) do
3535
manager.service(name)
3636
end
3737
end

0 commit comments

Comments
 (0)