diff --git a/main/core/pom.xml b/main/core/pom.xml index dad08e639..cf45f36fc 100644 --- a/main/core/pom.xml +++ b/main/core/pom.xml @@ -12,14 +12,14 @@ org.cryptomator main - 0.8.1 + 0.8.2 core Cryptomator WebDAV and I/O module - 9.3.1.v20150714 - 2.10.1 + 9.3.3.v20150827 + 2.11.0 diff --git a/main/core/src/main/java/org/cryptomator/webdav/WebDavServer.java b/main/core/src/main/java/org/cryptomator/webdav/WebDavServer.java index 64870545f..76e92e185 100644 --- a/main/core/src/main/java/org/cryptomator/webdav/WebDavServer.java +++ b/main/core/src/main/java/org/cryptomator/webdav/WebDavServer.java @@ -40,6 +40,7 @@ public final class WebDavServer { private static final int MAX_THREADS = 200; private static final int MIN_THREADS = 4; private static final int THREAD_IDLE_SECONDS = 20; + private static final int CONNECTION_IDLE_MILLIS = 100; // idle connection slow down random access on WebDAVFS for some reason. reconnect overhead can be tolerated private final Server server; private final ServerConnector localConnector; private final ContextHandlerCollection servletCollection; @@ -50,11 +51,14 @@ public final class WebDavServer { server = new Server(tp); localConnector = new ServerConnector(server); localConnector.setHost(LOCALHOST); + localConnector.setIdleTimeout(CONNECTION_IDLE_MILLIS); servletCollection = new ContextHandlerCollection(); - final ServletContextHandler servletContext = new ServletContextHandler(servletCollection, "/", ServletContextHandler.NO_SESSIONS); - final ServletHolder servlet = new ServletHolder(WindowsSucksServlet.class); - servletContext.addServlet(servlet, "/"); + if (SystemUtils.IS_OS_WINDOWS) { + final ServletContextHandler servletContext = new ServletContextHandler(servletCollection, "/", ServletContextHandler.NO_SESSIONS); + final ServletHolder servlet = new ServletHolder(WindowsSucksServlet.class); + servletContext.addServlet(servlet, "/"); + } server.setConnectors(new Connector[] {localConnector}); server.setHandler(servletCollection); diff --git a/main/crypto-aes/pom.xml b/main/crypto-aes/pom.xml index 226c6a870..262a5f230 100644 --- a/main/crypto-aes/pom.xml +++ b/main/crypto-aes/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 0.8.1 + 0.8.2 crypto-aes Cryptomator cryptographic module (AES) diff --git a/main/crypto-api/pom.xml b/main/crypto-api/pom.xml index 2e8ff7f2c..2c86826e2 100644 --- a/main/crypto-api/pom.xml +++ b/main/crypto-api/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 0.8.1 + 0.8.2 crypto-api Cryptomator cryptographic module API diff --git a/main/installer-debian/pom.xml b/main/installer-debian/pom.xml index e378ad8bf..bcb41360d 100644 --- a/main/installer-debian/pom.xml +++ b/main/installer-debian/pom.xml @@ -3,7 +3,7 @@ org.cryptomator main - 0.8.1 + 0.8.2 installer-debian pom diff --git a/main/installer-osx/pom.xml b/main/installer-osx/pom.xml index 63e6f75f6..9d179a703 100644 --- a/main/installer-osx/pom.xml +++ b/main/installer-osx/pom.xml @@ -3,7 +3,7 @@ org.cryptomator main - 0.8.1 + 0.8.2 installer-osx pom diff --git a/main/installer-win-portable/pom.xml b/main/installer-win-portable/pom.xml index d3348e6e8..5a8780402 100644 --- a/main/installer-win-portable/pom.xml +++ b/main/installer-win-portable/pom.xml @@ -3,7 +3,7 @@ org.cryptomator main - 0.8.1 + 0.8.2 installer-win-portable pom diff --git a/main/installer-win/pom.xml b/main/installer-win/pom.xml index 088d958e2..b3481a6b1 100644 --- a/main/installer-win/pom.xml +++ b/main/installer-win/pom.xml @@ -3,7 +3,7 @@ org.cryptomator main - 0.8.1 + 0.8.2 installer-win pom diff --git a/main/pom.xml b/main/pom.xml index 7e74c8358..a0e64937b 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -11,7 +11,7 @@ 4.0.0 org.cryptomator main - 0.8.1 + 0.8.2 pom Cryptomator diff --git a/main/uber-jar/pom.xml b/main/uber-jar/pom.xml index aab7166d5..1c36a6a4a 100644 --- a/main/uber-jar/pom.xml +++ b/main/uber-jar/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 0.8.1 + 0.8.2 uber-jar pom diff --git a/main/ui/pom.xml b/main/ui/pom.xml index dba84dd44..6a1fcf38b 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 0.8.1 + 0.8.2 ui Cryptomator GUI