From: Eric Wong <firstname.lastname@example.org> To: email@example.com Subject: [PATCH] http_client: set state to :ignore before hijack callback Date: Mon, 9 May 2016 22:20:46 +0000 [thread overview] Message-ID: <firstname.lastname@example.org> (raw) We need to set state as early as possible as any modification of our HttpClient object is unsafe after it is handed over to the underlying application. Otherwise, we could be clobbering a state set inside the hijack but before we hit the case statement in HttpClient#step_write. This bug should not affect current (known) uses of rack.hijack; but will be necessary for upcoming proxy_pass to support unbuffered proxy responses. --- lib/yahns/http_client.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/yahns/http_client.rb b/lib/yahns/http_client.rb index 272db85..1d64e08 100644 --- a/lib/yahns/http_client.rb +++ b/lib/yahns/http_client.rb @@ -22,8 +22,7 @@ def step_write case rv = @state.wbuf_flush(self) when :wait_writable, :wait_readable return rv # tell epoll/kqueue to wait on this more - when :ignore # :ignore on hijack - @state = :ignore + when :ignore # :ignore on hijack, @state already set in hijack_cleanup return :ignore when Yahns::StreamFile @state = rv # continue looping @@ -254,8 +253,9 @@ def yahns_read(bytes, buf) # (and complicated) as our hijack support will allow "un-hijacking" # the socket. def hijack_cleanup - # prevent socket from holding process up + # prevent socket from holding process exit up Thread.current[:yahns_fdmap].forget(self) + @state = :ignore @input = nil # keep env["rack.input"] accessible, though end -- e
reply other threads:[~2016-05-09 22:20 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 \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --subject='Re: [PATCH] http_client: set state to :ignore before hijack callback' \ /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
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).