hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1637120 [30/40] - in /httpcomponents/site: ./ httpcomponents-asyncclient-4.0.x/ httpcomponents-asyncclient-4.1.x/ httpcomponents-client-4.3.x/ httpcomponents-client-4.3.x/fluent-hc/ httpcomponents-client-4.3.x/fluent-hc/apidocs/ httpcompon...
Date Thu, 06 Nov 2014 14:29:58 GMT
Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/config/package-frame.html
URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/config/package-frame.html?rev=1637120&r1=1637119&r2=1637120&view=diff
==============================================================================
--- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/config/package-frame.html (original)
+++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/config/package-frame.html Thu Nov  6 14:29:37 2014
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache HttpClient 4.3.5 Reference Package org.apache.http.client.config</title>
+		<title>Apache HttpClient 4.3.6 Reference Package org.apache.http.client.config</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/config/package-summary.html
URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/config/package-summary.html?rev=1637120&r1=1637119&r2=1637120&view=diff
==============================================================================
--- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/config/package-summary.html (original)
+++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/config/package-summary.html Thu Nov  6 14:29:37 2014
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache HttpClient 4.3.5 Reference Package org.apache.http.client.config</title>
+		<title>Apache HttpClient 4.3.6 Reference Package org.apache.http.client.config</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/entity/package-frame.html
URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/entity/package-frame.html?rev=1637120&r1=1637119&r2=1637120&view=diff
==============================================================================
--- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/entity/package-frame.html (original)
+++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/entity/package-frame.html Thu Nov  6 14:29:37 2014
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache HttpClient 4.3.5 Reference Package org.apache.http.client.entity</title>
+		<title>Apache HttpClient 4.3.6 Reference Package org.apache.http.client.entity</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/entity/package-summary.html
URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/entity/package-summary.html?rev=1637120&r1=1637119&r2=1637120&view=diff
==============================================================================
--- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/entity/package-summary.html (original)
+++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/entity/package-summary.html Thu Nov  6 14:29:37 2014
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache HttpClient 4.3.5 Reference Package org.apache.http.client.entity</title>
+		<title>Apache HttpClient 4.3.6 Reference Package org.apache.http.client.entity</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/methods/package-frame.html
URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/methods/package-frame.html?rev=1637120&r1=1637119&r2=1637120&view=diff
==============================================================================
--- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/methods/package-frame.html (original)
+++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/methods/package-frame.html Thu Nov  6 14:29:37 2014
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache HttpClient 4.3.5 Reference Package org.apache.http.client.methods</title>
+		<title>Apache HttpClient 4.3.6 Reference Package org.apache.http.client.methods</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/methods/package-summary.html
URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/methods/package-summary.html?rev=1637120&r1=1637119&r2=1637120&view=diff
==============================================================================
--- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/methods/package-summary.html (original)
+++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/methods/package-summary.html Thu Nov  6 14:29:37 2014
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache HttpClient 4.3.5 Reference Package org.apache.http.client.methods</title>
+		<title>Apache HttpClient 4.3.6 Reference Package org.apache.http.client.methods</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/protocol/package-frame.html
URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/protocol/package-frame.html?rev=1637120&r1=1637119&r2=1637120&view=diff
==============================================================================
--- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/protocol/package-frame.html (original)
+++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/protocol/package-frame.html Thu Nov  6 14:29:37 2014
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache HttpClient 4.3.5 Reference Package org.apache.http.client.protocol</title>
+		<title>Apache HttpClient 4.3.6 Reference Package org.apache.http.client.protocol</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/protocol/package-summary.html
URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/protocol/package-summary.html?rev=1637120&r1=1637119&r2=1637120&view=diff
==============================================================================
--- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/protocol/package-summary.html (original)
+++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/protocol/package-summary.html Thu Nov  6 14:29:37 2014
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache HttpClient 4.3.5 Reference Package org.apache.http.client.protocol</title>
+		<title>Apache HttpClient 4.3.6 Reference Package org.apache.http.client.protocol</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/utils/package-frame.html
URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/utils/package-frame.html?rev=1637120&r1=1637119&r2=1637120&view=diff
==============================================================================
--- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/utils/package-frame.html (original)
+++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/utils/package-frame.html Thu Nov  6 14:29:37 2014
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache HttpClient 4.3.5 Reference Package org.apache.http.client.utils</title>
+		<title>Apache HttpClient 4.3.6 Reference Package org.apache.http.client.utils</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/utils/package-summary.html
URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/utils/package-summary.html?rev=1637120&r1=1637119&r2=1637120&view=diff
==============================================================================
--- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/utils/package-summary.html (original)
+++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/client/utils/package-summary.html Thu Nov  6 14:29:37 2014
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache HttpClient 4.3.5 Reference Package org.apache.http.client.utils</title>
+		<title>Apache HttpClient 4.3.6 Reference Package org.apache.http.client.utils</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/package-frame.html
URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/package-frame.html?rev=1637120&r1=1637119&r2=1637120&view=diff
==============================================================================
--- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/package-frame.html (original)
+++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/package-frame.html Thu Nov  6 14:29:37 2014
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache HttpClient 4.3.5 Reference Package org.apache.http.conn</title>
+		<title>Apache HttpClient 4.3.6 Reference Package org.apache.http.conn</title>
 		<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/package-summary.html
URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/package-summary.html?rev=1637120&r1=1637119&r2=1637120&view=diff
==============================================================================
--- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/package-summary.html (original)
+++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/package-summary.html Thu Nov  6 14:29:37 2014
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache HttpClient 4.3.5 Reference Package org.apache.http.conn</title>
+		<title>Apache HttpClient 4.3.6 Reference Package org.apache.http.conn</title>
 		<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/routing/package-frame.html
URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/routing/package-frame.html?rev=1637120&r1=1637119&r2=1637120&view=diff
==============================================================================
--- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/routing/package-frame.html (original)
+++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/routing/package-frame.html Thu Nov  6 14:29:37 2014
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache HttpClient 4.3.5 Reference Package org.apache.http.conn.routing</title>
+		<title>Apache HttpClient 4.3.6 Reference Package org.apache.http.conn.routing</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/routing/package-summary.html
URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/routing/package-summary.html?rev=1637120&r1=1637119&r2=1637120&view=diff
==============================================================================
--- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/routing/package-summary.html (original)
+++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/routing/package-summary.html Thu Nov  6 14:29:37 2014
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache HttpClient 4.3.5 Reference Package org.apache.http.conn.routing</title>
+		<title>Apache HttpClient 4.3.6 Reference Package org.apache.http.conn.routing</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/ssl/TestSSLSocketFactory.html
URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/ssl/TestSSLSocketFactory.html?rev=1637120&r1=1637119&r2=1637120&view=diff
==============================================================================
--- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/ssl/TestSSLSocketFactory.html (original)
+++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/ssl/TestSSLSocketFactory.html Thu Nov  6 14:29:37 2014
@@ -205,116 +205,170 @@
 <a class="jxr_linenumber" name="195" href="#195">195</a>     }
 <a class="jxr_linenumber" name="196" href="#196">196</a> 
 <a class="jxr_linenumber" name="197" href="#197">197</a>     @Test
