Try to resolve CLOSE_WAIT issue on zxing.org

git-svn-id: http://zxing.googlecode.com/svn/trunk@909 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/zxingorg/src/com/google/zxing/web/DecodeServlet.java b/zxingorg/src/com/google/zxing/web/DecodeServlet.java
index 4fc7b6b..62189a2 100644 (file)
--- a/zxingorg/src/com/google/zxing/web/DecodeServlet.java
+++ b/zxingorg/src/com/google/zxing/web/DecodeServlet.java
@@ -36,6 +36,7 @@ import org.apache.http.HttpMessage;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpVersion;
 import org.apache.http.client.HttpClient;
+import org.apache.http.client.params.HttpClientParams;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.conn.scheme.PlainSocketFactory;
 import org.apache.http.conn.scheme.Scheme;
@@ -142,6 +143,7 @@ public final class DecodeServlet extends HttpServlet {
     }
 
     HttpGet getRequest = new HttpGet(imageURI);
+    getRequest.addHeader("Connection", "close"); // Avoids CLOSE_WAIT socket issue?
 
     try {
       HttpResponse getResponse = client.execute(getRequest);

diff --git a/zxingorg/web/WEB-INF/lib/httpcore-4.0-beta2.jar b/zxingorg/web/WEB-INF/lib/httpcore-4.0-beta2.jar
deleted file mode 100644 (file)
index 608b2eb..0000000
Binary files a/zxingorg/web/WEB-INF/lib/httpcore-4.0-beta2.jar and /dev/null differ

diff --git a/zxingorg/web/WEB-INF/lib/httpcore-4.0.jar b/zxingorg/web/WEB-INF/lib/httpcore-4.0.jar
new file mode 100644 (file)
index 0000000..7c619fc
Binary files /dev/null and b/zxingorg/web/WEB-INF/lib/httpcore-4.0.jar differ

diff --git a/zxingorg/web/WEB-INF/lib/httpcore-nio-4.0-beta2.jar b/zxingorg/web/WEB-INF/lib/httpcore-nio-4.0-beta2.jar
deleted file mode 100644 (file)
index 057e2c5..0000000
Binary files a/zxingorg/web/WEB-INF/lib/httpcore-nio-4.0-beta2.jar and /dev/null differ

diff --git a/zxingorg/web/WEB-INF/lib/httpcore-nio-4.0.jar b/zxingorg/web/WEB-INF/lib/httpcore-nio-4.0.jar
new file mode 100644 (file)
index 0000000..4872594
Binary files /dev/null and b/zxingorg/web/WEB-INF/lib/httpcore-nio-4.0.jar differ