Merges with Master (and solves conflicts)

2019-03-24 13:01:29 +00:00
parent 047a188b34 fa0582ce0b
commit f9435906e7
27 changed files with 245 additions and 80 deletions
--- a/app/finders/timthumbs/known_locations.rb
+++ b/app/finders/timthumbs/known_locations.rb
@@ -24,15 +24,13 @@ module WPScan
        end

        # @param [ Typhoeus::Response ] res
-        # @param [ Regexp,nil ] exclude_content
+        # @param [ Regexp, nil ] exclude_content
        #
        # @return [ Boolean ]
        def valid_response?(res, _exclude_content = nil)
          return false unless res.code == 400

-          full_res = Browser.get(res.effective_url, cache_ttl: 0)
-
-          full_res.body =~ /no image specified/i ? true : false
+          Browser.get(res.effective_url).body =~ /no image specified/i ? true : false
        end

        # @param [ Hash ] opts