From 41c4e340633e7015ac89b399a27383b6ea84f843 Mon Sep 17 00:00:00 2001 From: srowen Date: Fri, 6 Apr 2012 07:33:00 +0000 Subject: [PATCH] Fix problem blocking access to javadoc git-svn-id: https://zxing.googlecode.com/svn/trunk@2249 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- zxingorg/src/com/google/zxing/web/DecodeServlet.java | 2 ++ zxingorg/src/com/google/zxing/web/DoSFilter.java | 6 +++--- zxingorg/web/WEB-INF/web.xml | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/zxingorg/src/com/google/zxing/web/DecodeServlet.java b/zxingorg/src/com/google/zxing/web/DecodeServlet.java index 3f3d68c6e..198ffbb4f 100644 --- a/zxingorg/src/com/google/zxing/web/DecodeServlet.java +++ b/zxingorg/src/com/google/zxing/web/DecodeServlet.java @@ -211,6 +211,8 @@ public final class DecodeServlet extends HttpServlet { } } catch (IOException ioe) { // continue + } catch (IndexOutOfBoundsException ioobe) { + // sun.net.www.http.ChunkedInputStream.read is throwing this, continue } } diff --git a/zxingorg/src/com/google/zxing/web/DoSFilter.java b/zxingorg/src/com/google/zxing/web/DoSFilter.java index 5f201f973..281809a67 100755 --- a/zxingorg/src/com/google/zxing/web/DoSFilter.java +++ b/zxingorg/src/com/google/zxing/web/DoSFilter.java @@ -42,9 +42,9 @@ import java.util.TimerTask; */ public final class DoSFilter implements Filter { - private static final int MAX_ACCESSES_PER_IP_PER_TIME = 10; - private static final long MAX_ACCESS_INTERVAL_MSEC = 10L * 1000L; - private static final long UNBAN_INTERVAL_MSEC = 60L * 60L * 1000L; + private static final int MAX_ACCESSES_PER_IP_PER_TIME = 100; + private static final long MAX_ACCESS_INTERVAL_MSEC = 60L * 1000L; + private static final long UNBAN_INTERVAL_MSEC = 15L * 60L * 1000L; private static final String BAD_IPS_INIT_PARAM = "bad.ips"; private final IPTrie numRecentAccesses; diff --git a/zxingorg/web/WEB-INF/web.xml b/zxingorg/web/WEB-INF/web.xml index 68e260f65..7983939cf 100644 --- a/zxingorg/web/WEB-INF/web.xml +++ b/zxingorg/web/WEB-INF/web.xml @@ -32,7 +32,7 @@ DoSFilter - /* + /decode