-<a class="jxr_linenumber" name="198" href="#198">198</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testClientAuthSSLAliasChoice() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="199" href="#199">199</a>         <strong class="jxr_keyword">final</strong> PrivateKeyStrategy aliasStrategy = <strong class="jxr_keyword">new</strong> PrivateKeyStrategy() {
-<a class="jxr_linenumber" name="200" href="#200">200</a> 
-<a class="jxr_linenumber" name="201" href="#201">201</a>             <strong class="jxr_keyword">public</strong> String chooseAlias(
-<a class="jxr_linenumber" name="202" href="#202">202</a>                     <strong class="jxr_keyword">final</strong> Map&lt;String, PrivateKeyDetails&gt; aliases, <strong class="jxr_keyword">final</strong> Socket socket) {
-<a class="jxr_linenumber" name="203" href="#203">203</a>                 Assert.assertEquals(2, aliases.size());
-<a class="jxr_linenumber" name="204" href="#204">204</a>                 Assert.assertTrue(aliases.containsKey(<span class="jxr_string">"hc-test-key-1"</span>));
-<a class="jxr_linenumber" name="205" href="#205">205</a>                 Assert.assertTrue(aliases.containsKey(<span class="jxr_string">"hc-test-key-2"</span>));
-<a class="jxr_linenumber" name="206" href="#206">206</a>                 <strong class="jxr_keyword">return</strong> <span class="jxr_string">"hc-test-key-2"</span>;
-<a class="jxr_linenumber" name="207" href="#207">207</a>             }
+<a class="jxr_linenumber" name="198" href="#198">198</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testTLSOnly() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="199" href="#199">199</a>         <strong class="jxr_keyword">final</strong> SSLContext serverSSLContext = SSLContexts.custom()
+<a class="jxr_linenumber" name="200" href="#200">200</a>                 .useProtocol(<span class="jxr_string">"TLS"</span>)
+<a class="jxr_linenumber" name="201" href="#201">201</a>                 .loadTrustMaterial(keystore)
+<a class="jxr_linenumber" name="202" href="#202">202</a>                 .loadKeyMaterial(keystore, <span class="jxr_string">"nopassword"</span>.toCharArray())
+<a class="jxr_linenumber" name="203" href="#203">203</a>                 .build();
+<a class="jxr_linenumber" name="204" href="#204">204</a>         <strong class="jxr_keyword">final</strong> SSLContext clientSSLContext = SSLContexts.custom()
+<a class="jxr_linenumber" name="205" href="#205">205</a>                 .useProtocol(<span class="jxr_string">"TLS"</span>)
+<a class="jxr_linenumber" name="206" href="#206">206</a>                 .loadTrustMaterial(keystore)
+<a class="jxr_linenumber" name="207" href="#207">207</a>                 .build();
 <a class="jxr_linenumber" name="208" href="#208">208</a> 
-<a class="jxr_linenumber" name="209" href="#209">209</a>         };
-<a class="jxr_linenumber" name="210" href="#210">210</a> 
-<a class="jxr_linenumber" name="211" href="#211">211</a>         <strong class="jxr_keyword">final</strong> SSLContext serverSSLContext = SSLContexts.custom()
-<a class="jxr_linenumber" name="212" href="#212">212</a>                 .useProtocol(<span class="jxr_string">"TLS"</span>)
-<a class="jxr_linenumber" name="213" href="#213">213</a>                 .loadTrustMaterial(keystore)
-<a class="jxr_linenumber" name="214" href="#214">214</a>                 .loadKeyMaterial(keystore, <span class="jxr_string">"nopassword"</span>.toCharArray())
-<a class="jxr_linenumber" name="215" href="#215">215</a>                 .build();
-<a class="jxr_linenumber" name="216" href="#216">216</a>         <strong class="jxr_keyword">final</strong> SSLContext clientSSLContext = SSLContexts.custom()
-<a class="jxr_linenumber" name="217" href="#217">217</a>                 .useProtocol(<span class="jxr_string">"TLS"</span>)
-<a class="jxr_linenumber" name="218" href="#218">218</a>                 .loadTrustMaterial(keystore)
-<a class="jxr_linenumber" name="219" href="#219">219</a>                 .loadKeyMaterial(keystore, <span class="jxr_string">"nopassword"</span>.toCharArray(), aliasStrategy)
-<a class="jxr_linenumber" name="220" href="#220">220</a>                 .build();
+<a class="jxr_linenumber" name="209" href="#209">209</a>         <strong class="jxr_keyword">this</strong>.localServer = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/http/localserver/LocalTestServer.html">LocalTestServer</a>(serverSSLContext, false, <strong class="jxr_keyword">new</strong> String[] {<span class="jxr_string">"TLSv1"</span>});
+<a class="jxr_linenumber" name="210" href="#210">210</a>         <strong class="jxr_keyword">this</strong>.localServer.registerDefaultHandlers();
+<a class="jxr_linenumber" name="211" href="#211">211</a>         <strong class="jxr_keyword">this</strong>.localServer.start();
+<a class="jxr_linenumber" name="212" href="#212">212</a> 
+<a class="jxr_linenumber" name="213" href="#213">213</a>         <strong class="jxr_keyword">final</strong> HttpHost host = <strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"localhost"</span>, 443, <span class="jxr_string">"https"</span>);
+<a class="jxr_linenumber" name="214" href="#214">214</a>         <strong class="jxr_keyword">final</strong> HttpContext context = <strong class="jxr_keyword">new</strong> BasicHttpContext();
+<a class="jxr_linenumber" name="215" href="#215">215</a>         <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/http/conn/ssl/TestSSLSocketFactory.html">TestX509HostnameVerifier</a> hostVerifier = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/http/conn/ssl/TestSSLSocketFactory.html">TestX509HostnameVerifier</a>();
+<a class="jxr_linenumber" name="216" href="#216">216</a>         <strong class="jxr_keyword">final</strong> SSLConnectionSocketFactory socketFactory = <strong class="jxr_keyword">new</strong> SSLConnectionSocketFactory(clientSSLContext, hostVerifier);
+<a class="jxr_linenumber" name="217" href="#217">217</a>         <strong class="jxr_keyword">final</strong> Socket socket = socketFactory.createSocket(context);
+<a class="jxr_linenumber" name="218" href="#218">218</a>         <strong class="jxr_keyword">final</strong> InetSocketAddress remoteAddress = <strong class="jxr_keyword">this</strong>.localServer.getServiceAddress();
+<a class="jxr_linenumber" name="219" href="#219">219</a>         <strong class="jxr_keyword">final</strong> SSLSocket sslSocket = (SSLSocket) socketFactory.connectSocket(0, socket, host, remoteAddress, <strong class="jxr_keyword">null</strong>, context);
+<a class="jxr_linenumber" name="220" href="#220">220</a>         <strong class="jxr_keyword">final</strong> SSLSession sslsession = sslSocket.getSession();
 <a class="jxr_linenumber" name="221" href="#221">221</a> 
-<a class="jxr_linenumber" name="222" href="#222">222</a>         <strong class="jxr_keyword">this</strong>.localServer = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/http/localserver/LocalTestServer.html">LocalTestServer</a>(serverSSLContext, <strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="223" href="#223">223</a>         <strong class="jxr_keyword">this</strong>.localServer.registerDefaultHandlers();
-<a class="jxr_linenumber" name="224" href="#224">224</a>         <strong class="jxr_keyword">this</strong>.localServer.start();
+<a class="jxr_linenumber" name="222" href="#222">222</a>         Assert.assertNotNull(sslsession);
+<a class="jxr_linenumber" name="223" href="#223">223</a>         Assert.assertTrue(hostVerifier.isFired());
+<a class="jxr_linenumber" name="224" href="#224">224</a>     }
 <a class="jxr_linenumber" name="225" href="#225">225</a> 
