From 8921cfc934f51ced295bf449c8f9b1c06a87ad74 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <rednoah@users.noreply.github.com>
Date: Sat, 7 Jul 2012 08:19:00 +0000
Subject: [PATCH] * set more sensible http connection timeouts in the GUI
 application launchers => -Dsun.net.client.defaultConnectTimeout=5000
 -Dsun.net.client.defaultReadTimeout=25000

---
 build.xml                                       |  2 ++
 installer/msi/filebot.launcher.l4j.ini          |  4 ++++
 installer/msi/filebot.platform.launcher.l4j.ini | 10 +++++++---
 installer/portable/FileBot.l4j.ini              | 12 ++++++++----
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/build.xml b/build.xml
index 5066eeda..9b4ee6f9 100644
--- a/build.xml
+++ b/build.xml
@@ -156,6 +156,8 @@
 		<!-- build app bundle folder and add native libs -->
 		<jarbundler dir="${dir.dist}" name="${title}" version="${version}" build="${svn.revision}" icon="${dir.installer}/appbundle/icon.icns" bundleid="net.sourceforge.filebot" jar="${dir.dist}/appbundle/FileBot.jar" stubfile="${dir.installer}/appbundle/JavaApplicationStub" workingdirectory="$APP_PACKAGE/Contents/Resources/Java" mainclass="net.sourceforge.filebot.Main" jvmversion="1.6+" vmoptions="-Xmx256m">
 			<javaproperty name="application.deployment" value="app" />
+			<javaproperty name="sun.net.client.defaultConnectTimeout" value="5000" />
+			<javaproperty name="sun.net.client.defaultReadTimeout" value="25000" />
 		</jarbundler>
 
 		<!-- shell scripts -->
diff --git a/installer/msi/filebot.launcher.l4j.ini b/installer/msi/filebot.launcher.l4j.ini
index b2169026..1ae890c6 100644
--- a/installer/msi/filebot.launcher.l4j.ini
+++ b/installer/msi/filebot.launcher.l4j.ini
@@ -8,3 +8,7 @@
 # proxy settings
 # -Dhttp.proxyHost=localhost 
 # -Dhttp.proxyPort=8888
+
+# http connection timeouts
+-Dsun.net.client.defaultConnectTimeout=5000
+-Dsun.net.client.defaultReadTimeout=25000
diff --git a/installer/msi/filebot.platform.launcher.l4j.ini b/installer/msi/filebot.platform.launcher.l4j.ini
index 8b61d710..b4415390 100644
--- a/installer/msi/filebot.platform.launcher.l4j.ini
+++ b/installer/msi/filebot.platform.launcher.l4j.ini
@@ -6,13 +6,17 @@
 -DthreadPool=8
 -Dunixfs=false
 
+# memory settings
+-Xms64m
+-Xmx512m
+
 # proxy settings
 # -Dhttp.proxyHost=localhost 
 # -Dhttp.proxyPort=8888
 
-# memory settings
--Xms64m
--Xmx512m
+# http connection timeouts
+-Dsun.net.client.defaultConnectTimeout=5000
+-Dsun.net.client.defaultReadTimeout=25000
 
 # force english locale
 -Dfile.encoding=UTF-8
diff --git a/installer/portable/FileBot.l4j.ini b/installer/portable/FileBot.l4j.ini
index eacd1832..5eb64cbb 100644
--- a/installer/portable/FileBot.l4j.ini
+++ b/installer/portable/FileBot.l4j.ini
@@ -6,14 +6,18 @@
 # memory settings
 -Xmx256m
 
-# look for native libs here
--Djna.library.path="%EXEDIR%"
--Djava.library.path="%EXEDIR%"
-
 # proxy settings
 # -Dhttp.proxyHost=localhost 
 # -Dhttp.proxyPort=8888
 
+# http connection timeouts
+-Dsun.net.client.defaultConnectTimeout=5000
+-Dsun.net.client.defaultReadTimeout=25000
+
+# look for native libs here
+-Djna.library.path="%EXEDIR%"
+-Djava.library.path="%EXEDIR%"
+
 # store preferences to text file
 -Djava.util.prefs.PreferencesFactory=net.sourceforge.tuned.prefs.FilePreferencesFactory
 -Dnet.sourceforge.tuned.prefs.file=prefs.properties