What's cooking in unicorn.git

What's cooking in unicorn.git

[Eric Wong]

I've pushed out a few minor changes to master, nothing major.

	git clone git://bogomips.org/unicorn.git

Eric Wong (3):
      auto-generate Unicorn::Const::UNICORN_VERSION
      http_request: remove FIXME for rack.version clarification
      http_request: drop conditional assignment for hijack
_______________________________________________
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

[PATCH 1/2] http_request: remove FIXME for rack.version clarification

[Eric Wong]

commit a9474624a148fe58e0944664190b259787dcf51e in rack.git
---
 lib/unicorn/http_request.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/unicorn/http_request.rb b/lib/unicorn/http_request.rb
index 3795b3b..681c0ca 100644
--- a/lib/unicorn/http_request.rb
+++ b/lib/unicorn/http_request.rb
@@ -98,9 +98,6 @@ class Unicorn::HttpParser
   # Rack 1.5.0 (protocol version 1.2) adds hijack request support
   if ((Rack::VERSION[0] << 8) | Rack::VERSION[1]) >= 0x0102
     DEFAULTS["rack.hijack?"] = true
-
-    # FIXME: asking for clarification about this in
-    # http://mid.gmane.org/20130122100802.GA28585@dcvr.yhbt.net
     DEFAULTS["rack.version"] = [1, 2]
 
     RACK_HIJACK = "rack.hijack".freeze
-- 
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

[PATCH 2/2] http_request: drop conditional assignment for hijack

[Eric Wong]

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