yahns Ruby server user/dev discussion
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: yahns-public@yhbt.net
Subject: [PATCH] response: only stream "file" responses on known length
Date: Tue,  8 Nov 2016 23:21:40 +0000	[thread overview]
Message-ID: <20161108232140.21752-1-e@80x24.org> (raw)

This means we need to check Content-Length and use it
properly (unless Content-Range is set).
---
 lib/yahns/http_response.rb | 9 ++++++---
 lib/yahns/stream_file.rb   | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/yahns/http_response.rb b/lib/yahns/http_response.rb
index 32d1a45..ca28bbf 100644
--- a/lib/yahns/http_response.rb
+++ b/lib/yahns/http_response.rb
@@ -60,7 +60,7 @@ def err_response(code)
   end
 
   def response_header_blocked(header, body, alive, offset, count)
-    if body.respond_to?(:to_path)
+    if body.respond_to?(:to_path) && count
       alive = Yahns::StreamFile.new(body, alive, offset, count)
       body = nil
     end
@@ -152,7 +152,8 @@ def http_response_write(res, opt)
           alive = false if value =~ /\bclose\b/i
         when %r{\AContent-Length\z}i
           term = true
-          flags |= MSG_MORE if value.to_i > 0 && !hdr_only
+          clen = value.to_i
+          flags |= MSG_MORE if clen > 0 && !hdr_only
           kv_str(buf, key, value)
         when %r{\ATransfer-Encoding\z}i
           term = true if value =~ /\bchunked\b/i
@@ -163,6 +164,8 @@ def http_response_write(res, opt)
           kv_str(buf, key, value)
         end
       end
+      count ||= clen
+
       if !term && chunk_ok
         term = true
         body = Yahns::ChunkBody.new(body, opt)
@@ -194,7 +197,7 @@ def http_response_write(res, opt)
     return response_hijacked(hijack) if hijack
     return http_response_done(alive) if hdr_only
 
-    if body.respond_to?(:to_path)
+    if body.respond_to?(:to_path) && count
       @state = body = Yahns::StreamFile.new(body, alive, offset, count)
       return step_write
     end
diff --git a/lib/yahns/stream_file.rb b/lib/yahns/stream_file.rb
index fdba5bf..6cce7a0 100644
--- a/lib/yahns/stream_file.rb
+++ b/lib/yahns/stream_file.rb
@@ -27,8 +27,8 @@ def initialize(body, persist, offset, count)
         retry
       end
     end
-    @sf_offset = offset
-    @sf_count = count || @tmpio.size
+    @sf_offset = offset || 0
+    @sf_count = count
     @wbuf_persist = persist # whether or not we keep the connection alive
     @body = body
   end
-- 
EW


             reply	other threads:[~2016-11-08 23:21 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-08 23:21 Eric Wong [this message]
2016-11-08 23:28 ` [PATCH] response: only stream "file" responses on known length Eric Wong

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=20161108232140.21752-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).