Skip to content

Commit

Permalink
matz - net library bug (by me)
Browse files Browse the repository at this point in the history
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@950 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
matz committed Sep 21, 2000
1 parent fc57cd5 commit 13243e5
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 5 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Wed Sep 20 23:21:38 2000 Yukihiro Matsumoto <[email protected]>

* 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 <[email protected]>

* eval.c (rb_provided): detect infnite load loop.
Expand Down
3 changes: 2 additions & 1 deletion eval.c
Original file line number Diff line number Diff line change
Expand Up @@ -1880,6 +1880,7 @@ call_trace_func(event, file, line, self, id, klass)
PUSH_FRAME();
*ruby_frame = *prev;
ruby_frame->prev = prev;
ruby_frame->iter = 0; /* blocks not available anyway */

if (file) {
ruby_frame->line = ruby_sourceline = line;
Expand Down Expand Up @@ -6022,7 +6023,7 @@ proc_call(proc, args)
volatile int orphan;
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_class2name(CLASS_OF(proc)),
rb_id2name(ruby_frame->last_func));
Expand Down
4 changes: 1 addition & 3 deletions lib/net/http.rb
Original file line number Diff line number Diff line change
Expand Up @@ -350,13 +350,11 @@ def connecting( u_header, ublock )
@socket.reopen
end

yield( u_header )
resp = yield( u_header )
if ublock then
adapter = HTTPReadAdapter.new( @command )
ublock.call adapter
resp = adapter.off
else
resp = @command.get_response
end

unless keep_alive? u_header, resp then
Expand Down
2 changes: 1 addition & 1 deletion lib/thwait.rb
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def join(*threads)

# adds thread(s) to join, no wait.
def join_nowait(*threads)
@threads.concat threads
@threads.concat threads.flatten
for th in threads
Thread.start do
th = th.join
Expand Down
1 change: 1 addition & 0 deletions ruby.c
Original file line number Diff line number Diff line change
Expand Up @@ -816,6 +816,7 @@ load_file(fname, script)
rb_io_ungetc(f, c);
}
require_libraries(); /* Why here? unnatural */
if (NIL_P(c)) return;
}
rb_compile_file(fname, f, line_start);
if (script && ruby__end__seen) {
Expand Down

0 comments on commit 13243e5

Please sign in to comment.