jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1831495 - /jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
Date Sat, 12 May 2018 20:21:34 GMT
Author: pmouawad
Date: Sat May 12 20:21:34 2018
New Revision: 1831495

URL: http://svn.apache.org/viewvc?rev=1831495&view=rev
Log:
Bug 58757 - HTTP Request : Updated deprecated methods of HttpComponents to last APIs of httpclient-4.5.X
Fix Eager instanciation of SSL Context which happens even if only HTTP is used and degrading
performances
Bugzilla Id: 58757

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

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=1831495&r1=1831494&r2=1831495&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
Sat May 12 20:21:34 2018
@@ -214,7 +214,7 @@ public class HTTPHC4Impl extends HTTPHCA
     };
 
     private static final class PreemptiveAuthRequestInterceptor implements HttpRequestInterceptor
{
-        //@Override
+        @Override
         public void process(HttpRequest request, HttpContext context) throws HttpException,
IOException {
             HttpClientContext localContext = HttpClientContext.adapt(context);
             AuthManager authManager = (AuthManager) localContext.getAttribute(CONTEXT_ATTRIBUTE_AUTH_MANAGER);
@@ -1015,7 +1015,7 @@ public class HTTPHC4Impl extends HTTPHCA
                     setSchemePortResolver(new DefaultSchemePortResolver()).
                     setDnsResolver(resolver).
                     setRequestExecutor(REQUEST_EXECUTOR).
-                    setSSLContext(((JsseSSLManager)JsseSSLManager.getInstance()).getContext()).
+                    setSSLSocketFactory(new LazyLayeredConnectionSocketFactory()).
                     setDefaultCookieSpecRegistry(cookieSpecRegistry).
                     setDefaultSocketConfig(SocketConfig.DEFAULT).
                     setRedirectStrategy(new LaxRedirectStrategy()).



Mime
View raw message