From: Vadim Semenov <protoss.player@gmail.com>
Date: Mon, 1 Apr 2013 23:03:12 +0000 (+0400)
Subject: websocket_connect: don't hang on HTTP errors
X-Git-Tag: v3.0.1~2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a69a43b5ef5cb38745d1efe086624376bb70e028;p=thirdparty%2Ftornado.git

websocket_connect: don't hang on HTTP errors
---

diff --git a/tornado/websocket.py b/tornado/websocket.py
index aac477371..cd27d366a 100644
--- a/tornado/websocket.py
+++ b/tornado/websocket.py
@@ -746,6 +746,9 @@ class WebSocketClientConnection(simple_httpclient._HTTPConnection):
     def _on_close(self):
         self.on_message(None)
 
+    def _on_body(self, body):
+        self.connect_future.set_exception(Exception('Could not connect.'))
+
     def _handle_1xx(self, code):
         assert code == 101
         assert self.headers['Upgrade'].lower() == 'websocket'