svn commit: r1682775 - in /jmeter/trunk: bin/jmeter.properties src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java

[rj...@apache.org]

Author: rjung
Date: Sun May 31 19:24:32 2015
New Revision: 1682775

URL: http://svn.apache.org/r1682775
Log:
Bug 57921 - HTTP/1.1 without keep-alive Connection response header uses infinite keep-alive and fails
Bugzilla Id: 57921

Modified:
    jmeter/trunk/bin/jmeter.properties
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java

Modified: jmeter/trunk/bin/jmeter.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.properties?rev=1682775&r1=1682774&r2=1682775&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter.properties (original)
+++ jmeter/trunk/bin/jmeter.properties Sun May 31 19:24:32 2015
@@ -424,7 +424,8 @@ log_level.jorphan=INFO
 # Number of retries to attempt (default 0)
 #httpclient4.retrycount=0
 
-# Idle connection timeout (ms) to apply if the server does not send Keep-Alive headers
+# Idle connection timeout (ms) to apply if the server does not send
+# Keep-Alive headers (default 0 = no Keep-Alive)
 #httpclient4.idletimeout=0
 # Note: this is currently an experimental fix
 

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java?rev=1682775&r1=1682774&r2=1682775&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java Sun May 31 19:24:32 2015
@@ -145,7 +145,7 @@ public class HTTPHC4Impl extends HTTPHCA
         @Override
         public long getKeepAliveDuration(HttpResponse response, HttpContext context) {
             long duration = super.getKeepAliveDuration(response, context);
-            if (duration <= 0) {// none found by the superclass
+            if (duration <= 0 && IDLE_TIMEOUT > 0) {// none found by the superclass
                 log.debug("Setting keepalive to " + IDLE_TIMEOUT);
                 return IDLE_TIMEOUT;
             }