HTTPS SNI connections

I can not connect to an HTTPS server with SNI with version 1.6 of the HTTP-Proxy-Servlet.

I locally patched the org.mitre.dsmiley.httpproxy.ProxyServlet.createHttpClient(HttpParams) method to enable SNI like the page [1] describes.

I used the following code:

SSLContext sslcontext = SSLContexts.createSystemDefault();
SSLSocketFactory sslsf = new SSLSocketFactory(sslcontext) {
  // here the code from [1]
}
HttpClientBuilder builder = HttpClients.custom().setConnectionManager(new PoolingHttpClientConnectionManager()).setSSLSocketFactory(sslsf);
builder.disableCookieManagement();
if (hcParams.isParameterFalse(ClientPNames.HANDLE_REDIRECTS)) {
  builder.disableRedirectHandling();
}
return builder.build();

I'm not sure if this is compatible with the code for org.apache.http.impl.client.SystemDefaultHttpClient in createHttpClient().

[1] https://wiki.apache.org/HttpComponents/SNISupport

Start at org.mitre.dsmiley.httpproxy.ProxyServlet.createHttpClient(HttpParams) and compare its SystemDefaultHttpClient setup with the SNI guidance in the linked HttpComponents documentation. Verify that HTTPS connections to SNI servers succeed while preserving the existing redirect and cookie behavior; no specific test file is mentioned.