Merge branch 'feature/rm6822-cold_fusion_version' of github.com:lmercer-r7/metasploit-framework into lmercer-r7-feature/rm6822-cold_fusion_version

Author: sinn3r

modules/auxiliary/scanner/http/cold_fusion_version.rb

@@ -36,10 +36,10 @@ def fingerprint(response)
 			end
 		end
 
-		len = (response.body.length > 2500) ?  2500 : response.body.length
 		return nil if response.body.length < 100
 
 		title = "Not Found"
+		response.body.gsub!(/[\r\n]/, '')
 		if(response.body =~ /<title.*\/?>(.+)<\/title\/?>/i)
 			title = $1
 			title.gsub!(/\s/, '')
@@ -51,6 +51,8 @@ def fingerprint(response)
 		if(response.body =~ />\s*Version:\s*(.*)<\/strong\><br\s\//)
 			v = $1
 			out = (v =~ /^6/) ? "Adobe ColdFusion MX6 #{v}" : "Adobe ColdFusion MX7 #{v}"
+		elsif(response.body =~ /<meta name=\"Author\" content=\"Copyright 1995-2012 Adobe/ and response.body =~ /Administrator requires a browser that supports frames/ )
+			out = "Adobe ColdFusion MX7"
 		elsif(response.body =~ /<meta name=\"Author\" content=\"Copyright \(c\) 1995-2006 Adobe/)
 			out = "Adobe ColdFusion 8"
 		elsif(response.body =~ /<meta name=\"Author\" content=\"Copyright \(c\) 1995-2010 Adobe/ or
@@ -77,7 +79,7 @@ def run_host(ip)
 		res = send_request_cgi({
 				'uri' => url,
 				'method' => 'GET',
-				}, 5)
+				}, 10)
 
 		return if not res or not res.body or not res.code
 		res.body.gsub!(/[\r|\n]/, ' ')