Do not append the port for a SSL redirect

stjhimy · Aug 10, 2016 · 56c271d · 56c271d
1 parent a0dbf9b
commit 56c271d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/lib/rack/www.rb b/lib/rack/www.rb
@@ -81,7 +81,7 @@ def prepare_url(env)
 
     def extract_host(env)
       [env['SERVER_NAME'].to_s.gsub(/^(#{@subdomain}\.|www\.)/, ''),
-       env['SERVER_PORT'] == '80' ? '' : ":#{env['SERVER_PORT']}",
+       ['80', '443'].include?(env['SERVER_PORT']) ? '' : ":#{env['SERVER_PORT']}",
        env['PATH_INFO'],
        env['QUERY_STRING'].empty? ? '' : '?' + env['QUERY_STRING'].to_s]
     end

diff --git a/test/www_false_test.rb b/test/www_false_test.rb
@@ -11,6 +11,12 @@ def test_www_false
                  last_response.headers['Location']
   end
 
+  def test_www_false_with_ssl
+    get 'https://www.example.com/'
+    assert_equal 'https://example.com/',
+                 last_response.headers['Location']
+  end
+
   def test_www_false_with_path
     get 'http://www.example.com/path/1'
     assert_equal 'http://example.com/path/1',

diff --git a/test/www_true_test.rb b/test/www_true_test.rb
@@ -25,6 +25,11 @@ def test_www_true
     assert_equal 'http://www.example.com/', last_response.headers['Location']
   end
 
+  def test_www_true_with_ssl
+    get 'https://example.com/'
+    assert_equal 'https://www.example.com/', last_response.headers['Location']
+  end
+
   def test_www_true_with_path
     get 'http://example.com/path/1'
     assert_equal 'http://www.example.com/path/1',