# HG changeset patch
# User prappo
# Date 1517831585 0
# Node ID 67ca659b649fae6939070328067ca5d5db4d1857
# Parent  255e21e86b996f928ff0a05f99b4d5d56eca51b1# Parent  6d6290b1176fc637a0fde984090e411777dbe30b
http-client-branch: (WebSocket) merge

diff -r 255e21e86b99 -r 67ca659b649f src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http2Connection.java
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http2Connection.java	Thu Feb 01 16:12:28 2018 +0000
+++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http2Connection.java	Mon Feb 05 11:53:05 2018 +0000
@@ -1271,8 +1271,8 @@
      * Thrown when https handshake negotiates http/1.1 alpn instead of h2
      */
     static final class ALPNException extends IOException {
-        private static final long serialVersionUID = 23138275393635783L;
-        final AbstractAsyncSSLConnection connection;
+        private static final long serialVersionUID = 0L;
+        final transient AbstractAsyncSSLConnection connection;
 
         ALPNException(String msg, AbstractAsyncSSLConnection connection) {
             super(msg);
diff -r 255e21e86b99 -r 67ca659b649f src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PlainTunnelingConnection.java
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PlainTunnelingConnection.java	Thu Feb 01 16:12:28 2018 +0000
+++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PlainTunnelingConnection.java	Mon Feb 05 11:53:05 2018 +0000
@@ -47,7 +47,7 @@
 
     final PlainHttpConnection delegate;
     final HttpHeaders proxyHeaders;
-    protected final InetSocketAddress proxyAddr;
+    final InetSocketAddress proxyAddr;
     private volatile boolean connected;
 
     protected PlainTunnelingConnection(InetSocketAddress addr,
diff -r 255e21e86b99 -r 67ca659b649f src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/GoAwayFrame.java
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/GoAwayFrame.java	Thu Feb 01 16:12:28 2018 +0000
+++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/GoAwayFrame.java	Mon Feb 05 11:53:05 2018 +0000
@@ -40,7 +40,7 @@
     public GoAwayFrame(int lastStream, int errorCode, byte[] debugData) {
         super(0, 0, errorCode);
         this.lastStream = lastStream;
-        this.debugData = debugData;
+        this.debugData = debugData.clone();
     }
 
     @Override
@@ -63,7 +63,7 @@
     }
 
     public byte[] getDebugData() {
-        return debugData;
+        return debugData.clone();
     }
 
 }
diff -r 255e21e86b99 -r 67ca659b649f src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/PingFrame.java
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/PingFrame.java	Thu Feb 01 16:12:28 2018 +0000
+++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/PingFrame.java	Mon Feb 05 11:53:05 2018 +0000
@@ -38,7 +38,7 @@
     public PingFrame(int flags, byte[] data) {
         super(0, flags);
         assert data.length == 8;
-        this.data = data;
+        this.data = data.clone();
     }
 
     @Override
@@ -61,7 +61,7 @@
     }
 
     public byte[] getData() {
-        return data;
+        return data.clone();
     }
 
 }