unicorn Ruby/Rack server user+dev discussion/patches/pulls/bugs/help
 help / color / mirror / code / Atom feed
From: Eric Wong <normalperson@yhbt.net>
To: mongrel-unicorn@rubyforge.org
Subject: [PATCH 2/2] http_request: drop conditional assignment for hijack
Date: Sat,  9 Feb 2013 01:16:18 +0000	[thread overview]
Message-ID: <1360372578-29291-3-git-send-email-normalperson@yhbt.net> (raw)
In-Reply-To: <1360372578-29291-1-git-send-email-normalperson@yhbt.net>

As far as I can tell, this was never necessary.
---
 lib/unicorn/http_request.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/unicorn/http_request.rb b/lib/unicorn/http_request.rb
index 681c0ca..6b20431 100644
--- a/lib/unicorn/http_request.rb
+++ b/lib/unicorn/http_request.rb
@@ -108,7 +108,7 @@ class Unicorn::HttpParser
     end
 
     def hijack_setup(e, socket)
-      e[RACK_HIJACK] = proc { e[RACK_HIJACK_IO] ||= socket }
+      e[RACK_HIJACK] = proc { e[RACK_HIJACK_IO] = socket }
     end
   else
     # old Rack, do nothing.
-- 
1.8.1.2.526.gf51a757

_______________________________________________
Unicorn mailing list - mongrel-unicorn@rubyforge.org
http://rubyforge.org/mailman/listinfo/mongrel-unicorn
Do not quote signatures (like this one) or top post when replying

      parent reply	other threads:[~2013-02-09  1:23 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-09  1:16 What's cooking in unicorn.git Eric Wong
2013-02-09  1:16 ` [PATCH 1/2] http_request: remove FIXME for rack.version clarification Eric Wong
2013-02-09  1:16 ` Eric Wong [this message]

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/unicorn/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1360372578-29291-3-git-send-email-normalperson@yhbt.net \
    --to=normalperson@yhbt.net \
    --cc=mongrel-unicorn@rubyforge.org \
    /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/unicorn.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).