about summary refs log tree commit homepage
path: root/lib/rainbows/const.rb
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2009-12-13 23:14:47 -0800
committerEric Wong <normalperson@yhbt.net>2009-12-13 23:18:41 -0800
commit51e656e3db593c662e7abdf969dd79570525aac9 (patch)
tree4fe16d1e1c7d70482fab469c6c3ddedc624a4547 /lib/rainbows/const.rb
parentf4798796921b20130baf57e5accb3be7efaef861 (diff)
downloadrainbows-51e656e3db593c662e7abdf969dd79570525aac9.tar.gz
Make RACK_DEFAULTS == Unicorn::HttpRequest::DEFAULTS
and LOCALHOST == Unicorn::HttpRequest::LOCALHOST

No point in having a duplicate objects, and it also makes it
easier to share runtime constant modifications between servers.
Diffstat (limited to 'lib/rainbows/const.rb')
-rw-r--r--lib/rainbows/const.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/rainbows/const.rb b/lib/rainbows/const.rb
index 1018623..e707ca5 100644
--- a/lib/rainbows/const.rb
+++ b/lib/rainbows/const.rb
@@ -7,7 +7,7 @@ module Rainbows
 
     include Unicorn::Const
 
-    RACK_DEFAULTS = ::Unicorn::HttpRequest::DEFAULTS.merge({
+    RACK_DEFAULTS = Unicorn::HttpRequest::DEFAULTS.update({
       "SERVER_SOFTWARE" => "Rainbows! #{RAINBOWS_VERSION}",
 
       # using the Rev model, we'll automatically chunk pipe and socket objects
@@ -17,7 +17,7 @@ module Rainbows
 
     CONN_CLOSE = "Connection: close\r\n"
     CONN_ALIVE = "Connection: keep-alive\r\n"
-    LOCALHOST = "127.0.0.1"
+    LOCALHOST = Unicorn::HttpRequest::LOCALHOST
 
     # client IO object that supports reading and writing directly
     # without filtering it through the HTTP chunk parser.