2 files changed, 25 insertions, 31 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/remote_ip.rb b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
index b022fea001..7c4236518d 100644
--- a/actionpack/lib/action_dispatch/middleware/remote_ip.rb
+++ b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
@@ -155,7 +155,7 @@ module ActionDispatch
             range = IPAddr.new(ip).to_range
             # we want to make sure nobody is sneaking a netmask in
             range.begin == range.end
-          rescue ArgumentError, IPAddr::InvalidAddressError
+          rescue ArgumentError
             nil
           end
         end
diff --git a/actionpack/lib/action_dispatch/middleware/static.rb b/actionpack/lib/action_dispatch/middleware/static.rb
index a3e8126ace..e66c21ef85 100644
--- a/actionpack/lib/action_dispatch/middleware/static.rb
+++ b/actionpack/lib/action_dispatch/middleware/static.rb
@@ -16,31 +16,27 @@ module ActionDispatch
     def initialize(root, cache_control)
       @root          = root.chomp('/')
       @compiled_root = /^#{Regexp.escape(root)}/
-      headers        = {}
-      headers['Cache-Control'] = cache_control if cache_control
+      headers        = cache_control && { 'Cache-Control' => cache_control }
       @file_server = ::Rack::File.new(@root, headers)
     end
 
     def match?(path)
-      path = unescape_path(path)
+      path = URI.parser.unescape(path)
       return false unless path.valid_encoding?
 
-      full_path = path.empty? ? @root : File.join(@root, escape_glob_chars(path))
-      paths = "#{full_path}#{ext}"
+      paths = [path, "#{path}#{ext}", "#{path}/index#{ext}"]
 
-      matches = Dir[paths]
-      match = matches.detect { |m| File.file?(m) }
-      if match
-        match.sub!(@compiled_root, '')
-        ::Rack::Utils.escape(match)
+      if match = paths.detect {|p| File.file?(File.join(@root, p)) }
+        return ::Rack::Utils.escape(match)
       end
     end
 
     def call(env)
-      path             = env['PATH_INFO']
-      gzip_file_exists = gzip_file_exists?(path)
-      if gzip_file_exists && gzip_encoding_accepted?(env)
-        env['PATH_INFO'] = "#{path}.gz"
+      path      = env['PATH_INFO']
+      gzip_path = gzip_file_path(path)
+
+      if gzip_path && gzip_encoding_accepted?(env)
+        env['PATH_INFO']            = gzip_path
         status, headers, body       = @file_server.call(env)
         headers['Content-Encoding'] = 'gzip'
         headers['Content-Type']     = content_type(path)
@@ -48,24 +44,16 @@ module ActionDispatch
         status, headers, body = @file_server.call(env)
       end
 
-      headers['Vary'] = 'Accept-Encoding' if gzip_file_exists
+      headers['Vary'] = 'Accept-Encoding' if gzip_path
+
       return [status, headers, body]
+    ensure
+      env['PATH_INFO'] = path
     end
 
     private
       def ext
-        @ext ||= begin
-          ext = ::ActionController::Base.default_static_extension
-          "{,#{ext},/index#{ext}}"
-        end
-      end
-
-      def unescape_path(path)
-        URI.parser.unescape(path)
-      end
-
-      def escape_glob_chars(path)
-        path.gsub(/[*?{}\[\]]/, "\\\\\\&")
+        ::ActionController::Base.default_static_extension
       end
 
       def content_type(path)
@@ -73,11 +61,17 @@ module ActionDispatch
       end
 
       def gzip_encoding_accepted?(env)
-        env['HTTP_ACCEPT_ENCODING'] =~ /\bgzip\b/
+        env['HTTP_ACCEPT_ENCODING'] =~ /\bgzip\b/i
       end
 
-      def gzip_file_exists?(path)
-        File.exist?(File.join(@root, "#{::Rack::Utils.unescape(path)}.gz"))
+      def gzip_file_path(path)
+        can_gzip_mime = content_type(path) =~ /\A(?:text\/|application\/javascript)/
+        gzip_path     = "#{path}.gz"
+        if can_gzip_mime && File.exist?(File.join(@root, ::Rack::Utils.unescape(gzip_path)))
+          gzip_path
+        else
+          false
+        end
       end
   end