--- old/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/SSLTunnelConnection.java	2017-11-30 04:06:31.475381513 -0800
+++ /dev/null	2017-10-28 22:49:55.551349757 -0700
@@ -1,207 +0,0 @@
-/*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.incubator.http;
-
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.net.InetSocketAddress;
-import java.nio.ByteBuffer;
-import java.nio.channels.SocketChannel;
-import java.util.concurrent.CompletableFuture;
-import javax.net.ssl.SSLEngineResult.Status;
-import javax.net.ssl.SSLParameters;
-import jdk.incubator.http.SSLDelegate.WrapperResult;
-
-import jdk.incubator.http.internal.common.ByteBufferReference;
-import jdk.incubator.http.internal.common.Utils;
-
-/**
- * An SSL tunnel built on a Plain (CONNECT) TCP tunnel.
- */
-class SSLTunnelConnection extends HttpConnection {
-
-    final PlainTunnelingConnection delegate;
-    protected SSLDelegate sslDelegate;
-    private volatile boolean connected;
-    final String serverName;
-
-    @Override
-    public void connect() throws IOException, InterruptedException {
-        delegate.connect();
-        this.sslDelegate = new SSLDelegate(delegate.channel(), client, null, serverName);
-        connected = true;
-    }
-
-    @Override
-    boolean connected() {
-        return connected && delegate.connected();
-    }
-
-    @Override
-    public CompletableFuture<Void> connectAsync() {
-        return delegate.connectAsync()
-            .thenAccept((Void v) -> {
-                try {
-                    // can this block?
-                    this.sslDelegate = new SSLDelegate(delegate.channel(),
-                                                       client,
-                                                       null, serverName);
-                    connected = true;
-                } catch (IOException e) {
-                    throw new UncheckedIOException(e);
-                }
-            });
-    }
-
-    SSLTunnelConnection(InetSocketAddress addr,
-                        HttpClientImpl client,
-                        InetSocketAddress proxy)
-    {
-        super(addr, client);
-        this.serverName = Utils.getServerName(addr);
-        delegate = new PlainTunnelingConnection(addr, proxy, client);
-    }
-
-    /**
-     * Create an SSLTunnelConnection from an existing connected AsyncSSLTunnelConnection.
-     * Used when downgrading from HTTP/2 to HTTP/1.1
-     */
-    SSLTunnelConnection(AsyncSSLTunnelConnection c) {
-        super(c.address, c.client);
-        this.delegate = c.plainConnection();
-        AsyncSSLDelegate adel = c.sslDelegate();
-        this.sslDelegate = new SSLDelegate(adel.engine, delegate.channel(), client, adel.serverName);
-        this.serverName = adel.serverName;
-        connected = c.connected();
-    }
-
-    @Override
-    SSLParameters sslParameters() {
-        return sslDelegate.getSSLParameters();
-    }
-
-    @Override
-    public String toString() {
-        return "SSLTunnelConnection: " + super.toString();
-    }
-
-    private static long countBytes(ByteBuffer[] buffers, int start, int number) {
-        long c = 0;
-        for (int i=0; i<number; i++) {
-            c+= buffers[start+i].remaining();
-        }
-        return c;
-    }
-
-    @Override
-    ConnectionPool.CacheKey cacheKey() {
-        return ConnectionPool.cacheKey(address, delegate.proxyAddr);
-    }
-
-    @Override
-    long write(ByteBuffer[] buffers, int start, int number) throws IOException {
-        //debugPrint("Send", buffers, start, number);
-        long l = countBytes(buffers, start, number);
-        WrapperResult r = sslDelegate.sendData(buffers, start, number);
-        if (r.result.getStatus() == Status.CLOSED) {
-            if (l > 0) {
-                throw new IOException("SSLHttpConnection closed");
-            }
-        }
-        return l;
-    }
-
-    @Override
-    long write(ByteBuffer buffer) throws IOException {
-        //debugPrint("Send", buffer);
-        long l = buffer.remaining();
-        WrapperResult r = sslDelegate.sendData(buffer);
-        if (r.result.getStatus() == Status.CLOSED) {
-            if (l > 0) {
-                throw new IOException("SSLHttpConnection closed");
-            }
-        }
-        return l;
-    }
-
-    @Override
-    void writeAsync(ByteBufferReference[] buffers) throws IOException {
-        write(ByteBufferReference.toBuffers(buffers), 0, buffers.length);
-    }
-
-    @Override
-    void writeAsyncUnordered(ByteBufferReference[] buffers) throws IOException {
-        write(ByteBufferReference.toBuffers(buffers), 0, buffers.length);
-    }
-
-    @Override
-    void flushAsync() throws IOException {
-        // nothing to do
-    }
-
-    @Override
-    public void close() {
-        Utils.close(delegate.channel());
-    }
-
-    @Override
-    void shutdownInput() throws IOException {
-        delegate.channel().shutdownInput();
-    }
-
-    @Override
-    void shutdownOutput() throws IOException {
-        delegate.channel().shutdownOutput();
-    }
-
-    @Override
-    protected ByteBuffer readImpl() throws IOException {
-        ByteBuffer buf = Utils.getBuffer();
-
-        WrapperResult r = sslDelegate.recvData(buf);
-        return r.buf;
-    }
-
-    @Override
-    SocketChannel channel() {
-        return delegate.channel();
-    }
-
-    @Override
-    CompletableFuture<Void> whenReceivingResponse() {
-        return delegate.whenReceivingResponse();
-    }
-
-    @Override
-    boolean isSecure() {
-        return true;
-    }
-
-    @Override
-    boolean isProxied() {
-        return true;
-    }
-}