зеркало из https://github.com/github/ruby.git
matz - net library bug (by me)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@950 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
fc57cd59ff
Коммит
13243e5ad1
|
@ -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>
|
||||
|
||||
* eval.c (rb_provided): detect infnite load loop.
|
||||
|
|
3
eval.c
3
eval.c
|
@ -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;
|
||||
|
@ -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));
|
||||
|
|
|
@ -350,13 +350,11 @@ module Net
|
|||
@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
|
||||
|
|
|
@ -96,7 +96,7 @@ class ThreadsWait
|
|||
|
||||
# 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
|
||||
|
|
1
ruby.c
1
ruby.c
|
@ -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) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче