From: Eric Wong <e@80x24.org>
To: yahns-public@yhbt.net
Subject: [PATCH] stream_file: remove #to_io support from responses
Date: Tue, 8 Nov 2016 23:21:54 +0000 [thread overview]
Message-ID: <20161108232154.21793-1-e@80x24.org> (raw)
This is not a part of any Rack specification, and can lead to
interesting bugs with wrapped classes for gzip and TLS. AFAIK,
.to_io was meant to support IO#wait_*able and IO.select methods,
not to actually perform read/writes on the return value.
---
lib/yahns/stream_file.rb | 30 +++++++++++++-----------------
1 file changed, 13 insertions(+), 17 deletions(-)
diff --git a/lib/yahns/stream_file.rb b/lib/yahns/stream_file.rb
index 19d1692..fdba5bf 100644
--- a/lib/yahns/stream_file.rb
+++ b/lib/yahns/stream_file.rb
@@ -11,24 +11,20 @@ class Yahns::StreamFile # :nodoc:
NeedClose = Class.new(File) # :nodoc:
def initialize(body, persist, offset, count)
- if body.respond_to?(:to_io)
- @tmpio = body.to_io
+ path = body.to_path
+ if path =~ %r{\A/dev/fd/(\d+)\z}
+ @tmpio = IO.for_fd($1.to_i)
+ @tmpio.autoclose = false
else
- path = body.to_path
- if path =~ %r{\A/dev/fd/(\d+)\z}
- @tmpio = IO.for_fd($1.to_i)
- @tmpio.autoclose = false
- else
- retried = false
- begin
- @tmpio = NeedClose.open(path)
- rescue Errno::EMFILE, Errno::ENFILE
- raise if retried
- retried = true
- Thread.current[:yahns_fdmap].desperate_expire(5)
- sleep(1)
- retry
- end
+ retried = false
+ begin
+ @tmpio = NeedClose.open(path)
+ rescue Errno::EMFILE, Errno::ENFILE
+ raise if retried
+ retried = true
+ Thread.current[:yahns_fdmap].desperate_expire(5)
+ sleep(1)
+ retry
end
end
@sf_offset = offset
--
EW
reply other threads:[~2016-11-08 23:21 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://yhbt.net/yahns/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161108232154.21793-1-e@80x24.org \
--to=e@80x24.org \
--cc=yahns-public@yhbt.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhbt.net/yahns.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).