-<a class="jxr_linenumber" name="226" href="#226">226</a>         <strong class="jxr_keyword">final</strong> HttpHost host = <strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"localhost"</span>, 443, <span class="jxr_string">"https"</span>);
-<a class="jxr_linenumber" name="227" href="#227">227</a>         <strong class="jxr_keyword">final</strong> HttpContext context = <strong class="jxr_keyword">new</strong> BasicHttpContext();
-<a class="jxr_linenumber" name="228" href="#228">228</a>         <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/http/conn/ssl/TestSSLSocketFactory.html">TestX509HostnameVerifier</a> hostVerifier = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/http/conn/ssl/TestSSLSocketFactory.html">TestX509HostnameVerifier</a>();
-<a class="jxr_linenumber" name="229" href="#229">229</a>         <strong class="jxr_keyword">final</strong> SSLConnectionSocketFactory socketFactory = <strong class="jxr_keyword">new</strong> SSLConnectionSocketFactory(clientSSLContext, hostVerifier);
-<a class="jxr_linenumber" name="230" href="#230">230</a>         <strong class="jxr_keyword">final</strong> Socket socket = socketFactory.createSocket(context);
-<a class="jxr_linenumber" name="231" href="#231">231</a>         <strong class="jxr_keyword">final</strong> InetSocketAddress remoteAddress = <strong class="jxr_keyword">this</strong>.localServer.getServiceAddress();
-<a class="jxr_linenumber" name="232" href="#232">232</a>         <strong class="jxr_keyword">final</strong> SSLSocket sslSocket = (SSLSocket) socketFactory.connectSocket(0, socket, host, remoteAddress, <strong class="jxr_keyword">null</strong>, context);
-<a class="jxr_linenumber" name="233" href="#233">233</a>         <strong class="jxr_keyword">final</strong> SSLSession sslsession = sslSocket.getSession();
-<a class="jxr_linenumber" name="234" href="#234">234</a> 
-<a class="jxr_linenumber" name="235" href="#235">235</a>         Assert.assertNotNull(sslsession);
-<a class="jxr_linenumber" name="236" href="#236">236</a>         Assert.assertTrue(hostVerifier.isFired());
-<a class="jxr_linenumber" name="237" href="#237">237</a>     }
-<a class="jxr_linenumber" name="238" href="#238">238</a> 
-<a class="jxr_linenumber" name="239" href="#239">239</a>     @Test(expected=SSLHandshakeException.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="240" href="#240">240</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testSSLTrustVerification() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="241" href="#241">241</a>         <strong class="jxr_keyword">final</strong> SSLContext serverSSLContext = SSLContexts.custom()
-<a class="jxr_linenumber" name="242" href="#242">242</a>                 .useProtocol(<span class="jxr_string">"TLS"</span>)
-<a class="jxr_linenumber" name="243" href="#243">243</a>                 .loadTrustMaterial(keystore)
-<a class="jxr_linenumber" name="244" href="#244">244</a>                 .loadKeyMaterial(keystore, <span class="jxr_string">"nopassword"</span>.toCharArray())
-<a class="jxr_linenumber" name="245" href="#245">245</a>                 .build();
-<a class="jxr_linenumber" name="246" href="#246">246</a> 
-<a class="jxr_linenumber" name="247" href="#247">247</a>         <strong class="jxr_keyword">this</strong>.localServer = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/http/localserver/LocalTestServer.html">LocalTestServer</a>(serverSSLContext);
-<a class="jxr_linenumber" name="248" href="#248">248</a>         <strong class="jxr_keyword">this</strong>.localServer.registerDefaultHandlers();
-<a class="jxr_linenumber" name="249" href="#249">249</a>         <strong class="jxr_keyword">this</strong>.localServer.start();
+<a class="jxr_linenumber" name="226" href="#226">226</a>     @Test(expected=IOException.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="227" href="#227">227</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testSSLDisabledByDefault() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="228" href="#228">228</a>         <strong class="jxr_keyword">final</strong> SSLContext serverSSLContext = SSLContexts.custom()
+<a class="jxr_linenumber" name="229" href="#229">229</a>                 .useProtocol(<span class="jxr_string">"TLS"</span>)
+<a class="jxr_linenumber" name="230" href="#230">230</a>                 .loadTrustMaterial(keystore)
+<a class="jxr_linenumber" name="231" href="#231">231</a>                 .loadKeyMaterial(keystore, <span class="jxr_string">"nopassword"</span>.toCharArray())
+<a class="jxr_linenumber" name="232" href="#232">232</a>                 .build();
+<a class="jxr_linenumber" name="233" href="#233">233</a>         <strong class="jxr_keyword">final</strong> SSLContext clientSSLContext = SSLContexts.custom()
+<a class="jxr_linenumber" name="234" href="#234">234</a>                 .useProtocol(<span class="jxr_string">"TLS"</span>)
+<a class="jxr_linenumber" name="235" href="#235">235</a>                 .loadTrustMaterial(keystore)
+<a class="jxr_linenumber" name="236" href="#236">236</a>                 .build();
+<a class="jxr_linenumber" name="237" href="#237">237</a> 
+<a class="jxr_linenumber" name="238" href="#238">238</a>         <strong class="jxr_keyword">this</strong>.localServer = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/http/localserver/LocalTestServer.html">LocalTestServer</a>(serverSSLContext, false, <strong class="jxr_keyword">new</strong> String[] {<span class="jxr_string">"SSLv3"</span>});
+<a class="jxr_linenumber" name="239" href="#239">239</a>         <strong class="jxr_keyword">this</strong>.localServer.registerDefaultHandlers();
+<a class="jxr_linenumber" name="240" href="#240">240</a>         <strong class="jxr_keyword">this</strong>.localServer.start();
+<a class="jxr_linenumber" name="241" href="#241">241</a> 
+<a class="jxr_linenumber" name="242" href="#242">242</a>         <strong class="jxr_keyword">final</strong> HttpHost host = <strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"localhost"</span>, 443, <span class="jxr_string">"https"</span>);
+<a class="jxr_linenumber" name="243" href="#243">243</a>         <strong class="jxr_keyword">final</strong> HttpContext context = <strong class="jxr_keyword">new</strong> BasicHttpContext();
+<a class="jxr_linenumber" name="244" href="#244">244</a>         <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/http/conn/ssl/TestSSLSocketFactory.html">TestX509HostnameVerifier</a> hostVerifier = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/http/conn/ssl/TestSSLSocketFactory.html">TestX509HostnameVerifier</a>();
+<a class="jxr_linenumber" name="245" href="#245">245</a>         <strong class="jxr_keyword">final</strong> SSLConnectionSocketFactory socketFactory = <strong class="jxr_keyword">new</strong> SSLConnectionSocketFactory(clientSSLContext, hostVerifier);
+<a class="jxr_linenumber" name="246" href="#246">246</a>         <strong class="jxr_keyword">final</strong> Socket socket = socketFactory.createSocket(context);
+<a class="jxr_linenumber" name="247" href="#247">247</a>         <strong class="jxr_keyword">final</strong> InetSocketAddress remoteAddress = <strong class="jxr_keyword">this</strong>.localServer.getServiceAddress();
+<a class="jxr_linenumber" name="248" href="#248">248</a>         socketFactory.connectSocket(0, socket, host, remoteAddress, <strong class="jxr_keyword">null</strong>, context);
+<a class="jxr_linenumber" name="249" href="#249">249</a>     }
 <a class="jxr_linenumber" name="250" href="#250">250</a> 
