Bump up the wait_timeout (works with the recent AR patch) and fix a typo in the http_version commit

lib/msf/core/db_manager.rb

@@ -182,6 +182,9 @@ class DBManager
 
 		# Prefer the config file's pool setting
 		nopts['pool'] ||= 75
+		
+		# Prefer the config file's wait_timeout setting too
+		nopts['wait_timeout'] ||= 300
 
 		begin
 			self.migrated = false

modules/auxiliary/scanner/http/http_version.rb

@@ -39,17 +39,11 @@ class Metasploit3 < Msf::Auxiliary
 	# Fingerprint a single host
 	def run_host(ip)
 		begin
-			connect(opts)
+			connect
-			uri = opts[:uri] || '/'
-			method = opts[:method] || 'GET'
 			
-			res = send_request_raw(
+			res = send_request_raw({'uri' => '/', 'method' => 'GET' })
-				{
-					'uri'     => uri,
-					'method'  => method
-				})
-				
 			return if not res
+			
 			fp = http_fingerprint(:response => res) 
 			print_status("#{ip}:#{rport} #{fp}") if fp
 		rescue ::Timeout::Error, ::Errno::EPIPE