1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* io.c (nogvl_copy_stream_sendfile): jump to retry_sendfile directly

Browse Source 
to avoid select() on a socket which TCP state is CLOSED.
  patch by Eric Wong.  [ruby-core:31053]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28557 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2010-07-06 13:59:12 +00:00
parent 80b9fb5a7b
commit 5bf4c6a635
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Tue Jul 6 22:57:21 2010 Tanaka Akira <akr@fsij.org>
* io.c (nogvl_copy_stream_sendfile): jump to retry_sendfile directly
to avoid select() on a socket which TCP state is CLOSED.
patch by Eric Wong. [ruby-core:31053]
Tue Jul 6 21:45:34 2010 NAKAMURA Usaku <usa@ruby-lang.org> Tue Jul 6 21:45:34 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* io/console/console.c (winsize_row): should return actual screen * io/console/console.c (winsize_row): should return actual screen

3
io.c
View File

@ -8147,8 +8147,7 @@ nogvl_copy_stream_sendfile(struct copy_stream_struct *stp)
stp->total += ss; stp->total += ss;
copy_length -= ss; copy_length -= ss;
if (0 < copy_length) { if (0 < copy_length) {
ss = -1; goto retry_sendfile;
errno = EAGAIN;
} }
} }
if (ss == -1) { if (ss == -1) {