Bug 689006: Upgrade pywebsocket to binary API (version 553, also supports Python > 2.5) r=mcmanus

testing/mochitest/pywebsocket/mod_pywebsocket/headerparserhandler.py

@@ -134,34 +134,39 @@ def headerparserhandler(request):
     Args:
         request: mod_python request.
 
-    This function is named headerparserhandler because it is the default name
-    for a PythonHeaderParserHandler.
+    This function is named headerparserhandler because it is the default
+    name for a PythonHeaderParserHandler.
     """
 
+    handshake_is_done = False
     try:
         allowDraft75 = apache.main_server.get_options().get(
             _PYOPT_ALLOW_DRAFT75, None)
-        handshaker = handshake.Handshaker(request, _dispatcher,
-                                          allowDraft75=allowDraft75)
-        handshaker.do_handshake()
+        handshake.do_handshake(
+            request, _dispatcher, allowDraft75=allowDraft75)
+        handshake_is_done = True
         request.log_error(
             'mod_pywebsocket: resource: %r' % request.ws_resource,
             apache.APLOG_DEBUG)
-        try:
-            _dispatcher.transfer_data(request)
-        except Exception, e:
-            # Catch exception in transfer_data.
-            # In this case, handshake has been successful, so just log the
-            # exception and return apache.DONE
-            request.log_error('mod_pywebsocket: %s' % e, apache.APLOG_WARNING)
-    except handshake.HandshakeError, e:
-        # Handshake for ws/wss failed.
-        # But the request can be valid http/https request.
-        request.log_error('mod_pywebsocket: %s' % e, apache.APLOG_INFO)
-        return apache.DECLINED
-    except dispatch.DispatchError, e:
+        request._dispatcher = _dispatcher
+        _dispatcher.transfer_data(request)
+    except dispatch.DispatchException, e:
         request.log_error('mod_pywebsocket: %s' % e, apache.APLOG_WARNING)
-        return apache.DECLINED
+        if not handshake_is_done:
+            return e.status
+    except handshake.AbortedByUserException, e:
+        request.log_error('mod_pywebsocket: %s' % e, apache.APLOG_INFO)
+    except handshake.HandshakeException, e:
+        # Handshake for ws/wss failed.
+        # The request handling fallback into http/https.
+        request.log_error('mod_pywebsocket: %s' % e, apache.APLOG_INFO)
+        return e.status
+    except Exception, e:
+        request.log_error('mod_pywebsocket: %s' % e, apache.APLOG_WARNING)
+        # Unknown exceptions before handshake mean Apache must handle its
+        # request with another handler.
+        if not handshake_is_done:
+            return apache.DECLINE
     # Set assbackwards to suppress response header generation by Apache.
     request.assbackwards = 1
     return apache.DONE  # Return DONE such that no other handlers are invoked.