kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

matz - net library bug (by me)

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@950 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2000-09-21 06:37:24 +00:00
parent fc57cd59ff
commit 13243e5ad1
5 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Sep 20 23:21:38 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
* ruby.c (load_file): two Ctrl-D was required to stop ruby at the
beginning of stdin script read.
Wed Sep 20 14:01:45 2000 Yukihiro Matsumoto <matz@ruby-lang.org> Wed Sep 20 14:01:45 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_provided): detect infnite load loop. * eval.c (rb_provided): detect infnite load loop.

3
eval.c
View file

@ -1880,6 +1880,7 @@ call_trace_func(event, file, line, self, id, klass)
PUSH_FRAME(); PUSH_FRAME();
*ruby_frame = *prev; *ruby_frame = *prev;
ruby_frame->prev = prev; ruby_frame->prev = prev;
ruby_frame->iter = 0; /* blocks not available anyway */
if (file) { if (file) {
ruby_frame->line = ruby_sourceline = line; ruby_frame->line = ruby_sourceline = line;
@ -6022,7 +6023,7 @@ proc_call(proc, args)
volatile int orphan; volatile int orphan;
volatile int safe = ruby_safe_level; volatile int safe = ruby_safe_level;
if (rb_block_given_p()) { if (rb_block_given_p() && ruby_frame->last_func) {
rb_warning("block for %s#%s is useless", rb_warning("block for %s#%s is useless",
rb_class2name(CLASS_OF(proc)), rb_class2name(CLASS_OF(proc)),
rb_id2name(ruby_frame->last_func)); rb_id2name(ruby_frame->last_func));

4
lib/net/http.rb
View file

@ -350,13 +350,11 @@ module Net
@socket.reopen @socket.reopen
end end
yield( u_header ) resp = yield( u_header )
if ublock then if ublock then
adapter = HTTPReadAdapter.new( @command ) adapter = HTTPReadAdapter.new( @command )
ublock.call adapter ublock.call adapter
resp = adapter.off resp = adapter.off
else
resp = @command.get_response
end end
unless keep_alive? u_header, resp then unless keep_alive? u_header, resp then

2
lib/thwait.rb
View file

@ -96,7 +96,7 @@ class ThreadsWait
# adds thread(s) to join, no wait. # adds thread(s) to join, no wait.
def join_nowait(*threads) def join_nowait(*threads)
@threads.concat threads @threads.concat threads.flatten
for th in threads for th in threads
Thread.start do Thread.start do
th = th.join th = th.join

1
ruby.c
View file

@ -816,6 +816,7 @@ load_file(fname, script)
rb_io_ungetc(f, c); rb_io_ungetc(f, c);
} }
require_libraries(); /* Why here? unnatural */ require_libraries(); /* Why here? unnatural */
if (NIL_P(c)) return;
} }
rb_compile_file(fname, f, line_start); rb_compile_file(fname, f, line_start);
if (script && ruby__end__seen) { if (script && ruby__end__seen) {