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] wbuf_common: reset offset counter when done
Date: Tue, 14 Jun 2016 19:41:47 +0000	[thread overview]
Message-ID: <20160614194147.3813-1-e@80x24.org> (raw)

This fixes a case where "proxy_buffering: false" users may
encounter a "upstream error: BUG: EOF on tmpio sf_offset="
as a wbuf may be reused.

Oddly, it took over one week of running the latest proxy_pass
as of commit 616e42c8d609905d9355bb5db726a5348303ffae
("proxy_pass: fix HTTP/1.0 backends on EOF w/o buffering")
 lib/yahns/wbuf_common.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/yahns/wbuf_common.rb b/lib/yahns/wbuf_common.rb
index cded2e3..2799baf 100644
--- a/lib/yahns/wbuf_common.rb
+++ b/lib/yahns/wbuf_common.rb
@@ -19,7 +19,10 @@ module Yahns::WbufCommon # :nodoc:
   def wbuf_flush(client)
     case rv = client.trysendfile(@tmpio, @sf_offset, @sf_count)
     when Integer
-      return wbuf_close(client) if (@sf_count -= rv) == 0 # all sent!
+      if (@sf_count -= rv) == 0 # all sent!
+        @sf_offset = 0
+        return wbuf_close(client)
+      end
       @sf_offset += rv # keep going otherwise
     when :wait_writable, :wait_readable

                 reply	other threads:[~2016-06-14 19:41 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:

  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=20160614194147.3813-1-e@80x24.org \
    --to=e@80x24.org \
    --cc=yahns-public@yhbt.net \


* 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


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