Fix: HTTP_HOST header was getting a trailing ':' appended when no por…

…t was specified.
ihoka · May 30, 2010 · 814e3ed · 814e3ed
1 parent 6890e3b
commit 814e3ed
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/lib/rack/test.rb b/lib/rack/test.rb
@@ -160,8 +160,9 @@ def env_for(path, env)
         uri = URI.parse(path)
         uri.path = "/#{uri.path}" unless uri.path[0] == ?/
         uri.host ||= @default_host
-
-        env["HTTP_HOST"] = "#{uri.host}:#{uri.port}"
+
+        port = uri.port ? ":#{uri.port}" : ''
+        env["HTTP_HOST"] = "#{uri.host}#{port}"
 
         env = default_env.merge(env)
 

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -42,9 +42,14 @@ def check(*args)
     yielded.should be_true
   end
 
-  it "sets the HTTP host" do
-    send(verb, "http://example.com:80/uri")
-    last_request.env["HTTP_HOST"].should == "example.com:80"
+  it "sets the HTTP_HOST header with port" do
+    send(verb, "http://example.org:8080/uri")
+    last_request.env["HTTP_HOST"].should == "example.org:8080"
+  end
+
+  it "sets the HTTP_HOST header without port" do
+    send(verb, "/uri")
+    last_request.env["HTTP_HOST"].should == "example.org"
   end
 
   context "for a XHR" do