From ec541d97bba1eadc8cb8bb579af7710fa89a660e Mon Sep 17 00:00:00 2001 From: Matthias Wessendorf Date: Tue, 16 Apr 2013 10:21:54 +0200 Subject: [PATCH] Updating the submitted websocket protocol value; For STOMP 1.1 the 'v11.stomp' value is specified value (IANA) --- .../stilts/stomp/protocol/websocket/ietf00/Ietf00Handshake.java | 2 +- .../stilts/stomp/protocol/websocket/ietf07/Ietf07Handshake.java | 2 +- .../stilts/stomp/protocol/websocket/ietf08/Ietf08Handshake.java | 2 +- .../stilts/stomp/protocol/websocket/ietf17/Ietf17Handshake.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stomp-common/src/main/java/org/projectodd/stilts/stomp/protocol/websocket/ietf00/Ietf00Handshake.java b/stomp-common/src/main/java/org/projectodd/stilts/stomp/protocol/websocket/ietf00/Ietf00Handshake.java index 3e3da98a..cd05337a 100644 --- a/stomp-common/src/main/java/org/projectodd/stilts/stomp/protocol/websocket/ietf00/Ietf00Handshake.java +++ b/stomp-common/src/main/java/org/projectodd/stilts/stomp/protocol/websocket/ietf00/Ietf00Handshake.java @@ -63,7 +63,7 @@ public HttpRequest generateRequest(URI uri) throws Exception { request.addHeader( HttpHeaders.Names.CONNECTION, "Upgrade" ); request.addHeader( HttpHeaders.Names.UPGRADE, "WebSocket" ); request.addHeader( HttpHeaders.Names.HOST, uri.getHost()+ ":" + uri.getPort() ); - request.addHeader( HttpHeaders.Names.SEC_WEBSOCKET_PROTOCOL, "stomp" ); + request.addHeader( HttpHeaders.Names.SEC_WEBSOCKET_PROTOCOL, "v11.stomp" ); request.addHeader( HttpHeaders.Names.SEC_WEBSOCKET_KEY1, this.challenge.getKey1String() ); request.addHeader( HttpHeaders.Names.SEC_WEBSOCKET_KEY2, this.challenge.getKey2String() ); diff --git a/stomp-common/src/main/java/org/projectodd/stilts/stomp/protocol/websocket/ietf07/Ietf07Handshake.java b/stomp-common/src/main/java/org/projectodd/stilts/stomp/protocol/websocket/ietf07/Ietf07Handshake.java index 4fe7cbc2..54b1e3b2 100644 --- a/stomp-common/src/main/java/org/projectodd/stilts/stomp/protocol/websocket/ietf07/Ietf07Handshake.java +++ b/stomp-common/src/main/java/org/projectodd/stilts/stomp/protocol/websocket/ietf07/Ietf07Handshake.java @@ -68,7 +68,7 @@ public HttpRequest generateRequest(URI uri) throws Exception { request.addHeader( HttpHeaders.Names.CONNECTION, "Upgrade" ); request.addHeader( HttpHeaders.Names.UPGRADE, "WebSocket" ); request.addHeader( HttpHeaders.Names.HOST, uri.getHost()+ ":" + uri.getPort() ); - request.addHeader( HttpHeaders.Names.SEC_WEBSOCKET_PROTOCOL, "stomp" ); + request.addHeader( HttpHeaders.Names.SEC_WEBSOCKET_PROTOCOL, "v11.stomp" ); request.addHeader( "Sec-WebSocket-Key", this.challenge.getNonceBase64() ); request.setContent( ChannelBuffers.EMPTY_BUFFER ); diff --git a/stomp-common/src/main/java/org/projectodd/stilts/stomp/protocol/websocket/ietf08/Ietf08Handshake.java b/stomp-common/src/main/java/org/projectodd/stilts/stomp/protocol/websocket/ietf08/Ietf08Handshake.java index 9ccdb5d2..d169fd15 100644 --- a/stomp-common/src/main/java/org/projectodd/stilts/stomp/protocol/websocket/ietf08/Ietf08Handshake.java +++ b/stomp-common/src/main/java/org/projectodd/stilts/stomp/protocol/websocket/ietf08/Ietf08Handshake.java @@ -72,7 +72,7 @@ public HttpRequest generateRequest(URI uri) throws Exception { request.addHeader( HttpHeaders.Names.CONNECTION, "Upgrade" ); request.addHeader( HttpHeaders.Names.UPGRADE, "WebSocket" ); request.addHeader( HttpHeaders.Names.HOST, uri.getHost()+ ":" + uri.getPort() ); - request.addHeader( HttpHeaders.Names.SEC_WEBSOCKET_PROTOCOL, "stomp" ); + request.addHeader( HttpHeaders.Names.SEC_WEBSOCKET_PROTOCOL, "v11.stomp" ); request.addHeader( "Sec-WebSocket-Key", this.challenge.getNonceBase64() ); request.setContent( ChannelBuffers.EMPTY_BUFFER ); diff --git a/stomp-common/src/main/java/org/projectodd/stilts/stomp/protocol/websocket/ietf17/Ietf17Handshake.java b/stomp-common/src/main/java/org/projectodd/stilts/stomp/protocol/websocket/ietf17/Ietf17Handshake.java index 6f7280a9..97861d7f 100644 --- a/stomp-common/src/main/java/org/projectodd/stilts/stomp/protocol/websocket/ietf17/Ietf17Handshake.java +++ b/stomp-common/src/main/java/org/projectodd/stilts/stomp/protocol/websocket/ietf17/Ietf17Handshake.java @@ -72,7 +72,7 @@ public HttpRequest generateRequest(URI uri) throws Exception { request.addHeader( HttpHeaders.Names.CONNECTION, "Upgrade" ); request.addHeader( HttpHeaders.Names.UPGRADE, "WebSocket" ); request.addHeader( HttpHeaders.Names.HOST, uri.getHost()+ ":" + uri.getPort() ); - request.addHeader( HttpHeaders.Names.SEC_WEBSOCKET_PROTOCOL, "stomp" ); + request.addHeader( HttpHeaders.Names.SEC_WEBSOCKET_PROTOCOL, "v11.stomp" ); request.addHeader( "Sec-WebSocket-Key", this.challenge.getNonceBase64() ); request.setContent( ChannelBuffers.EMPTY_BUFFER );