-<a class="jxr_linenumber" name="251" href="#251">251</a>         <strong class="jxr_keyword">final</strong> HttpHost host = <strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"localhost"</span>, 443, <span class="jxr_string">"https"</span>);
-<a class="jxr_linenumber" name="252" href="#252">252</a>         <strong class="jxr_keyword">final</strong> HttpContext context = <strong class="jxr_keyword">new</strong> BasicHttpContext();
-<a class="jxr_linenumber" name="253" href="#253">253</a>         <em class="jxr_comment">// Use default SSL context</em>
-<a class="jxr_linenumber" name="254" href="#254">254</a>         <strong class="jxr_keyword">final</strong> SSLContext defaultsslcontext = SSLContexts.createDefault();
-<a class="jxr_linenumber" name="255" href="#255">255</a> 
-<a class="jxr_linenumber" name="256" href="#256">256</a>         <strong class="jxr_keyword">final</strong> SSLConnectionSocketFactory socketFactory = <strong class="jxr_keyword">new</strong> SSLConnectionSocketFactory(defaultsslcontext,
-<a class="jxr_linenumber" name="257" href="#257">257</a>                 SSLConnectionSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
-<a class="jxr_linenumber" name="258" href="#258">258</a> 
-<a class="jxr_linenumber" name="259" href="#259">259</a>         <strong class="jxr_keyword">final</strong> Socket socket = socketFactory.createSocket(context);
-<a class="jxr_linenumber" name="260" href="#260">260</a>         <strong class="jxr_keyword">final</strong> InetSocketAddress remoteAddress = <strong class="jxr_keyword">this</strong>.localServer.getServiceAddress();
-<a class="jxr_linenumber" name="261" href="#261">261</a>         socketFactory.connectSocket(0, socket, host, remoteAddress, <strong class="jxr_keyword">null</strong>, context);
-<a class="jxr_linenumber" name="262" href="#262">262</a>     }
-<a class="jxr_linenumber" name="263" href="#263">263</a> 
-<a class="jxr_linenumber" name="264" href="#264">264</a>     @Test
-<a class="jxr_linenumber" name="265" href="#265">265</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testSSLTrustVerificationOverride() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="266" href="#266">266</a>         <strong class="jxr_keyword">final</strong> SSLContext serverSSLContext = SSLContexts.custom()
-<a class="jxr_linenumber" name="267" href="#267">267</a>                 .useProtocol(<span class="jxr_string">"TLS"</span>)
-<a class="jxr_linenumber" name="268" href="#268">268</a>                 .loadTrustMaterial(keystore)
-<a class="jxr_linenumber" name="269" href="#269">269</a>                 .loadKeyMaterial(keystore, <span class="jxr_string">"nopassword"</span>.toCharArray())
-<a class="jxr_linenumber" name="270" href="#270">270</a>                 .build();
-<a class="jxr_linenumber" name="271" href="#271">271</a> 
-<a class="jxr_linenumber" name="272" href="#272">272</a>         <strong class="jxr_keyword">this</strong>.localServer = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/http/localserver/LocalTestServer.html">LocalTestServer</a>(serverSSLContext);
-<a class="jxr_linenumber" name="273" href="#273">273</a>         <strong class="jxr_keyword">this</strong>.localServer.registerDefaultHandlers();
-<a class="jxr_linenumber" name="274" href="#274">274</a>         <strong class="jxr_keyword">this</strong>.localServer.start();
+<a class="jxr_linenumber" name="251" href="#251">251</a>     @Test
+<a class="jxr_linenumber" name="252" href="#252">252</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testClientAuthSSLAliasChoice() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="253" href="#253">253</a>         <strong class="jxr_keyword">final</strong> PrivateKeyStrategy aliasStrategy = <strong class="jxr_keyword">new</strong> PrivateKeyStrategy() {
+<a class="jxr_linenumber" name="254" href="#254">254</a> 
+<a class="jxr_linenumber" name="255" href="#255">255</a>             <strong class="jxr_keyword">public</strong> String chooseAlias(
+<a class="jxr_linenumber" name="256" href="#256">256</a>                     <strong class="jxr_keyword">final</strong> Map&lt;String, PrivateKeyDetails&gt; aliases, <strong class="jxr_keyword">final</strong> Socket socket) {
+<a class="jxr_linenumber" name="257" href="#257">257</a>                 Assert.assertEquals(2, aliases.size());
+<a class="jxr_linenumber" name="258" href="#258">258</a>                 Assert.assertTrue(aliases.containsKey(<span class="jxr_string">"hc-test-key-1"</span>));
+<a class="jxr_linenumber" name="259" href="#259">259</a>                 Assert.assertTrue(aliases.containsKey(<span class="jxr_string">"hc-test-key-2"</span>));
+<a class="jxr_linenumber" name="260" href="#260">260</a>                 <strong class="jxr_keyword">return</strong> <span class="jxr_string">"hc-test-key-2"</span>;
+<a class="jxr_linenumber" name="261" href="#261">261</a>             }
+<a class="jxr_linenumber" name="262" href="#262">262</a> 
+<a class="jxr_linenumber" name="263" href="#263">263</a>         };
+<a class="jxr_linenumber" name="264" href="#264">264</a> 
+<a class="jxr_linenumber" name="265" href="#265">265</a>         <strong class="jxr_keyword">final</strong> SSLContext serverSSLContext = SSLContexts.custom()
+<a class="jxr_linenumber" name="266" href="#266">266</a>                 .useProtocol(<span class="jxr_string">"TLS"</span>)
+<a class="jxr_linenumber" name="267" href="#267">267</a>                 .loadTrustMaterial(keystore)
+<a class="jxr_linenumber" name="268" href="#268">268</a>                 .loadKeyMaterial(keystore, <span class="jxr_string">"nopassword"</span>.toCharArray())
+<a class="jxr_linenumber" name="269" href="#269">269</a>                 .build();
+<a class="jxr_linenumber" name="270" href="#270">270</a>         <strong class="jxr_keyword">final</strong> SSLContext clientSSLContext = SSLContexts.custom()
+<a class="jxr_linenumber" name="271" href="#271">271</a>                 .useProtocol(<span class="jxr_string">"TLS"</span>)
+<a class="jxr_linenumber" name="272" href="#272">272</a>                 .loadTrustMaterial(keystore)
+<a class="jxr_linenumber" name="273" href="#273">273</a>                 .loadKeyMaterial(keystore, <span class="jxr_string">"nopassword"</span>.toCharArray(), aliasStrategy)
+<a class="jxr_linenumber" name="274" href="#274">274</a>                 .build();
 <a class="jxr_linenumber" name="275" href="#275">275</a> 
