Merge branch 'master' of https://github.com/rapid7/metasploit-framework

lib/rex/parser/nokogiri_doc_mixin.rb

@@ -221,7 +221,7 @@ module Parser
 			return unless @report_type_ok
 			unless @state[:current_tag].empty?
 				missing_ends = @state[:current_tag].keys.map {|x| "'#{x}'"}.join(", ")
-	l			msg = "Warning, the provided file is incomplete, and there may be missing\n"
+				msg = "Warning, the provided file is incomplete, and there may be missing\n"
 				msg << "data. The following tags were not closed: #{missing_ends}."
 				db.emit(:warning,msg,&block) if block
 			end

modules/exploits/multi/http/phpldapadmin_query_engine.rb

@@ -114,7 +114,7 @@ class Metasploit3 < Msf::Exploit::Remote
 		data = "cmd=query_engine&query=none&search=1&orderby=#{php_code}\r\n\r\n"
 		session = get_session
 
-		uri normalize_uri(datastore['URI'])
+		uri = normalize_uri(datastore['URI'])
 		uri << '/' if uri[-1,1] != '/'
 		uri << 'cmd.php'