jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1518784 - in /jmeter/trunk: src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java xdocs/changes.xml
Date Thu, 29 Aug 2013 19:44:28 GMT
Author: sebb
Date: Thu Aug 29 19:44:28 2013
New Revision: 1518784

URL: http://svn.apache.org/r1518784
Log:
Proxy incorrectly issues CONNECT requests when browser prompts for certificate override
Bugzilla Id: 55504

Modified:
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java?rev=1518784&r1=1518783&r2=1518784&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java Thu Aug
29 19:44:28 2013
@@ -208,6 +208,10 @@ public class Proxy extends Thread {
                 if (log.isDebugEnabled()) {
                     log.debug(port + "Reparse: " + new String(ba));
                 }
+                if (ba.length == 0) {
+                    log.warn(port + "Empty response to http over SSL. Probably waiting for
user to authorize the certificate for " + request.getUrl());
+                    throw new JMeterException(); // hack to skip processing
+                }
             }
 
             SamplerCreator samplerCreator = factory.getSamplerCreator(request, pageEncodings,
formEncodings);

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1518784&r1=1518783&r2=1518784&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Thu Aug 29 19:44:28 2013
@@ -259,6 +259,7 @@ Previously the default was 1, which coul
 <li><bugzilla>55450</bugzilla> - HEAD redirects should remain as HEAD</li>
 <li><bugzilla>55455</bugzilla> - HTTPS with HTTPClient4 ignores cps setting</li>
 <li><bugzilla>55502</bugzilla> - Proxy generates empty http:/ entries when
recording</li>
+<li><bugzilla>55504</bugzilla> - Proxy incorrectly issues CONNECT requests
when browser prompts for certificate override</li>
 </ul>
 
 <h3>Other Samplers</h3>



Mime
View raw message