From 46e85cf2655cbbcd08664fad79f94c9bda0416b3 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 20 Apr 2015 17:57:57 +0000
Subject: [PATCH] only reset the sotimeout if not proxied
---
core/java/src/net/i2p/util/EepGet.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/core/java/src/net/i2p/util/EepGet.java b/core/java/src/net/i2p/util/EepGet.java
index 73a5bf4e8c..2f3872f369 100644
--- a/core/java/src/net/i2p/util/EepGet.java
+++ b/core/java/src/net/i2p/util/EepGet.java
@@ -678,10 +678,13 @@ public class EepGet {
else
timeout.setInactivityTimeout(INACTIVITY_TIMEOUT);
}
- if (_fetchInactivityTimeout > 0)
- _proxy.setSoTimeout(_fetchInactivityTimeout);
- else
- _proxy.setSoTimeout(INACTIVITY_TIMEOUT);
+ if (!_shouldProxy) {
+ // we only set the soTimeout before the headers if not proxied
+ if (_fetchInactivityTimeout > 0)
+ _proxy.setSoTimeout(_fetchInactivityTimeout);
+ else
+ _proxy.setSoTimeout(INACTIVITY_TIMEOUT);
+ }
if (_redirectLocation != null) {
// we also are here after a 407
--
GitLab