sop passing host and secure to the build method

eventually we will make the cookie jar derive these values from the
request object rather than save a reference to the values

2 files changed, 5 insertions, 3 deletions

diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb
index b654078b66..a9c7419aae 100644
--- a/actionpack/lib/action_dispatch/middleware/cookies.rb
+++ b/actionpack/lib/action_dispatch/middleware/cookies.rb
@@ -8,7 +8,7 @@ require 'active_support/json'
 module ActionDispatch
   class Request < Rack::Request
     def cookie_jar
-      env['action_dispatch.cookies'] ||= Cookies::CookieJar.build(self, host, ssl?, cookies)
+      env['action_dispatch.cookies'] ||= Cookies::CookieJar.build(self, cookies)
     end
 
     def key_generator
@@ -254,8 +254,10 @@ module ActionDispatch
       # $& => example.local
       DOMAIN_REGEXP = /[^.]*\.([^.]*|..\...|...\...)$/
 
-      def self.build(req, host, secure, cookies)
+      def self.build(req, cookies)
         key_generator = req.key_generator
+        host = req.host
+        secure = req.ssl?
         new(key_generator, host, secure, req).tap do |hash|
           hash.update(cookies)
         end
diff --git a/actionpack/lib/action_dispatch/testing/test_process.rb b/actionpack/lib/action_dispatch/testing/test_process.rb
index c410d36a1e..c28d701b48 100644
--- a/actionpack/lib/action_dispatch/testing/test_process.rb
+++ b/actionpack/lib/action_dispatch/testing/test_process.rb
@@ -19,7 +19,7 @@ module ActionDispatch
     end
 
     def cookies
-      @cookie_jar ||= Cookies::CookieJar.build(@request, @request.host, @request.ssl?, @request.cookies)
+      @cookie_jar ||= Cookies::CookieJar.build(@request, @request.cookies)
     end
 
     def redirect_to_url