yahns Ruby server user/dev discussion
 help / color / mirror / code / Atom feed
* [PATCH] stream_file: remove #to_io support from responses
@ 2016-11-08 23:21 Eric Wong
  0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2016-11-08 23:21 UTC (permalink / raw)
  To: yahns-public

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


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2016-11-08 23:21 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-11-08 23:21 [PATCH] stream_file: remove #to_io support from responses Eric Wong

Code repositories for project(s) associated with this inbox:

	../../../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).