Fix errors when msfrpc is killed outside of msfgui.

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

external/source/gui/msfguijava/src/msfgui/MsfguiApp.java

@@ -49,6 +49,7 @@ public class MsfguiApp extends SingleFrameApplication {
 			props = new HashMap();//ensure existence
 		}
 		propRoot = props;
+		RpcConnection.disableDb = Boolean.TRUE.equals(propRoot.get("disableDb")); //restore this, since it can't be checked on connect
 		if(propRoot.get("recentList") == null)
 			propRoot.put("recentList", new LinkedList());
 		Runtime.getRuntime().addShutdownHook(new Thread(){

external/source/gui/msfguijava/src/msfgui/RpcConnection.java

@@ -85,6 +85,7 @@ public class RpcConnection {
 			} else {
 				connection = new Socket(host, port);
 			}
+			connection.setSoTimeout(5000); //Five second timeout
 			sout = connection.getOutputStream();
 			sin = connection.getInputStream();
 			Map results = exec("auth.login",new Object[]{username, this.password});