bug 663871 websockets -08 bump our version number and the version number in the test server r=biesi

This commit is contained in:
Patrick McManus 2011-06-21 10:50:02 -04:00
parent c038b2b6e7
commit 53200f0d4e
4 changed files with 7 additions and 4 deletions

View File

@ -99,8 +99,8 @@ static PRLogModuleInfo *webSocketLog = nsnull;
// main transmit queue
#define kFinMessage (reinterpret_cast<nsCString *>(0x01))
// An implementation of draft-ietf-hybi-thewebsocketprotocol-07
#define SEC_WEBSOCKET_VERSION "7"
// An implementation of draft-ietf-hybi-thewebsocketprotocol-08
#define SEC_WEBSOCKET_VERSION "8"
/*
* About SSL unsigned certificates

View File

@ -8,6 +8,9 @@ files, the second allows python 2.5 to work)
also includes patch for 663096 to drain input buffers before closing
in order to avoid RST
also updates blindly version 7 to be version 8 until upstream makes
real version 8 available
diff --git a/testing/mochitest/pywebsocket/mod_pywebsocket/dispatch.py b/testing/mochitest/pywebsocket/mod_pywebsocket/dispatch.py
--- a/testing/mochitest/pywebsocket/mod_pywebsocket/dispatch.py
+++ b/testing/mochitest/pywebsocket/mod_pywebsocket/dispatch.py

View File

@ -29,7 +29,7 @@
# Constants indicating WebSocket protocol version.
VERSION_HYBI07 = 7
VERSION_HYBI07 = 8
VERSION_HYBI00 = 0
VERSION_HIXIE75 = -1

View File

@ -150,7 +150,7 @@ class Handshaker(object):
def _check_version(self):
unused_value = validate_mandatory_header(
self._request, common.SEC_WEBSOCKET_VERSION_HEADER, '7')
self._request, common.SEC_WEBSOCKET_VERSION_HEADER, '8')
def _set_protocol(self):
self._request.ws_protocol = None