-<a class="jxr_linenumber" name="276" href="#276">276</a>         <strong class="jxr_keyword">final</strong> HttpHost host = <strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"localhost"</span>, 443, <span class="jxr_string">"https"</span>);
-<a class="jxr_linenumber" name="277" href="#277">277</a>         <strong class="jxr_keyword">final</strong> HttpContext context = <strong class="jxr_keyword">new</strong> BasicHttpContext();
-<a class="jxr_linenumber" name="278" href="#278">278</a> 
-<a class="jxr_linenumber" name="279" href="#279">279</a>         <strong class="jxr_keyword">final</strong> TrustStrategy trustStrategy = <strong class="jxr_keyword">new</strong> TrustStrategy() {
-<a class="jxr_linenumber" name="280" href="#280">280</a> 
-<a class="jxr_linenumber" name="281" href="#281">281</a>             <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> isTrusted(
-<a class="jxr_linenumber" name="282" href="#282">282</a>                     <strong class="jxr_keyword">final</strong> X509Certificate[] chain, <strong class="jxr_keyword">final</strong> String authType) <strong class="jxr_keyword">throws</strong> CertificateException {
-<a class="jxr_linenumber" name="283" href="#283">283</a>                 <strong class="jxr_keyword">return</strong> chain.length == 1;
-<a class="jxr_linenumber" name="284" href="#284">284</a>             }
-<a class="jxr_linenumber" name="285" href="#285">285</a> 
-<a class="jxr_linenumber" name="286" href="#286">286</a>         };
-<a class="jxr_linenumber" name="287" href="#287">287</a>         <strong class="jxr_keyword">final</strong> SSLContext sslcontext = SSLContexts.custom()
-<a class="jxr_linenumber" name="288" href="#288">288</a>             .loadTrustMaterial(<strong class="jxr_keyword">null</strong>, trustStrategy)
-<a class="jxr_linenumber" name="289" href="#289">289</a>             .build();
-<a class="jxr_linenumber" name="290" href="#290">290</a>         <strong class="jxr_keyword">final</strong> SSLConnectionSocketFactory socketFactory = <strong class="jxr_keyword">new</strong> SSLConnectionSocketFactory(
-<a class="jxr_linenumber" name="291" href="#291">291</a>                 sslcontext,
-<a class="jxr_linenumber" name="292" href="#292">292</a>                 SSLConnectionSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
-<a class="jxr_linenumber" name="293" href="#293">293</a> 
-<a class="jxr_linenumber" name="294" href="#294">294</a>         <strong class="jxr_keyword">final</strong> Socket socket = socketFactory.createSocket(context);
-<a class="jxr_linenumber" name="295" href="#295">295</a>         <strong class="jxr_keyword">final</strong> InetSocketAddress remoteAddress = <strong class="jxr_keyword">this</strong>.localServer.getServiceAddress();
-<a class="jxr_linenumber" name="296" href="#296">296</a>         socketFactory.connectSocket(0, socket, host, remoteAddress, <strong class="jxr_keyword">null</strong>, context);
-<a class="jxr_linenumber" name="297" href="#297">297</a>     }
-<a class="jxr_linenumber" name="298" href="#298">298</a> 
-<a class="jxr_linenumber" name="299" href="#299">299</a>     @Test
-<a class="jxr_linenumber" name="300" href="#300">300</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testDefaultHostnameVerifier() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="301" href="#301">301</a>         <strong class="jxr_keyword">final</strong> SSLConnectionSocketFactory socketFactory = <strong class="jxr_keyword">new</strong> SSLConnectionSocketFactory(
-<a class="jxr_linenumber" name="302" href="#302">302</a>                 SSLContexts.createDefault(),
-<a class="jxr_linenumber" name="303" href="#303">303</a>                 <strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="304" href="#304">304</a>         Assert.assertNotNull(socketFactory.getHostnameVerifier());
-<a class="jxr_linenumber" name="305" href="#305">305</a>     }
-<a class="jxr_linenumber" name="306" href="#306">306</a> 
-<a class="jxr_linenumber" name="307" href="#307">307</a> }
+<a class="jxr_linenumber" name="276" href="#276">276</a>         <strong class="jxr_keyword">this</strong>.localServer = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/http/localserver/LocalTestServer.html">LocalTestServer</a>(serverSSLContext, <strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="277" href="#277">277</a>         <strong class="jxr_keyword">this</strong>.localServer.registerDefaultHandlers();
+<a class="jxr_linenumber" name="278" href="#278">278</a>         <strong class="jxr_keyword">this</strong>.localServer.start();
+<a class="jxr_linenumber" name="279" href="#279">279</a> 
+<a class="jxr_linenumber" name="280" href="#280">280</a>         <strong class="jxr_keyword">final</strong> HttpHost host = <strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"localhost"</span>, 443, <span class="jxr_string">"https"</span>);
+<a class="jxr_linenumber" name="281" href="#281">281</a>         <strong class="jxr_keyword">final</strong> HttpContext context = <strong class="jxr_keyword">new</strong> BasicHttpContext();
+<a class="jxr_linenumber" name="282" href="#282">282</a>         <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/http/conn/ssl/TestSSLSocketFactory.html">TestX509HostnameVerifier</a> hostVerifier = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/http/conn/ssl/TestSSLSocketFactory.html">TestX509HostnameVerifier</a>();
+<a class="jxr_linenumber" name="283" href="#283">283</a>         <strong class="jxr_keyword">final</strong> SSLConnectionSocketFactory socketFactory = <strong class="jxr_keyword">new</strong> SSLConnectionSocketFactory(clientSSLContext, hostVerifier);
+<a class="jxr_linenumber" name="284" href="#284">284</a>         <strong class="jxr_keyword">final</strong> Socket socket = socketFactory.createSocket(context);
+<a class="jxr_linenumber" name="285" href="#285">285</a>         <strong class="jxr_keyword">final</strong> InetSocketAddress remoteAddress = <strong class="jxr_keyword">this</strong>.localServer.getServiceAddress();
+<a class="jxr_linenumber" name="286" href="#286">286</a>         <strong class="jxr_keyword">final</strong> SSLSocket sslSocket = (SSLSocket) socketFactory.connectSocket(0, socket, host, remoteAddress, <strong class="jxr_keyword">null</strong>, context);
+<a class="jxr_linenumber" name="287" href="#287">287</a>         <strong class="jxr_keyword">final</strong> SSLSession sslsession = sslSocket.getSession();
+<a class="jxr_linenumber" name="288" href="#288">288</a> 
+<a class="jxr_linenumber" name="289" href="#289">289</a>         Assert.assertNotNull(sslsession);
+<a class="jxr_linenumber" name="290" href="#290">290</a>         Assert.assertTrue(hostVerifier.isFired());
+<a class="jxr_linenumber" name="291" href="#291">291</a>     }
+<a class="jxr_linenumber" name="292" href="#292">292</a> 
+<a class="jxr_linenumber" name="293" href="#293">293</a>     @Test(expected=SSLHandshakeException.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="294" href="#294">294</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testSSLTrustVerification() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="295" href="#295">295</a>         <strong class="jxr_keyword">final</strong> SSLContext serverSSLContext = SSLContexts.custom()
+<a class="jxr_linenumber" name="296" href="#296">296</a>                 .useProtocol(<span class="jxr_string">"TLS"</span>)
+<a class="jxr_linenumber" name="297" href="#297">297</a>                 .loadTrustMaterial(keystore)
+<a class="jxr_linenumber" name="298" href="#298">298</a>                 .loadKeyMaterial(keystore, <span class="jxr_string">"nopassword"</span>.toCharArray())
+<a class="jxr_linenumber" name="299" href="#299">299</a>                 .build();
+<a class="jxr_linenumber" name="300" href="#300">300</a> 
+<a class="jxr_linenumber" name="301" href="#301">301</a>         <strong class="jxr_keyword">this</strong>.localServer = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/http/localserver/LocalTestServer.html">LocalTestServer</a>(serverSSLContext);
+<a class="jxr_linenumber" name="302" href="#302">302</a>         <strong class="jxr_keyword">this</strong>.localServer.registerDefaultHandlers();
+<a class="jxr_linenumber" name="303" href="#303">303</a>         <strong class="jxr_keyword">this</strong>.localServer.start();
+<a class="jxr_linenumber" name="304" href="#304">304</a> 
+<a class="jxr_linenumber" name="305" href="#305">305</a>         <strong class="jxr_keyword">final</strong> HttpHost host = <strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"localhost"</span>, 443, <span class="jxr_string">"https"</span>);
+<a class="jxr_linenumber" name="306" href="#306">306</a>         <strong class="jxr_keyword">final</strong> HttpContext context = <strong class="jxr_keyword">new</strong> BasicHttpContext();
+<a class="jxr_linenumber" name="307" href="#307">307</a>         <em class="jxr_comment">// Use default SSL context</em>
+<a class="jxr_linenumber" name="308" href="#308">308</a>         <strong class="jxr_keyword">final</strong> SSLContext defaultsslcontext = SSLContexts.createDefault();
+<a class="jxr_linenumber" name="309" href="#309">309</a> 
+<a class="jxr_linenumber" name="310" href="#310">310</a>         <strong class="jxr_keyword">final</strong> SSLConnectionSocketFactory socketFactory = <strong class="jxr_keyword">new</strong> SSLConnectionSocketFactory(defaultsslcontext,
+<a class="jxr_linenumber" name="311" href="#311">311</a>                 SSLConnectionSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
+<a class="jxr_linenumber" name="312" href="#312">312</a> 
+<a class="jxr_linenumber" name="313" href="#313">313</a>         <strong class="jxr_keyword">final</strong> Socket socket = socketFactory.createSocket(context);
+<a class="jxr_linenumber" name="314" href="#314">314</a>         <strong class="jxr_keyword">final</strong> InetSocketAddress remoteAddress = <strong class="jxr_keyword">this</strong>.localServer.getServiceAddress();
+<a class="jxr_linenumber" name="315" href="#315">315</a>         socketFactory.connectSocket(0, socket, host, remoteAddress, <strong class="jxr_keyword">null</strong>, context);
+<a class="jxr_linenumber" name="316" href="#316">316</a>     }
+<a class="jxr_linenumber" name="317" href="#317">317</a> 
+<a class="jxr_linenumber" name="318" href="#318">318</a>     @Test
+<a class="jxr_linenumber" name="319" href="#319">319</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testSSLTrustVerificationOverride() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="320" href="#320">320</a>         <strong class="jxr_keyword">final</strong> SSLContext serverSSLContext = SSLContexts.custom()
+<a class="jxr_linenumber" name="321" href="#321">321</a>                 .useProtocol(<span class="jxr_string">"TLS"</span>)
+<a class="jxr_linenumber" name="322" href="#322">322</a>                 .loadTrustMaterial(keystore)
+<a class="jxr_linenumber" name="323" href="#323">323</a>                 .loadKeyMaterial(keystore, <span class="jxr_string">"nopassword"</span>.toCharArray())
+<a class="jxr_linenumber" name="324" href="#324">324</a>                 .build();
+<a class="jxr_linenumber" name="325" href="#325">325</a> 
+<a class="jxr_linenumber" name="326" href="#326">326</a>         <strong class="jxr_keyword">this</strong>.localServer = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/http/localserver/LocalTestServer.html">LocalTestServer</a>(serverSSLContext);
+<a class="jxr_linenumber" name="327" href="#327">327</a>         <strong class="jxr_keyword">this</strong>.localServer.registerDefaultHandlers();
+<a class="jxr_linenumber" name="328" href="#328">328</a>         <strong class="jxr_keyword">this</strong>.localServer.start();
+<a class="jxr_linenumber" name="329" href="#329">329</a> 
+<a class="jxr_linenumber" name="330" href="#330">330</a>         <strong class="jxr_keyword">final</strong> HttpHost host = <strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"localhost"</span>, 443, <span class="jxr_string">"https"</span>);
+<a class="jxr_linenumber" name="331" href="#331">331</a>         <strong class="jxr_keyword">final</strong> HttpContext context = <strong class="jxr_keyword">new</strong> BasicHttpContext();
+<a class="jxr_linenumber" name="332" href="#332">332</a> 
+<a class="jxr_linenumber" name="333" href="#333">333</a>         <strong class="jxr_keyword">final</strong> TrustStrategy trustStrategy = <strong class="jxr_keyword">new</strong> TrustStrategy() {
+<a class="jxr_linenumber" name="334" href="#334">334</a> 
+<a class="jxr_linenumber" name="335" href="#335">335</a>             <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> isTrusted(
+<a class="jxr_linenumber" name="336" href="#336">336</a>                     <strong class="jxr_keyword">final</strong> X509Certificate[] chain, <strong class="jxr_keyword">final</strong> String authType) <strong class="jxr_keyword">throws</strong> CertificateException {
+<a class="jxr_linenumber" name="337" href="#337">337</a>                 <strong class="jxr_keyword">return</strong> chain.length == 1;
+<a class="jxr_linenumber" name="338" href="#338">338</a>             }
+<a class="jxr_linenumber" name="339" href="#339">339</a> 
+<a class="jxr_linenumber" name="340" href="#340">340</a>         };
+<a class="jxr_linenumber" name="341" href="#341">341</a>         <strong class="jxr_keyword">final</strong> SSLContext sslcontext = SSLContexts.custom()
+<a class="jxr_linenumber" name="342" href="#342">342</a>             .loadTrustMaterial(<strong class="jxr_keyword">null</strong>, trustStrategy)
+<a class="jxr_linenumber" name="343" href="#343">343</a>             .build();
+<a class="jxr_linenumber" name="344" href="#344">344</a>         <strong class="jxr_keyword">final</strong> SSLConnectionSocketFactory socketFactory = <strong class="jxr_keyword">new</strong> SSLConnectionSocketFactory(
+<a class="jxr_linenumber" name="345" href="#345">345</a>                 sslcontext,
+<a class="jxr_linenumber" name="346" href="#346">346</a>                 SSLConnectionSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
+<a class="jxr_linenumber" name="347" href="#347">347</a> 
+<a class="jxr_linenumber" name="348" href="#348">348</a>         <strong class="jxr_keyword">final</strong> Socket socket = socketFactory.createSocket(context);
+<a class="jxr_linenumber" name="349" href="#349">349</a>         <strong class="jxr_keyword">final</strong> InetSocketAddress remoteAddress = <strong class="jxr_keyword">this</strong>.localServer.getServiceAddress();
+<a class="jxr_linenumber" name="350" href="#350">350</a>         socketFactory.connectSocket(0, socket, host, remoteAddress, <strong class="jxr_keyword">null</strong>, context);
+<a class="jxr_linenumber" name="351" href="#351">351</a>     }
+<a class="jxr_linenumber" name="352" href="#352">352</a> 
+<a class="jxr_linenumber" name="353" href="#353">353</a>     @Test
+<a class="jxr_linenumber" name="354" href="#354">354</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testDefaultHostnameVerifier() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="355" href="#355">355</a>         <strong class="jxr_keyword">final</strong> SSLConnectionSocketFactory socketFactory = <strong class="jxr_keyword">new</strong> SSLConnectionSocketFactory(
+<a class="jxr_linenumber" name="356" href="#356">356</a>                 SSLContexts.createDefault(),
+<a class="jxr_linenumber" name="357" href="#357">357</a>                 <strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="358" href="#358">358</a>         Assert.assertNotNull(socketFactory.getHostnameVerifier());
+<a class="jxr_linenumber" name="359" href="#359">359</a>     }
+<a class="jxr_linenumber" name="360" href="#360">360</a> 
+<a class="jxr_linenumber" name="361" href="#361">361</a> }
 </pre>
 <hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
 </html>

Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/ssl/package-frame.html
URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/ssl/package-frame.html?rev=1637120&r1=1637119&r2=1637120&view=diff
==============================================================================
--- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/ssl/package-frame.html (original)
+++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/ssl/package-frame.html Thu Nov  6 14:29:37 2014
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache HttpClient 4.3.5 Reference Package org.apache.http.conn.ssl</title>
+		<title>Apache HttpClient 4.3.6 Reference Package org.apache.http.conn.ssl</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/ssl/package-summary.html
URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/ssl/package-summary.html?rev=1637120&r1=1637119&r2=1637120&view=diff
==============================================================================
--- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/ssl/package-summary.html (original)
+++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/ssl/package-summary.html Thu Nov  6 14:29:37 2014
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache HttpClient 4.3.5 Reference Package org.apache.http.conn.ssl</title>
+		<title>Apache HttpClient 4.3.6 Reference Package org.apache.http.conn.ssl</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/util/package-frame.html
URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/util/package-frame.html?rev=1637120&r1=1637119&r2=1637120&view=diff
==============================================================================
--- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/util/package-frame.html (original)
+++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/util/package-frame.html Thu Nov  6 14:29:37 2014
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache HttpClient 4.3.5 Reference Package org.apache.http.conn.util</title>
+		<title>Apache HttpClient 4.3.6 Reference Package org.apache.http.conn.util</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/util/package-summary.html
URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/util/package-summary.html?rev=1637120&r1=1637119&r2=1637120&view=diff
==============================================================================
--- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/util/package-summary.html (original)
+++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/conn/util/package-summary.html Thu Nov  6 14:29:37 2014
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache HttpClient 4.3.5 Reference Package org.apache.http.conn.util</title>
+		<title>Apache HttpClient 4.3.6 Reference Package org.apache.http.conn.util</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/cookie/package-frame.html
URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/cookie/package-frame.html?rev=1637120&r1=1637119&r2=1637120&view=diff
==============================================================================
--- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/cookie/package-frame.html (original)
+++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/cookie/package-frame.html Thu Nov  6 14:29:37 2014
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache HttpClient 4.3.5 Reference Package org.apache.http.cookie</title>
+		<title>Apache HttpClient 4.3.6 Reference Package org.apache.http.cookie</title>
 		<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/cookie/package-summary.html
URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/cookie/package-summary.html?rev=1637120&r1=1637119&r2=1637120&view=diff
==============================================================================
--- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/cookie/package-summary.html (original)
+++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/cookie/package-summary.html Thu Nov  6 14:29:37 2014
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache HttpClient 4.3.5 Reference Package org.apache.http.cookie</title>
+		<title>Apache HttpClient 4.3.6 Reference Package org.apache.http.cookie</title>
 		<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/auth/package-frame.html
URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/auth/package-frame.html?rev=1637120&r1=1637119&r2=1637120&view=diff
==============================================================================
--- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/auth/package-frame.html (original)
+++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/auth/package-frame.html Thu Nov  6 14:29:37 2014
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache HttpClient 4.3.5 Reference Package org.apache.http.impl.auth</title>
+		<title>Apache HttpClient 4.3.6 Reference Package org.apache.http.impl.auth</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/auth/package-summary.html
URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/auth/package-summary.html?rev=1637120&r1=1637119&r2=1637120&view=diff
==============================================================================
--- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/auth/package-summary.html (original)
+++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/auth/package-summary.html Thu Nov  6 14:29:37 2014
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache HttpClient 4.3.5 Reference Package org.apache.http.impl.auth</title>
+		<title>Apache HttpClient 4.3.6 Reference Package org.apache.http.impl.auth</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/integration/TestClientAuthentication.html
URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/integration/TestClientAuthentication.html?rev=1637120&r1=1637119&r2=1637120&view=diff
==============================================================================
--- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/integration/TestClientAuthentication.html (original)
+++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/integration/TestClientAuthentication.html Thu Nov  6 14:29:37 2014
@@ -245,7 +245,7 @@
 <a class="jxr_linenumber" name="235" href="#235">235</a>             .add(<strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/http/localserver/RequestBasicAuth.html">RequestBasicAuth</a>())
 <a class="jxr_linenumber" name="236" href="#236">236</a>             .add(<strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/http/localserver/ResponseBasicUnauthorized.html">ResponseBasicUnauthorized</a>()).build();
 <a class="jxr_linenumber" name="237" href="#237">237</a>         <strong class="jxr_keyword">this</strong>.localServer = <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/http/localserver/LocalTestServer.html">LocalTestServer</a>(
-<a class="jxr_linenumber" name="238" href="#238">238</a>                 httpproc, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/http/impl/client/integration/TestClientAuthentication.html">AuthExpectationVerifier</a>(), <strong class="jxr_keyword">null</strong>, false);
+<a class="jxr_linenumber" name="238" href="#238">238</a>                 httpproc, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/http/impl/client/integration/TestClientAuthentication.html">AuthExpectationVerifier</a>(), <strong class="jxr_keyword">null</strong>, false, <strong class="jxr_keyword">null</strong>);
 <a class="jxr_linenumber" name="239" href="#239">239</a>         <strong class="jxr_keyword">this</strong>.localServer.register(<span class="jxr_string">"*"</span>, <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/http/impl/client/integration/TestClientReauthentication.html">AuthHandler</a>());
 <a class="jxr_linenumber" name="240" href="#240">240</a>         <strong class="jxr_keyword">this</strong>.localServer.start();
 <a class="jxr_linenumber" name="241" href="#241">241</a> 

Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/integration/package-frame.html
URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/integration/package-frame.html?rev=1637120&r1=1637119&r2=1637120&view=diff
==============================================================================
--- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/integration/package-frame.html (original)
+++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/integration/package-frame.html Thu Nov  6 14:29:37 2014
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache HttpClient 4.3.5 Reference Package org.apache.http.impl.client.integration</title>
+		<title>Apache HttpClient 4.3.6 Reference Package org.apache.http.impl.client.integration</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/integration/package-summary.html
URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/integration/package-summary.html?rev=1637120&r1=1637119&r2=1637120&view=diff
==============================================================================
--- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/integration/package-summary.html (original)
+++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/integration/package-summary.html Thu Nov  6 14:29:37 2014
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache HttpClient 4.3.5 Reference Package org.apache.http.impl.client.integration</title>
+		<title>Apache HttpClient 4.3.6 Reference Package org.apache.http.impl.client.integration</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/package-frame.html
URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/package-frame.html?rev=1637120&r1=1637119&r2=1637120&view=diff
==============================================================================
--- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/package-frame.html (original)
+++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/package-frame.html Thu Nov  6 14:29:37 2014
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache HttpClient 4.3.5 Reference Package org.apache.http.impl.client</title>
+		<title>Apache HttpClient 4.3.6 Reference Package org.apache.http.impl.client</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/package-summary.html
URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/package-summary.html?rev=1637120&r1=1637119&r2=1637120&view=diff
==============================================================================
--- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/package-summary.html (original)
+++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/client/package-summary.html Thu Nov  6 14:29:37 2014
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache HttpClient 4.3.5 Reference Package org.apache.http.impl.client</title>
+		<title>Apache HttpClient 4.3.6 Reference Package org.apache.http.impl.client</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/conn/TestHttpClientConnectionOperator.html
URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/conn/TestHttpClientConnectionOperator.html?rev=1637120&r1=1637119&r2=1637120&view=diff
==============================================================================
--- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/conn/TestHttpClientConnectionOperator.html (original)
+++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/conn/TestHttpClientConnectionOperator.html Thu Nov  6 14:29:37 2014
@@ -217,43 +217,75 @@
 <a class="jxr_linenumber" name="207" href="#207">207</a>     }
 <a class="jxr_linenumber" name="208" href="#208">208</a> 
 <a class="jxr_linenumber" name="209" href="#209">209</a>     @Test
-<a class="jxr_linenumber" name="210" href="#210">210</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUpgrade() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="210" href="#210">210</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testConnectExplicitAddress() <strong class="jxr_keyword">throws</strong> Exception {
 <a class="jxr_linenumber" name="211" href="#211">211</a>         <strong class="jxr_keyword">final</strong> HttpContext context = <strong class="jxr_keyword">new</strong> BasicHttpContext();
-<a class="jxr_linenumber" name="212" href="#212">212</a>         <strong class="jxr_keyword">final</strong> HttpHost host = <strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"somehost"</span>, -1, <span class="jxr_string">"https"</span>);
-<a class="jxr_linenumber" name="213" href="#213">213</a> 
-<a class="jxr_linenumber" name="214" href="#214">214</a>         Mockito.when(socketFactoryRegistry.lookup(<span class="jxr_string">"https"</span>)).thenReturn(sslSocketFactory);
-<a class="jxr_linenumber" name="215" href="#215">215</a>         Mockito.when(schemePortResolver.resolve(host)).thenReturn(443);
-<a class="jxr_linenumber" name="216" href="#216">216</a>         Mockito.when(sslSocketFactory.createSocket(Mockito.&lt;HttpContext&gt;any())).thenReturn(socket);
-<a class="jxr_linenumber" name="217" href="#217">217</a>         Mockito.when(sslSocketFactory.createLayeredSocket(
-<a class="jxr_linenumber" name="218" href="#218">218</a>                 Mockito.&lt;Socket&gt;any(),
-<a class="jxr_linenumber" name="219" href="#219">219</a>                 Mockito.eq(<span class="jxr_string">"somehost"</span>),
-<a class="jxr_linenumber" name="220" href="#220">220</a>                 Mockito.eq(443),
-<a class="jxr_linenumber" name="221" href="#221">221</a>                 Mockito.&lt;HttpContext&gt;any())).thenReturn(socket);
-<a class="jxr_linenumber" name="222" href="#222">222</a> 
-<a class="jxr_linenumber" name="223" href="#223">223</a>         connectionOperator.upgrade(conn, host, context);
-<a class="jxr_linenumber" name="224" href="#224">224</a> 
-<a class="jxr_linenumber" name="225" href="#225">225</a>         Mockito.verify(conn).bind(socket);
-<a class="jxr_linenumber" name="226" href="#226">226</a>     }
-<a class="jxr_linenumber" name="227" href="#227">227</a> 
-<a class="jxr_linenumber" name="228" href="#228">228</a>     @Test(expected=UnsupportedSchemeException.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="229" href="#229">229</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUpgradeUpsupportedScheme() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="230" href="#230">230</a>         <strong class="jxr_keyword">final</strong> HttpContext context = <strong class="jxr_keyword">new</strong> BasicHttpContext();
-<a class="jxr_linenumber" name="231" href="#231">231</a>         <strong class="jxr_keyword">final</strong> HttpHost host = <strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"somehost"</span>, -1, <span class="jxr_string">"httpsssss"</span>);
-<a class="jxr_linenumber" name="232" href="#232">232</a>         Mockito.when(socketFactoryRegistry.lookup(<span class="jxr_string">"http"</span>)).thenReturn(plainSocketFactory);
-<a class="jxr_linenumber" name="233" href="#233">233</a> 
-<a class="jxr_linenumber" name="234" href="#234">234</a>         connectionOperator.upgrade(conn, host, context);
-<a class="jxr_linenumber" name="235" href="#235">235</a>     }
-<a class="jxr_linenumber" name="236" href="#236">236</a> 
-<a class="jxr_linenumber" name="237" href="#237">237</a>     @Test(expected=UnsupportedSchemeException.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="238" href="#238">238</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUpgradeNonLayeringScheme() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="239" href="#239">239</a>         <strong class="jxr_keyword">final</strong> HttpContext context = <strong class="jxr_keyword">new</strong> BasicHttpContext();
-<a class="jxr_linenumber" name="240" href="#240">240</a>         <strong class="jxr_keyword">final</strong> HttpHost host = <strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"somehost"</span>, -1, <span class="jxr_string">"http"</span>);
-<a class="jxr_linenumber" name="241" href="#241">241</a>         Mockito.when(socketFactoryRegistry.lookup(<span class="jxr_string">"http"</span>)).thenReturn(plainSocketFactory);
-<a class="jxr_linenumber" name="242" href="#242">242</a> 
-<a class="jxr_linenumber" name="243" href="#243">243</a>         connectionOperator.upgrade(conn, host, context);
-<a class="jxr_linenumber" name="244" href="#244">244</a>     }
+<a class="jxr_linenumber" name="212" href="#212">212</a>         <strong class="jxr_keyword">final</strong> InetAddress local = InetAddress.getByAddress(<strong class="jxr_keyword">new</strong> byte[] {127, 0, 0, 0});
+<a class="jxr_linenumber" name="213" href="#213">213</a>         <strong class="jxr_keyword">final</strong> InetAddress ip = InetAddress.getByAddress(<strong class="jxr_keyword">new</strong> byte[] {127, 0, 0, 23});
+<a class="jxr_linenumber" name="214" href="#214">214</a>         <strong class="jxr_keyword">final</strong> HttpHost host = <strong class="jxr_keyword">new</strong> HttpHost(ip);
+<a class="jxr_linenumber" name="215" href="#215">215</a> 
+<a class="jxr_linenumber" name="216" href="#216">216</a>         Mockito.when(socketFactoryRegistry.lookup(<span class="jxr_string">"http"</span>)).thenReturn(plainSocketFactory);
+<a class="jxr_linenumber" name="217" href="#217">217</a>         Mockito.when(schemePortResolver.resolve(host)).thenReturn(80);
+<a class="jxr_linenumber" name="218" href="#218">218</a>         Mockito.when(plainSocketFactory.createSocket(Mockito.&lt;HttpContext&gt;any())).thenReturn(socket);
+<a class="jxr_linenumber" name="219" href="#219">219</a>         Mockito.when(plainSocketFactory.connectSocket(
+<a class="jxr_linenumber" name="220" href="#220">220</a>                 Mockito.anyInt(),
+<a class="jxr_linenumber" name="221" href="#221">221</a>                 Mockito.&lt;Socket&gt;any(),
+<a class="jxr_linenumber" name="222" href="#222">222</a>                 Mockito.&lt;HttpHost&gt;any(),
+<a class="jxr_linenumber" name="223" href="#223">223</a>                 Mockito.&lt;InetSocketAddress&gt;any(),
+<a class="jxr_linenumber" name="224" href="#224">224</a>                 Mockito.&lt;InetSocketAddress&gt;any(),
+<a class="jxr_linenumber" name="225" href="#225">225</a>                 Mockito.&lt;HttpContext&gt;any())).thenReturn(socket);
+<a class="jxr_linenumber" name="226" href="#226">226</a> 
+<a class="jxr_linenumber" name="227" href="#227">227</a>         <strong class="jxr_keyword">final</strong> InetSocketAddress localAddress = <strong class="jxr_keyword">new</strong> InetSocketAddress(local, 0);
+<a class="jxr_linenumber" name="228" href="#228">228</a>         connectionOperator.connect(conn, host, localAddress, 1000, SocketConfig.DEFAULT, context);
+<a class="jxr_linenumber" name="229" href="#229">229</a> 
+<a class="jxr_linenumber" name="230" href="#230">230</a>         Mockito.verify(plainSocketFactory).connectSocket(
+<a class="jxr_linenumber" name="231" href="#231">231</a>                 1000,
+<a class="jxr_linenumber" name="232" href="#232">232</a>                 socket,
+<a class="jxr_linenumber" name="233" href="#233">233</a>                 host,
+<a class="jxr_linenumber" name="234" href="#234">234</a>                 <strong class="jxr_keyword">new</strong> InetSocketAddress(ip, 80),
+<a class="jxr_linenumber" name="235" href="#235">235</a>                 localAddress,
+<a class="jxr_linenumber" name="236" href="#236">236</a>                 context);
+<a class="jxr_linenumber" name="237" href="#237">237</a>         Mockito.verify(dnsResolver, Mockito.never()).resolve(Mockito.anyString());
+<a class="jxr_linenumber" name="238" href="#238">238</a>         Mockito.verify(conn, Mockito.times(2)).bind(socket);
+<a class="jxr_linenumber" name="239" href="#239">239</a>     }
+<a class="jxr_linenumber" name="240" href="#240">240</a> 
+<a class="jxr_linenumber" name="241" href="#241">241</a>     @Test
+<a class="jxr_linenumber" name="242" href="#242">242</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUpgrade() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="243" href="#243">243</a>         <strong class="jxr_keyword">final</strong> HttpContext context = <strong class="jxr_keyword">new</strong> BasicHttpContext();
+<a class="jxr_linenumber" name="244" href="#244">244</a>         <strong class="jxr_keyword">final</strong> HttpHost host = <strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"somehost"</span>, -1, <span class="jxr_string">"https"</span>);
 <a class="jxr_linenumber" name="245" href="#245">245</a> 
