diff options
| author | Greg Wilkins | 2015-02-13 00:45:56 +0000 |
|---|---|---|
| committer | Greg Wilkins | 2015-02-13 00:45:56 +0000 |
| commit | 0f7ee8d607d9f74debe0698237e46b20375680a9 (patch) | |
| tree | 4806e5bbccd0fb1fb43a6357608e77d00c82ef46 /jetty-websocket/websocket-client | |
| parent | 1f90d62d3fb83de1ff74ae7a7d1ca888eee07617 (diff) | |
| parent | 2b2a70a93a50fd20f17f38be82b8e15d1365dccd (diff) | |
| download | org.eclipse.jetty.project-0f7ee8d607d9f74debe0698237e46b20375680a9.tar.gz org.eclipse.jetty.project-0f7ee8d607d9f74debe0698237e46b20375680a9.tar.xz org.eclipse.jetty.project-0f7ee8d607d9f74debe0698237e46b20375680a9.zip | |
Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpVersion.java
jetty-io/src/main/java/org/eclipse/jetty/io/EndPoint.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
Diffstat (limited to 'jetty-websocket/websocket-client')
| -rw-r--r-- | jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java index 8ba9cbc056..530c010b92 100644 --- a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java +++ b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java @@ -265,6 +265,7 @@ public class UpgradeConnection extends AbstractConnection connectPromise.getClient().addManaged(session); // Now swap out the connection + // TODO use endp.upgrade ??? endp.setConnection(connection); connection.onOpen(); } |