backout 923beecc0fe5 so it can be re-merged with bug number in description
authorPatrick McManus <mcmanus@ducksong.com>
Tue, 21 Jun 2011 10:42:54 -0400
changeset 71434 c1526df3cbfb39345b3fe6a704a114918bc2731c
parent 71433 923beecc0fe5b3442edc9881ddfa2fe13c1d7f13
child 71435 63755133ed9897b5240aa879ba0b22afaec153f4
push id154
push usermcmanus@ducksong.com
push dateTue, 21 Jun 2011 14:47:46 +0000
treeherdermozilla-inbound@42637223dd3f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone7.0a1
backs out923beecc0fe5b3442edc9881ddfa2fe13c1d7f13
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
backout 923beecc0fe5 so it can be re-merged with bug number in description
netwerk/protocol/websocket/nsWebSocketHandler.cpp
testing/mochitest/pywebsocket/README
testing/mochitest/pywebsocket/mod_pywebsocket/common.py
testing/mochitest/pywebsocket/mod_pywebsocket/handshake/hybi06.py
--- a/netwerk/protocol/websocket/nsWebSocketHandler.cpp
+++ b/netwerk/protocol/websocket/nsWebSocketHandler.cpp
@@ -94,18 +94,18 @@ NS_IMPL_THREADSAFE_ISUPPORTS11(nsWebSock
 static PRLogModuleInfo *webSocketLog = nsnull;
 #endif
 #define LOG(args) PR_LOG(webSocketLog, PR_LOG_DEBUG, args)
 
 // Use this fake ptr so the Fin message stays in sequence in the
 // main transmit queue
 #define kFinMessage (reinterpret_cast<nsCString *>(0x01))
 
-// An implementation of draft-ietf-hybi-thewebsocketprotocol-08
-#define SEC_WEBSOCKET_VERSION "8"
+// An implementation of draft-ietf-hybi-thewebsocketprotocol-07
+#define SEC_WEBSOCKET_VERSION "7"
 
 /*
  * About SSL unsigned certificates
  *
  * wss will not work to a host using an unsigned certificate unless there
  * is already an exception (i.e. it cannot popup a dialog asking for
  * a security exception). This is similar to how an inlined img will
  * fail without a dialog if fails for the same reason. This should not
--- a/testing/mochitest/pywebsocket/README
+++ b/testing/mochitest/pywebsocket/README
@@ -3,19 +3,16 @@ version 489
 supporting ietf-07
 
 includes the following minor patch:: (first bit supports symlinked wsh
 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
 @@ -60,17 +60,18 @@ def _normalize_path(path):
          path: the path to normalize.
  
      Path is converted to the absolute path.
      The input path can use either '\\' or '/' as the separator.
--- a/testing/mochitest/pywebsocket/mod_pywebsocket/common.py
+++ b/testing/mochitest/pywebsocket/mod_pywebsocket/common.py
@@ -24,17 +24,17 @@
 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 # Constants indicating WebSocket protocol version.
-VERSION_HYBI07 = 8
+VERSION_HYBI07 = 7
 VERSION_HYBI00 = 0
 VERSION_HIXIE75 = -1
 
 # Port numbers
 DEFAULT_WEB_SOCKET_PORT = 80
 DEFAULT_WEB_SOCKET_SECURE_PORT = 443
 
 # Schemes
--- a/testing/mochitest/pywebsocket/mod_pywebsocket/handshake/hybi06.py
+++ b/testing/mochitest/pywebsocket/mod_pywebsocket/handshake/hybi06.py
@@ -145,17 +145,17 @@ class Handshaker(object):
 
     def _get_origin(self):
         origin = self._request.headers_in.get(
             common.SEC_WEBSOCKET_ORIGIN_HEADER)
         self._request.ws_origin = origin
 
     def _check_version(self):
         unused_value = validate_mandatory_header(
-            self._request, common.SEC_WEBSOCKET_VERSION_HEADER, '8')
+            self._request, common.SEC_WEBSOCKET_VERSION_HEADER, '7')
 
     def _set_protocol(self):
         self._request.ws_protocol = None
 
         protocol_header = self._request.headers_in.get(
             common.SEC_WEBSOCKET_PROTOCOL_HEADER)
 
         if not protocol_header: