2 files changed, 10 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/http/upload.rb b/actionpack/lib/action_dispatch/http/upload.rb
index 84e58d7d6a..37effade4f 100644
--- a/actionpack/lib/action_dispatch/http/upload.rb
+++ b/actionpack/lib/action_dispatch/http/upload.rb
@@ -1,5 +1,3 @@
-require 'active_support/core_ext/object/blank'
-
 module ActionDispatch
   module Http
     class UploadedFile
@@ -13,6 +11,14 @@ module ActionDispatch
         raise(ArgumentError, ':tempfile is required') unless @tempfile
       end
 
+      def open
+        @tempfile.open
+      end
+
+      def path
+        @tempfile.path
+      end
+
       def read(*args)
         @tempfile.read(*args)
       end
diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb
index 4da82f958a..9c9eed2c6d 100644
--- a/actionpack/lib/action_dispatch/http/url.rb
+++ b/actionpack/lib/action_dispatch/http/url.rb
@@ -2,6 +2,7 @@ module ActionDispatch
   module Http
     module URL
       mattr_accessor :tld_length
+      self.tld_length = 1
 
       # Returns the complete URL used for this request.
       def url
@@ -67,7 +68,7 @@ module ActionDispatch
 
       # Returns the \domain part of a \host, such as "rubyonrails.org" in "www.rubyonrails.org". You can specify
       # a different <tt>tld_length</tt>, such as 2 to catch rubyonrails.co.uk in "www.rubyonrails.co.uk".
-      def domain(tld_length = 1)
+      def domain(tld_length = @@tld_length)
         return nil unless named_host?(host)
 
         host.split('.').last(1 + tld_length).join('.')