[asterisk-commits] r399080 - svn:log

[SVN commits to the Asterisk project]

Author: dlee
Revision: 399080
Modified property: svn:log

Modified: svn:log at Fri Sep 13 09:39:31 2013
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Fri Sep 13 09:39:31 2013
@@ -1,20 +1,1 @@
-ARI: Fix WebSocket response when subprotocol isn't specified
-
-When I moved the ARI WebSocket from /ws to /ari/events, I added code to
-allow a WebSocket to connect without specifying the subprotocol if
-there's only one subprotocol handler registered for the WebSocket.
-
-Naively, I coded it to always respond with the subprotocol in use.
-Unfortunately, according to RFC 6455, if the server's response includes
-a subprotocol header field that "indicates the use of a subprotocol that
-was not present in the client's handshake [...], the client MUST _Fail
-the WebSocket Connection_.", emphasis theirs.
-
-This patch correctly omits the Sec-WebSocket-Protocol if one is not
-specified by the client.
-
-(closes issue ASTERISK-22441)
-Review: https://reviewboard.asterisk.org/r/2828/
-........
-
-Merged revisions 399039 from http://svn.asterisk.org/svn/asterisk/branches/12
+Put merge tracking for r399039 back.