-<a class="jxr_linenumber" name="246" href="#246">246</a> }
+<a class="jxr_linenumber" name="246" href="#246">246</a>         Mockito.when(socketFactoryRegistry.lookup(<span class="jxr_string">"https"</span>)).thenReturn(sslSocketFactory);
+<a class="jxr_linenumber" name="247" href="#247">247</a>         Mockito.when(schemePortResolver.resolve(host)).thenReturn(443);
+<a class="jxr_linenumber" name="248" href="#248">248</a>         Mockito.when(sslSocketFactory.createSocket(Mockito.&lt;HttpContext&gt;any())).thenReturn(socket);
+<a class="jxr_linenumber" name="249" href="#249">249</a>         Mockito.when(sslSocketFactory.createLayeredSocket(
+<a class="jxr_linenumber" name="250" href="#250">250</a>                 Mockito.&lt;Socket&gt;any(),
+<a class="jxr_linenumber" name="251" href="#251">251</a>                 Mockito.eq(<span class="jxr_string">"somehost"</span>),
+<a class="jxr_linenumber" name="252" href="#252">252</a>                 Mockito.eq(443),
+<a class="jxr_linenumber" name="253" href="#253">253</a>                 Mockito.&lt;HttpContext&gt;any())).thenReturn(socket);
+<a class="jxr_linenumber" name="254" href="#254">254</a> 
+<a class="jxr_linenumber" name="255" href="#255">255</a>         connectionOperator.upgrade(conn, host, context);
+<a class="jxr_linenumber" name="256" href="#256">256</a> 
+<a class="jxr_linenumber" name="257" href="#257">257</a>         Mockito.verify(conn).bind(socket);
+<a class="jxr_linenumber" name="258" href="#258">258</a>     }
+<a class="jxr_linenumber" name="259" href="#259">259</a> 
+<a class="jxr_linenumber" name="260" href="#260">260</a>     @Test(expected=UnsupportedSchemeException.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="261" href="#261">261</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUpgradeUpsupportedScheme() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="262" href="#262">262</a>         <strong class="jxr_keyword">final</strong> HttpContext context = <strong class="jxr_keyword">new</strong> BasicHttpContext();
+<a class="jxr_linenumber" name="263" href="#263">263</a>         <strong class="jxr_keyword">final</strong> HttpHost host = <strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"somehost"</span>, -1, <span class="jxr_string">"httpsssss"</span>);
+<a class="jxr_linenumber" name="264" href="#264">264</a>         Mockito.when(socketFactoryRegistry.lookup(<span class="jxr_string">"http"</span>)).thenReturn(plainSocketFactory);
+<a class="jxr_linenumber" name="265" href="#265">265</a> 
+<a class="jxr_linenumber" name="266" href="#266">266</a>         connectionOperator.upgrade(conn, host, context);
+<a class="jxr_linenumber" name="267" href="#267">267</a>     }
+<a class="jxr_linenumber" name="268" href="#268">268</a> 
+<a class="jxr_linenumber" name="269" href="#269">269</a>     @Test(expected=UnsupportedSchemeException.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="270" href="#270">270</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUpgradeNonLayeringScheme() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="271" href="#271">271</a>         <strong class="jxr_keyword">final</strong> HttpContext context = <strong class="jxr_keyword">new</strong> BasicHttpContext();
+<a class="jxr_linenumber" name="272" href="#272">272</a>         <strong class="jxr_keyword">final</strong> HttpHost host = <strong class="jxr_keyword">new</strong> HttpHost(<span class="jxr_string">"somehost"</span>, -1, <span class="jxr_string">"http"</span>);
+<a class="jxr_linenumber" name="273" href="#273">273</a>         Mockito.when(socketFactoryRegistry.lookup(<span class="jxr_string">"http"</span>)).thenReturn(plainSocketFactory);
+<a class="jxr_linenumber" name="274" href="#274">274</a> 
+<a class="jxr_linenumber" name="275" href="#275">275</a>         connectionOperator.upgrade(conn, host, context);
+<a class="jxr_linenumber" name="276" href="#276">276</a>     }
+<a class="jxr_linenumber" name="277" href="#277">277</a> 
+<a class="jxr_linenumber" name="278" href="#278">278</a> }
 </pre>
 <hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
 </html>

Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/conn/package-frame.html
URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/conn/package-frame.html?rev=1637120&r1=1637119&r2=1637120&view=diff
==============================================================================
--- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/conn/package-frame.html (original)
+++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/conn/package-frame.html Thu Nov  6 14:29:37 2014
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache HttpClient 4.3.5 Reference Package org.apache.http.impl.conn</title>
+		<title>Apache HttpClient 4.3.6 Reference Package org.apache.http.impl.conn</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/conn/package-summary.html
URL: http://svn.apache.org/viewvc/httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/conn/package-summary.html?rev=1637120&r1=1637119&r2=1637120&view=diff
==============================================================================
--- httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/conn/package-summary.html (original)
+++ httpcomponents/site/httpcomponents-client-4.3.x/httpclient/xref-test/org/apache/http/impl/conn/package-summary.html Thu Nov  6 14:29:37 2014
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache HttpClient 4.3.5 Reference Package org.apache.http.impl.conn</title>
+		<title>Apache HttpClient 4.3.6 Reference Package org.apache.http.impl.conn</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>



Mime
View raw message