From 57da37e9958278a733c5fc2d11135413a3604a8c Mon Sep 17 00:00:00 2001
From: Roy Hyunjin Han <rhh@crosscompute.com>
Date: Mon, 23 Feb 2015 11:48:19 -0500
Subject: [PATCH 01/26] Update README

---
 README.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index 7edc2c3..3cad020 100644
--- a/README.rst
+++ b/README.rst
@@ -33,7 +33,8 @@ Activate isolated environment. ::
 Launch your socket.io server. ::
 
     # Get package folder
-    PACKAGE_FOLDER=`python -c "import os, socketIO_client; print(os.path.dirname(socketIO_client.__file__))"`
+    PACKAGE_FOLDER=`python -c "import os, socketIO_client;\
+        print(os.path.dirname(socketIO_client.__file__))"`
     # Start socket.io server
     DEBUG=* node $PACKAGE_FOLDER/tests/serve.js
     # Start proxy server in a separate terminal on the same machine
@@ -156,7 +157,7 @@ This software is available under the MIT License.
 
 Credits
 -------
-- `Guillermo Rauch <https://github.com/rauchg>`_ wrote the `socket.io specification <https://github.com/LearnBoost/socket.io-spec>`_.
+- `Guillermo Rauch <https://github.com/rauchg>`_ wrote the `socket.io specification <https://github.com/automattic/socket.io-protocol>`_.
 - `Hiroki Ohtani <https://github.com/liris>`_ wrote `websocket-client <https://github.com/liris/websocket-client>`_.
 - `rod <http://stackoverflow.com/users/370115/rod>`_ wrote a `prototype for a Python client to a socket.io server <http://stackoverflow.com/questions/6692908/formatting-messages-to-send-to-socket-io-node-js-server-from-python-client>`_.
 - `Alexandre Bourget <https://github.com/abourget>`_ wrote `gevent-socketio <https://github.com/abourget/gevent-socketio>`_, which is a socket.io server written in Python.

From 601ba59971fd98647dc7d44cb5f52ab03e08c3a1 Mon Sep 17 00:00:00 2001
From: Roy Hyunjin Han <rhh@crosscompute.com>
Date: Mon, 2 Mar 2015 08:59:47 -0500
Subject: [PATCH 02/26] Add bountysource link

---
 README.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.rst b/README.rst
index 3cad020..ee301dd 100644
--- a/README.rst
+++ b/README.rst
@@ -1,6 +1,9 @@
 .. image:: https://travis-ci.org/invisibleroads/socketIO-client.svg?branch=master
     :target: https://travis-ci.org/invisibleroads/socketIO-client
 
+.. image:: https://www.bountysource.com/badge/tracker?tracker_id=388415
+    :target: https://www.bountysource.com/trackers/388415-invisibleroads-socketio-client?utm_source=388415&utm_medium=shield&utm_campaign=TRACKER_BADGE
+
 
 socketIO-client
 ===============

From 978a669d162b627005cc285d91656a872913dd09 Mon Sep 17 00:00:00 2001
From: Roy Hyunjin Han <rhh@crosscompute.com>
Date: Wed, 15 Apr 2015 07:17:23 -0400
Subject: [PATCH 03/26] Add websocket transport

---
 .travis.yml                       |   3 +-
 README.rst                        |   6 +-
 TODO.goals                        |   8 +-
 socketIO_client/__init__.py       |  47 +++++++----
 socketIO_client/heartbeats.py     |   8 +-
 socketIO_client/parsers.py        |  30 ++++---
 socketIO_client/symmetries.py     |  14 ++--
 socketIO_client/tests/__init__.py |  15 +++-
 socketIO_client/tests/index.html  |   2 +-
 socketIO_client/tests/serve.js    |  14 +++-
 socketIO_client/tests/ssl.crt     |  21 +++++
 socketIO_client/tests/ssl.key     |  28 +++++++
 socketIO_client/transports.py     | 132 ++++++++++++++++++++++++------
 13 files changed, 250 insertions(+), 78 deletions(-)
 create mode 100644 socketIO_client/tests/ssl.crt
 create mode 100644 socketIO_client/tests/ssl.key

diff --git a/.travis.yml b/.travis.yml
index b0bc004..1db3eb1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,13 +8,12 @@ before_install:
   - sudo apt-get install nodejs
 install:
   - npm install -G socket.io
-  - npm install -G http-proxy
+  - npm install -G yargs
   - pip install -U requests
   - pip install -U six
   - pip install -U websocket-client
   - pip install -U coverage
 before_script:
   - DEBUG=* node socketIO_client/tests/serve.js &
-  - DEBUG=* node socketIO_client/tests/proxy.js &
   - sleep 3
 script: nosetests
diff --git a/README.rst b/README.rst
index ee301dd..9a20e0b 100644
--- a/README.rst
+++ b/README.rst
@@ -1,9 +1,6 @@
 .. image:: https://travis-ci.org/invisibleroads/socketIO-client.svg?branch=master
     :target: https://travis-ci.org/invisibleroads/socketIO-client
 
-.. image:: https://www.bountysource.com/badge/tracker?tracker_id=388415
-    :target: https://www.bountysource.com/trackers/388415-invisibleroads-socketio-client?utm_source=388415&utm_medium=shield&utm_campaign=TRACKER_BADGE
-
 
 socketIO-client
 ===============
@@ -139,7 +136,8 @@ Specify params, headers, cookies, proxies thanks to the `requests <http://python
     from socketIO_client import SocketIO
     from base64 import b64encode
 
-    SocketIO('localhost', 8000,
+    SocketIO(
+        localhost', 8000,
         params={'q': 'qqq'},
         headers={'Authorization': 'Basic ' + b64encode('username:password')},
         cookies={'a': 'aaa'},
diff --git a/TODO.goals b/TODO.goals
index 9fced70..291ad75 100644
--- a/TODO.goals
+++ b/TODO.goals
@@ -1,9 +1,5 @@
-Add Websocket transport
-    Update proxy to include websocket depending on argument
-    Use prepared request to get headers from http_session
-    Include https://github.com/invisibleroads/socketIO-client/issues/68
-Add test for on_reconnect using sarietta's bash scripts
-Consider logging packets sent and received
+Fix https tests for xhr-polling
+Fix https tests for websocket
 Implement rooms #65
 Implement binary event
 Implement binary ack
diff --git a/socketIO_client/__init__.py b/socketIO_client/__init__.py
index 7518384..01f4931 100644
--- a/socketIO_client/__init__.py
+++ b/socketIO_client/__init__.py
@@ -9,7 +9,8 @@ from .parsers import (
     format_socketIO_packet_data, parse_socketIO_packet_data,
     get_namespace_path)
 from .symmetries import get_character
-from .transports import XHR_PollingTransport, prepare_http_session, TRANSPORTS
+from .transports import (
+    WebsocketTransport, XHR_PollingTransport, prepare_http_session, TRANSPORTS)
 
 
 __all__ = 'SocketIO', 'SocketIONamespace'
@@ -54,7 +55,7 @@ class EngineIO(LoggingMixin):
         if self._opened:
             return self._transport_instance
         self._engineIO_session = self._get_engineIO_session()
-        self._transport_instance = self._negotiate_transport()
+        self._negotiate_transport()
         self._connect_namespaces()
         self._opened = True
         self._reset_heartbeat()
@@ -79,8 +80,22 @@ class EngineIO(LoggingMixin):
         return parse_engineIO_session(engineIO_packet_data)
 
     def _negotiate_transport(self):
-        self._transport_name = 'xhr-polling'
-        return self._get_transport(self._transport_name)
+        self._transport_instance = self._get_transport('xhr-polling')
+        self.transport_name = 'xhr-polling'
+        is_ws_client = 'websocket' in self._client_transports
+        is_ws_server = 'websocket' in self._engineIO_session.transport_upgrades
+        if is_ws_client and is_ws_server:
+            try:
+                transport = self._get_transport('websocket')
+                transport.send_packet(2, 'probe')
+                for packet_type, packet_data in transport.recv_packet():
+                    if packet_type == 3 and packet_data == b'probe':
+                        transport.send_packet(5, '')
+                        self._transport_instance = transport
+                        self.transport_name = 'websocket'
+            except Exception:
+                pass
+        self._debug('[transport selected] %s', self.transport_name)
 
     def _reset_heartbeat(self):
         try:
@@ -88,10 +103,7 @@ class EngineIO(LoggingMixin):
         except AttributeError:
             pass
         ping_interval = self._engineIO_session.ping_interval
-        if self._transport_name.endswith('-polling'):
-            hurry_interval_in_seconds = self._hurry_interval_in_seconds
-        else:
-            hurry_interval_in_seconds = ping_interval
+        hurry_interval_in_seconds = self._hurry_interval_in_seconds
         self._heartbeat_thread = HeartbeatThread(
             send_heartbeat=self._ping,
             relax_interval_in_seconds=ping_interval,
@@ -102,9 +114,9 @@ class EngineIO(LoggingMixin):
         pass
 
     def _get_transport(self, transport_name):
-        self._debug('[transport selected] %s', transport_name)
         SelectedTransport = {
             'xhr-polling': XHR_PollingTransport,
+            'websocket': WebsocketTransport,
         }[transport_name]
         return SelectedTransport(
             self._http_session, self._is_secure, self._url,
@@ -146,7 +158,7 @@ class EngineIO(LoggingMixin):
     @retry
     def _open(self):
         engineIO_packet_type = 0
-        self._transport.send_packet(engineIO_packet_type, '')
+        self._transport_instance.send_packet(engineIO_packet_type)
 
     def _close(self):
         self._wants_to_close = True
@@ -154,34 +166,37 @@ class EngineIO(LoggingMixin):
         if not self._opened:
             return
         engineIO_packet_type = 1
-        self._transport.send_packet(engineIO_packet_type, '')
+        self._transport_instance.send_packet(engineIO_packet_type)
         self._opened = False
 
     @retry
     def _ping(self, engineIO_packet_data=''):
         engineIO_packet_type = 2
-        self._transport.send_packet(engineIO_packet_type, engineIO_packet_data)
+        self._transport_instance.send_packet(
+            engineIO_packet_type, engineIO_packet_data)
 
     @retry
     def _pong(self, engineIO_packet_data=''):
         engineIO_packet_type = 3
-        self._transport.send_packet(engineIO_packet_type, engineIO_packet_data)
+        self._transport_instance.send_packet(
+            engineIO_packet_type, engineIO_packet_data)
 
     @retry
     def _message(self, engineIO_packet_data):
         engineIO_packet_type = 4
-        self._transport.send_packet(engineIO_packet_type, engineIO_packet_data)
+        self._transport_instance.send_packet(
+            engineIO_packet_type, engineIO_packet_data)
         self._debug('[socket.io packet sent] %s', engineIO_packet_data)
 
     @retry
     def _upgrade(self):
         engineIO_packet_type = 5
-        self._transport.send_packet(engineIO_packet_type, '')
+        self._transport_instance.send_packet(engineIO_packet_type)
 
     @retry
     def _noop(self):
         engineIO_packet_type = 6
-        self._transport.send_packet(engineIO_packet_type, '')
+        self._transport_instance.send_packet(engineIO_packet_type)
 
     # React
 
diff --git a/socketIO_client/heartbeats.py b/socketIO_client/heartbeats.py
index db2599d..6823990 100644
--- a/socketIO_client/heartbeats.py
+++ b/socketIO_client/heartbeats.py
@@ -22,15 +22,15 @@ class HeartbeatThread(Thread):
     def run(self):
         try:
             while not self._halt.is_set():
-                try:
-                    self._send_heartbeat()
-                except TimeoutError:
-                    pass
                 if self._adrenaline.is_set():
                     interval_in_seconds = self._hurry_interval_in_seconds
                 else:
                     interval_in_seconds = self._relax_interval_in_seconds
                 self._rest.wait(interval_in_seconds)
+                try:
+                    self._send_heartbeat()
+                except TimeoutError:
+                    pass
         except ConnectionError:
             pass
 
diff --git a/socketIO_client/parsers.py b/socketIO_client/parsers.py
index c962d77..8da8ee8 100644
--- a/socketIO_client/parsers.py
+++ b/socketIO_client/parsers.py
@@ -32,8 +32,8 @@ def parse_engineIO_session(engineIO_packet_data):
 def encode_engineIO_content(engineIO_packets):
     content = bytearray()
     for packet_type, packet_data in engineIO_packets:
-        packet_string = encode_string(str(packet_type) + packet_data)
-        content.extend(_make_packet_header(packet_string) + packet_string)
+        packet_text = format_packet_text(packet_type, packet_data)
+        content.extend(_make_packet_prefix(packet_text) + packet_text)
     return content
 
 
@@ -46,10 +46,10 @@ def decode_engineIO_content(content):
                 content, content_index)
         except IndexError:
             break
-        content_index, packet_string = _read_packet_string(
+        content_index, packet_text = _read_packet_text(
             content, content_index, packet_length)
-        engineIO_packet_type = int(get_character(packet_string, 0))
-        engineIO_packet_data = packet_string[1:]
+        engineIO_packet_type, engineIO_packet_data = parse_packet_text(
+            packet_text)
         yield engineIO_packet_type, engineIO_packet_data
 
 
@@ -85,6 +85,16 @@ def parse_socketIO_packet_data(socketIO_packet_data):
     return SocketIOData(path=path, ack_id=ack_id, args=args)
 
 
+def format_packet_text(packet_type, packet_data):
+    return encode_string(str(packet_type) + packet_data)
+
+
+def parse_packet_text(packet_text):
+    packet_type = int(get_character(packet_text, 0))
+    packet_data = packet_text[1:]
+    return packet_type, packet_data
+
+
 def get_namespace_path(socketIO_packet_data):
     if not socketIO_packet_data.startswith(b'/'):
         return ''
@@ -98,8 +108,8 @@ def get_namespace_path(socketIO_packet_data):
     return ''.join(parts)
 
 
-def _make_packet_header(packet_string):
-    length_string = str(len(packet_string))
+def _make_packet_prefix(packet):
+    length_string = str(len(packet))
     header_digits = bytearray([0])
     for i in range(len(length_string)):
         header_digits.append(ord(length_string[i]) - 48)
@@ -120,8 +130,8 @@ def _read_packet_length(content, content_index):
     return content_index, int(packet_length_string)
 
 
-def _read_packet_string(content, content_index, packet_length):
+def _read_packet_text(content, content_index, packet_length):
     while get_byte(content, content_index) == 255:
         content_index += 1
-    packet_string = content[content_index:content_index + packet_length]
-    return content_index + packet_length, packet_string
+    packet_text = content[content_index:content_index + packet_length]
+    return content_index + packet_length, packet_text
diff --git a/socketIO_client/symmetries.py b/socketIO_client/symmetries.py
index b061a20..de9dbfe 100644
--- a/socketIO_client/symmetries.py
+++ b/socketIO_client/symmetries.py
@@ -1,18 +1,22 @@
 import six
 try:
-    from urllib.parse import urlparse as parse_url
+    from urllib import urlencode as format_query
 except ImportError:
+    from urllib.parse import urlencode as format_query
+try:
     from urlparse import urlparse as parse_url
+except ImportError:
+    from urllib.parse import urlparse as parse_url
+
+
+def get_character(x, index):
+    return chr(get_byte(x, index))
 
 
 def get_byte(x, index):
     return six.indexbytes(x, index)
 
 
-def get_character(x, index):
-    return chr(six.indexbytes(x, index))
-
-
 def encode_string(x):
     return x.encode('utf-8')
 
diff --git a/socketIO_client/tests/__init__.py b/socketIO_client/tests/__init__.py
index 2ce4856..067617c 100644
--- a/socketIO_client/tests/__init__.py
+++ b/socketIO_client/tests/__init__.py
@@ -6,7 +6,7 @@ from .. import SocketIO, LoggingNamespace, find_callback
 
 
 HOST = 'localhost'
-PORT = 8000
+PORT = 9000
 DATA = 'xxx'
 PAYLOAD = {'xxx': 'yyy'}
 logging.basicConfig(level=logging.DEBUG)
@@ -159,10 +159,21 @@ class Test_XHR_PollingTransport(BaseMixin, TestCase):
     def setUp(self):
         super(Test_XHR_PollingTransport, self).setUp()
         self.socketIO = SocketIO(HOST, PORT, LoggingNamespace, transports=[
-            'xhr-polling'])
+            'xhr-polling'], verify=False)
+        self.assertEqual(self.socketIO.transport_name, 'xhr-polling')
         self.wait_time_in_seconds = 1
 
 
+class Test_WebsocketTransport(BaseMixin, TestCase):
+
+    def setUp(self):
+        super(Test_WebsocketTransport, self).setUp()
+        self.socketIO = SocketIO(HOST, PORT, LoggingNamespace, transports=[
+            'xhr-polling', 'websocket'], verify=False)
+        self.assertEqual(self.socketIO.transport_name, 'websocket')
+        self.wait_time_in_seconds = 0.1
+
+
 class Namespace(LoggingNamespace):
 
     def initialize(self):
diff --git a/socketIO_client/tests/index.html b/socketIO_client/tests/index.html
index df37df0..f3c03f5 100644
--- a/socketIO_client/tests/index.html
+++ b/socketIO_client/tests/index.html
@@ -1,6 +1,6 @@
 <script src="/socket.io/socket.io.js"></script>
 <script>
-var socket = io('http://localhost');
+var socket = io('//localhost');
 var chat = io('/chat');
 var news = io('/news');
 
diff --git a/socketIO_client/tests/serve.js b/socketIO_client/tests/serve.js
index 40af3e1..eb8a91d 100644
--- a/socketIO_client/tests/serve.js
+++ b/socketIO_client/tests/serve.js
@@ -1,8 +1,18 @@
 // DEBUG=* node serve.js
 
-var app = require('http').createServer(serve).listen(9000);
+var argv = require('yargs').argv;
+if (argv.secure) {
+  var fs = require('fs');
+  var app = require('https').createServer({
+    key: fs.readFileSync('ssl.key'),
+    cert: fs.readFileSync('ssl.crt')
+  }, serve);
+} else {
+  var app = require('http').createServer(serve);
+}
+app.listen(9000);
+
 var io = require('socket.io')(app);
-var fs = require('fs');
 var PAYLOAD = {'xxx': 'yyy'};
 
 io.on('connection', function(socket) {
diff --git a/socketIO_client/tests/ssl.crt b/socketIO_client/tests/ssl.crt
new file mode 100644
index 0000000..d14941a
--- /dev/null
+++ b/socketIO_client/tests/ssl.crt
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDbTCCAlWgAwIBAgIJALVDKggptosBMA0GCSqGSIb3DQEBBQUAME0xCzAJBgNV
+BAYTAlVTMREwDwYDVQQIDAhOZXcgWW9yazERMA8GA1UEBwwITmV3IFlvcmsxGDAW
+BgNVBAoMD0V4YW1wbGUgQ29tcGFueTAeFw0xNTA0MTQyMzE5MDlaFw0xNjA0MTMy
+MzE5MDlaME0xCzAJBgNVBAYTAlVTMREwDwYDVQQIDAhOZXcgWW9yazERMA8GA1UE
+BwwITmV3IFlvcmsxGDAWBgNVBAoMD0V4YW1wbGUgQ29tcGFueTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALUOviKWvseO7gbqOXOBp+v6lUmReL2xFTiK
+vrbdi9BMUMbl1CE+yiP7JTmSHCFty72xv/iwRgPG3rfUgEOZfuedhYXwl8hsnBzI
+ZK3quQiBMxPzpGOO6w5I2moMI+u45gOFpmf8CySjlcnTsKaaMAAr+8IiP+NpiW3U
+zKYLPtTkGdwBnilFEdLPlL3N5+yZ1zLA9WVMoEVLkg2Jbo5NEDK3JaGh34zxBOxh
+WbhvarAgb8PYBcXJaf9Ctp6M077cr8qIVq/dtBjUQcBNspeDJksuhpMzIRQy0FFX
+Qsso132LUsGBZqF4hVuLiSl5m0kjxxY3SOrNcvcEyLhxHJG+jLMCAwEAAaNQME4w
+HQYDVR0OBBYEFAEu7HcWyPZYVWHp5NhUlmHTirV8MB8GA1UdIwQYMBaAFAEu7HcW
+yPZYVWHp5NhUlmHTirV8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
+AJIUPUwx4sYn1aDTukMzcaGu1uElSdeayCe5mOmKd7XBald0PuUFqboWsTKmqELH
+usFDAJNmWS/zCuEuW0huqb1c3orw9IfVFx+oPXAEGFvRmBhKd9UmFpqLmhhRcP25
+RT2By00vN1A1f/XW0H2Rj5pgIBdbKGwzabQVy8RTMmmtiNlQqHwElUzggq+EbS2m
+XwNJ3bMumwrjciZTbMo0MMTStqF5oqacCfvt2vTT1c2IdpiCafPMYqrldXOJddx5
+uJ/Tu75ZHf+pjfg7SRGq5WmoKP36VCKbQJSP6kXcbTMP4KvlWlbmQgDsWvmnA0Nm
+283Ms7he6efOphFh2XHxysU=
+-----END CERTIFICATE-----
diff --git a/socketIO_client/tests/ssl.key b/socketIO_client/tests/ssl.key
new file mode 100644
index 0000000..f37ea41
--- /dev/null
+++ b/socketIO_client/tests/ssl.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC1Dr4ilr7Hju4G
+6jlzgafr+pVJkXi9sRU4ir623YvQTFDG5dQhPsoj+yU5khwhbcu9sb/4sEYDxt63
+1IBDmX7nnYWF8JfIbJwcyGSt6rkIgTMT86RjjusOSNpqDCPruOYDhaZn/Asko5XJ
+07CmmjAAK/vCIj/jaYlt1MymCz7U5BncAZ4pRRHSz5S9zefsmdcywPVlTKBFS5IN
+iW6OTRAytyWhod+M8QTsYVm4b2qwIG/D2AXFyWn/QraejNO+3K/KiFav3bQY1EHA
+TbKXgyZLLoaTMyEUMtBRV0LLKNd9i1LBgWaheIVbi4kpeZtJI8cWN0jqzXL3BMi4
+cRyRvoyzAgMBAAECggEAWZMEoAoiMopU2ljwuWNw1z9usinlKTu9uu5xcfjjXdcT
+s4Mq0pPE3841WWkev68ZOC0DQ5651M6Di0D3f/olnaMB1wTzorWQ+nBt1tkkV7/L
+rFhCgPrI8ZU7cXG2J72fFij97b31KVhBF8vCPnpTuxIHiMD3CKRC2HKKGK/BkwK9
+cxlPjUlh2LawIULQM0jl/oLGC6jwTupNrbZogVLBf6Koi3S5o0e9F9KaBl127Mh9
+COZIFDnD0exGHCvH49YI/cuwHYeyDlU6Xi7Wv2f3cdmC/enUG5n8Ts/OpDTPiSgf
+cZOrVQ8nCm/4jc/qhTubBZwPGqkMpFbE+DRSGDsgKQKBgQDbndwec9lrnyHUgJ/r
+hBoMFwFMc6rZvAug4CF1ry7nZqLOI+Xg6rHjseu1Vc8aQMJCuK1YAr6ImYbN1Jwq
+5cta4cPlPKis4xBbwhcELfVJB550LIwv3hgN/94Sh8aojPueIJcoUsOrG87wJ2KS
+RCPK+Pz7W5b+cBc/Ii9ROGPAdwKBgQDTDY8E0P4Yp/okc2IyNU+gurSP61DITEpq
+N51QNQ1BmCID/G7yyErsRJeQHhCKVvGEijh/DB4nQKO9lJcVSh4v511NojwpQ35V
+FtSePXmhBY8J7vq/DAkvISi8g1/A6A10XEsPcO4ga7EL5CtzYWC4Vh14a0tWNGxW
+vUJWNoiApQKBgQCMxSsK+gcrTN1KcQgQ1qQ7i6NxddLVrgtmG0RXQus1uDwzFh+L
+g+RypuEHYvFVSp06V1YFS/0FYiNeXCGd/Z3Tq1L95VvZNdKOfmJyc2L+ZLvUi5lw
+NVQF5TRbfFyCPZwrR4iceDCjxTdoCFbOmo6209KU66hlf0PnW+oojZSjEQKBgDTY
+nkkcc6OE3BOoeJwN0URzu6aVy4J759400sU0o38bMtlAqh9Mm8YRXsoNXSLmpk8D
+tSXKyPoXK2ja/gGsr2ZbTneT+fBzH/z6XH7K8dup4qkgF9UilGIisWqSkrVg5Y2P
+VpQlONsRXCGYHnEjnu5JUdPHOfP56G7HsQaZXRCpAoGBAI2E2ui3nyzUWmnpT4gI
+vTZE4DqtLSWRL85xSJJdw7phI/dgAtVe5I7vnv8kapD+m4xMoa0J1O5jBwNdC4/C
+6rCmFC+wh3qu1f3DRwaUsM/hdkQyA7DQcYzayhiicPQCi0xuJuA8FuYHBkQCmOfN
+77zJjF6uScFwr+2Ozpb0H30V
+-----END PRIVATE KEY-----
diff --git a/socketIO_client/transports.py b/socketIO_client/transports.py
index dc187cc..71f40df 100644
--- a/socketIO_client/transports.py
+++ b/socketIO_client/transports.py
@@ -1,12 +1,30 @@
 import requests
+import six
+import socket
+import ssl
+import sys
 import time
+import websocket
 
 from .exceptions import ConnectionError, TimeoutError
-from .parsers import decode_engineIO_content, encode_engineIO_content
+from .parsers import (
+    encode_engineIO_content, decode_engineIO_content,
+    format_packet_text, parse_packet_text)
+from .symmetries import format_query, parse_url
+
+
+if not hasattr(websocket, 'create_connection'):
+    sys.exit("""\
+An incompatible websocket library is conflicting with the one we need.
+You can remove the incompatible library and install the correct one
+by running the following commands:
+
+yes | pip uninstall websocket websocket-client
+pip install -U websocket-client""")
 
 
 ENGINEIO_PROTOCOL = 3
-TRANSPORTS = 'websocket', 'xhr-polling'
+TRANSPORTS = 'xhr-polling', 'websocket'
 
 
 class AbstractTransport(object):
@@ -20,7 +38,7 @@ class AbstractTransport(object):
     def recv_packet(self):
         pass
 
-    def send_packet(self, engineIO_packet_type, engineIO_packet_data):
+    def send_packet(self, engineIO_packet_type, engineIO_packet_data=''):
         pass
 
 
@@ -29,53 +47,115 @@ class XHR_PollingTransport(AbstractTransport):
     def __init__(self, http_session, is_secure, url, engineIO_session=None):
         super(XHR_PollingTransport, self).__init__(
             http_session, is_secure, url, engineIO_session)
-        self.http_url = '%s://%s/' % ('https' if is_secure else 'http', url)
-        self.params = {
-            'EIO': ENGINEIO_PROTOCOL,
-            'transport': 'polling',
-        }
+        self._params = {
+            'EIO': ENGINEIO_PROTOCOL, 'transport': 'polling'}
         if engineIO_session:
-            self.request_index = 1
-            self.kw_get = dict(timeout=engineIO_session.ping_timeout)
-            self.kw_post = dict(headers={
+            self._request_index = 1
+            self._kw_get = dict(timeout=engineIO_session.ping_timeout)
+            self._kw_post = dict(headers={
                 'content-type': 'application/octet-stream',
             })
-            self.params['sid'] = engineIO_session.id
+            self._params['sid'] = engineIO_session.id
         else:
-            self.request_index = 0
-            self.kw_get = {}
-            self.kw_post = {}
+            self._request_index = 0
+            self._kw_get = {}
+            self._kw_post = {}
+        http_scheme = 'https' if is_secure else 'http'
+        self._http_url = '%s://%s/' % (http_scheme, url)
 
     def recv_packet(self):
-        params = dict(self.params)
+        params = dict(self._params)
         params['t'] = self._get_timestamp()
         response = get_response(
             self.http_session.get,
-            self.http_url,
+            self._http_url,
             params=params,
-            **self.kw_get)
+            **self._kw_get)
         for engineIO_packet in decode_engineIO_content(response.content):
-            yield engineIO_packet
+            engineIO_packet_type, engineIO_packet_data = engineIO_packet
+            yield engineIO_packet_type, engineIO_packet_data
 
-    def send_packet(self, engineIO_packet_type, engineIO_packet_data):
-        params = dict(self.params)
+    def send_packet(self, engineIO_packet_type, engineIO_packet_data=''):
+        params = dict(self._params)
         params['t'] = self._get_timestamp()
         response = get_response(
             self.http_session.post,
-            self.http_url,
+            self._http_url,
             params=params,
             data=encode_engineIO_content([
                 (engineIO_packet_type, engineIO_packet_data),
             ]),
-            **self.kw_post)
+            **self._kw_post)
         assert response.content == b'ok'
 
     def _get_timestamp(self):
-        timestamp = '%s-%s' % (int(time.time() * 1000), self.request_index)
-        self.request_index += 1
+        timestamp = '%s-%s' % (int(time.time() * 1000), self._request_index)
+        self._request_index += 1
         return timestamp
 
 
+class WebsocketTransport(AbstractTransport):
+
+    def __init__(self, http_session, is_secure, url, engineIO_session=None):
+        super(WebsocketTransport, self).__init__(
+            http_session, is_secure, url, engineIO_session)
+        params = dict(http_session.params, **{
+            'EIO': ENGINEIO_PROTOCOL, 'transport': 'websocket'})
+        request = http_session.prepare_request(requests.Request('GET', url))
+        kw = {'header': ['%s: %s' % x for x in request.headers.items()]}
+        if engineIO_session:
+            params['sid'] = engineIO_session.id
+            kw['timeout'] = engineIO_session.ping_timeout
+        ws_url = '%s://%s/?%s' % (
+            'wss' if is_secure else 'ws', url, format_query(params))
+        http_scheme = 'https' if is_secure else 'http'
+        if http_scheme in http_session.proxies:  # Use the correct proxy
+            proxy_url_pack = parse_url(http_session.proxies[http_scheme])
+            kw['http_proxy_host'] = proxy_url_pack.hostname
+            kw['http_proxy_port'] = proxy_url_pack.port
+            if proxy_url_pack.username:
+                kw['http_proxy_auth'] = (
+                    proxy_url_pack.username, proxy_url_pack.password)
+        if http_session.verify:
+            if http_session.cert:  # Specify certificate path on disk
+                if isinstance(http_session.cert, basestring):
+                    kw['ca_certs'] = http_session.cert
+                else:
+                    kw['ca_certs'] = http_session.cert[0]
+        else:  # Do not verify the SSL certificate
+            kw['sslopt'] = {'cert_reqs': ssl.CERT_NONE}
+        try:
+            self._connection = websocket.create_connection(ws_url, **kw)
+        except Exception as e:
+            raise ConnectionError(e)
+
+    def recv_packet(self):
+        try:
+            packet_text = self._connection.recv()
+        except websocket.WebSocketTimeoutException as e:
+            raise TimeoutError('recv timed out (%s)' % e)
+        except websocket.SSLError as e:
+            raise ConnectionError('recv disconnected (%s)' % e)
+        except websocket.WebSocketConnectionClosedException as e:
+            raise ConnectionError('recv disconnected (%s)' % e)
+        except socket.error as e:
+            raise ConnectionError('recv disconnected (%s)' % e)
+        engineIO_packet_type, engineIO_packet_data = parse_packet_text(
+            six.b(packet_text))
+        yield engineIO_packet_type, engineIO_packet_data
+
+    def send_packet(self, engineIO_packet_type, engineIO_packet_data=''):
+        packet = format_packet_text(engineIO_packet_type, engineIO_packet_data)
+        try:
+            self._connection.send(packet)
+        except websocket.WebSocketTimeoutException as e:
+            raise TimeoutError('send timed out (%s)' % e)
+        except socket.error as e:
+            raise ConnectionError('send disconnected (%s)' % e)
+        except websocket.WebSocketConnectionClosedException as e:
+            raise ConnectionError('send disconnected (%s)' % e)
+
+
 def get_response(request, *args, **kw):
     try:
         response = request(*args, **kw)
@@ -98,7 +178,7 @@ def prepare_http_session(kw):
     http_session.proxies.update(kw.get('proxies', {}))
     http_session.hooks.update(kw.get('hooks', {}))
     http_session.params.update(kw.get('params', {}))
-    http_session.verify = kw.get('verify')
+    http_session.verify = kw.get('verify', True)
     http_session.cert = kw.get('cert')
     http_session.cookies.update(kw.get('cookies', {}))
     return http_session

From f5b157014d6511ff74a475a4fef342ff58d32b91 Mon Sep 17 00:00:00 2001
From: Roy Hyunjin Han <rhh@crosscompute.com>
Date: Wed, 15 Apr 2015 08:41:11 -0400
Subject: [PATCH 04/26] Use timeout to unblock recv in websocket transport

---
 socketIO_client/__init__.py       | 13 ++++++++++++-
 socketIO_client/logs.py           | 10 +++++++---
 socketIO_client/tests/__init__.py |  4 ++--
 socketIO_client/tests/serve.js    |  3 ---
 socketIO_client/transports.py     | 11 +++++++++--
 5 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/socketIO_client/__init__.py b/socketIO_client/__init__.py
index 01f4931..490816d 100644
--- a/socketIO_client/__init__.py
+++ b/socketIO_client/__init__.py
@@ -103,12 +103,18 @@ class EngineIO(LoggingMixin):
         except AttributeError:
             pass
         ping_interval = self._engineIO_session.ping_interval
-        hurry_interval_in_seconds = self._hurry_interval_in_seconds
+        if self.transport_name.endswith('-polling'):
+            # Use ping/pong to unblock recv for polling transport
+            hurry_interval_in_seconds = self._hurry_interval_in_seconds
+        else:
+            # Use timeout to unblock recv for websocket transport
+            hurry_interval_in_seconds = ping_interval
         self._heartbeat_thread = HeartbeatThread(
             send_heartbeat=self._ping,
             relax_interval_in_seconds=ping_interval,
             hurry_interval_in_seconds=hurry_interval_in_seconds)
         self._heartbeat_thread.start()
+        self._debug('[heartbeat reset]')
 
     def _connect_namespaces(self):
         pass
@@ -202,7 +208,11 @@ class EngineIO(LoggingMixin):
 
     def wait(self, seconds=None, **kw):
         'Wait in a loop and react to events as defined in the namespaces'
+        # Use ping/pong to unblock recv for polling transport
         self._heartbeat_thread.hurry()
+        # Use timeout to unblock recv for websocket transport
+        self._transport.set_timeout(seconds)
+        # Listen
         warning_screen = self._yield_warning_screen(seconds)
         for elapsed_time in warning_screen:
             if self._should_stop_waiting(**kw):
@@ -224,6 +234,7 @@ class EngineIO(LoggingMixin):
                 except PacketError:
                     pass
         self._heartbeat_thread.relax()
+        self._transport.set_timeout()
 
     def _should_stop_waiting(self):
         return self._wants_to_close
diff --git a/socketIO_client/logs.py b/socketIO_client/logs.py
index ff37d19..32b5d54 100644
--- a/socketIO_client/logs.py
+++ b/socketIO_client/logs.py
@@ -33,6 +33,10 @@ def _yield_elapsed_time(seconds=None):
     start_time = time.time()
     if seconds is None:
         while True:
-            yield time.time() - start_time
-    while time.time() - start_time < seconds:
-        yield time.time() - start_time
+            yield _get_elapsed_time(start_time)
+    while _get_elapsed_time(start_time) < seconds:
+        yield _get_elapsed_time(start_time)
+
+
+def _get_elapsed_time(start_time):
+    return time.time() - start_time
diff --git a/socketIO_client/tests/__init__.py b/socketIO_client/tests/__init__.py
index 067617c..e7f75c1 100644
--- a/socketIO_client/tests/__init__.py
+++ b/socketIO_client/tests/__init__.py
@@ -116,7 +116,7 @@ class BaseMixin(object):
     def test_wait_with_disconnect(self):
         'Exit loop when the client wants to disconnect'
         self.socketIO.define(Namespace)
-        self.socketIO.emit('wait_with_disconnect')
+        self.socketIO.disconnect()
         timeout_in_seconds = 5
         start_time = time.time()
         self.socketIO.wait(timeout_in_seconds)
@@ -171,7 +171,7 @@ class Test_WebsocketTransport(BaseMixin, TestCase):
         self.socketIO = SocketIO(HOST, PORT, LoggingNamespace, transports=[
             'xhr-polling', 'websocket'], verify=False)
         self.assertEqual(self.socketIO.transport_name, 'websocket')
-        self.wait_time_in_seconds = 0.1
+        self.wait_time_in_seconds = 1
 
 
 class Namespace(LoggingNamespace):
diff --git a/socketIO_client/tests/serve.js b/socketIO_client/tests/serve.js
index eb8a91d..54985c4 100644
--- a/socketIO_client/tests/serve.js
+++ b/socketIO_client/tests/serve.js
@@ -64,9 +64,6 @@ io.on('connection', function(socket) {
   socket.on('bbb', function(payload, fn) {
     if (fn) fn(payload);
   });
-  socket.on('wait_with_disconnect', function() {
-    socket.emit('wait_with_disconnect_response');
-  });
 });
 
 io.of('/chat').on('connection', function(socket) {
diff --git a/socketIO_client/transports.py b/socketIO_client/transports.py
index 71f40df..4a08131 100644
--- a/socketIO_client/transports.py
+++ b/socketIO_client/transports.py
@@ -41,6 +41,9 @@ class AbstractTransport(object):
     def send_packet(self, engineIO_packet_type, engineIO_packet_data=''):
         pass
 
+    def set_timeout(self, seconds=None):
+        pass
+
 
 class XHR_PollingTransport(AbstractTransport):
 
@@ -105,7 +108,7 @@ class WebsocketTransport(AbstractTransport):
         kw = {'header': ['%s: %s' % x for x in request.headers.items()]}
         if engineIO_session:
             params['sid'] = engineIO_session.id
-            kw['timeout'] = engineIO_session.ping_timeout
+            kw['timeout'] = self._timeout = engineIO_session.ping_timeout
         ws_url = '%s://%s/?%s' % (
             'wss' if is_secure else 'ws', url, format_query(params))
         http_scheme = 'https' if is_secure else 'http'
@@ -155,6 +158,9 @@ class WebsocketTransport(AbstractTransport):
         except websocket.WebSocketConnectionClosedException as e:
             raise ConnectionError('send disconnected (%s)' % e)
 
+    def set_timeout(self, seconds=None):
+        self._connection.settimeout(seconds or self._timeout)
+
 
 def get_response(request, *args, **kw):
     try:
@@ -167,7 +173,8 @@ def get_response(request, *args, **kw):
         raise ConnectionError('could not negotiate SSL (%s)' % e)
     status_code = response.status_code
     if 200 != status_code:
-        raise ConnectionError('unexpected status code (%s)' % status_code)
+        raise ConnectionError('unexpected status code (%s %s)' % (
+            status_code, response.text))
     return response
 
 

From a6f92609647fab8566c324ff3d5e5f214fe8f7a6 Mon Sep 17 00:00:00 2001
From: Roy Hyunjin Han <rhh@crosscompute.com>
Date: Wed, 15 Apr 2015 14:38:25 -0400
Subject: [PATCH 05/26] Add locks to fix concurrency issues

---
 socketIO_client/__init__.py       | 126 +++++++++++++++++-------------
 socketIO_client/heartbeats.py     |  15 ++--
 socketIO_client/namespaces.py     |  34 ++++----
 socketIO_client/tests/__init__.py |   5 +-
 socketIO_client/transports.py     |  43 +++++-----
 5 files changed, 128 insertions(+), 95 deletions(-)

diff --git a/socketIO_client/__init__.py b/socketIO_client/__init__.py
index 490816d..b8186fd 100644
--- a/socketIO_client/__init__.py
+++ b/socketIO_client/__init__.py
@@ -40,10 +40,12 @@ class EngineIO(LoggingMixin):
         self._wait_for_connection = wait_for_connection
         self._client_transports = transports
         self._hurry_interval_in_seconds = hurry_interval_in_seconds
-        self._kw = kw
+        self._http_session = prepare_http_session(kw)
+
         self._log_name = self._url
         self._wants_to_close = False
         self._opened = False
+
         if Namespace:
             self.define(Namespace)
         self._transport
@@ -63,7 +65,6 @@ class EngineIO(LoggingMixin):
 
     def _get_engineIO_session(self):
         warning_screen = self._yield_warning_screen()
-        self._http_session = prepare_http_session(self._kw)
         for elapsed_time in warning_screen:
             transport = XHR_PollingTransport(
                 self._http_session, self._is_secure, self._url)
@@ -76,7 +77,7 @@ class EngineIO(LoggingMixin):
                     raise
                 warning = Exception('[waiting for connection] %s' % e)
                 warning_screen.throw(warning)
-        assert engineIO_packet_type == 0
+        assert engineIO_packet_type == 0  # engineIO_packet_type == open
         return parse_engineIO_session(engineIO_packet_data)
 
     def _negotiate_transport(self):
@@ -93,6 +94,8 @@ class EngineIO(LoggingMixin):
                         transport.send_packet(5, '')
                         self._transport_instance = transport
                         self.transport_name = 'websocket'
+                    else:
+                        self._warn('unexpected engine.io packet')
             except Exception:
                 pass
         self._debug('[transport selected] %s', self.transport_name)
@@ -100,8 +103,9 @@ class EngineIO(LoggingMixin):
     def _reset_heartbeat(self):
         try:
             self._heartbeat_thread.halt()
+            hurried = self._heartbeat_thread.hurried
         except AttributeError:
-            pass
+            hurried = False
         ping_interval = self._engineIO_session.ping_interval
         if self.transport_name.endswith('-polling'):
             # Use ping/pong to unblock recv for polling transport
@@ -114,6 +118,8 @@ class EngineIO(LoggingMixin):
             relax_interval_in_seconds=ping_interval,
             hurry_interval_in_seconds=hurry_interval_in_seconds)
         self._heartbeat_thread.start()
+        if hurried:
+            self._heartbeat_thread.hurry()
         self._debug('[heartbeat reset]')
 
     def _connect_namespaces(self):
@@ -161,7 +167,6 @@ class EngineIO(LoggingMixin):
     def send(self, engineIO_packet_data):
         self._message(engineIO_packet_data)
 
-    @retry
     def _open(self):
         engineIO_packet_type = 0
         self._transport_instance.send_packet(engineIO_packet_type)
@@ -172,34 +177,36 @@ class EngineIO(LoggingMixin):
         if not self._opened:
             return
         engineIO_packet_type = 1
-        self._transport_instance.send_packet(engineIO_packet_type)
+        try:
+            self._transport_instance.send_packet(engineIO_packet_type)
+        except (TimeoutError, ConnectionError):
+            pass
         self._opened = False
 
-    @retry
     def _ping(self, engineIO_packet_data=''):
         engineIO_packet_type = 2
         self._transport_instance.send_packet(
             engineIO_packet_type, engineIO_packet_data)
 
-    @retry
     def _pong(self, engineIO_packet_data=''):
         engineIO_packet_type = 3
         self._transport_instance.send_packet(
             engineIO_packet_type, engineIO_packet_data)
 
     @retry
-    def _message(self, engineIO_packet_data):
+    def _message(self, engineIO_packet_data, with_transport_instance=False):
         engineIO_packet_type = 4
-        self._transport_instance.send_packet(
-            engineIO_packet_type, engineIO_packet_data)
+        if with_transport_instance:
+            transport = self._transport_instance
+        else:
+            transport = self._transport
+        transport.send_packet(engineIO_packet_type, engineIO_packet_data)
         self._debug('[socket.io packet sent] %s', engineIO_packet_data)
 
-    @retry
     def _upgrade(self):
         engineIO_packet_type = 5
         self._transport_instance.send_packet(engineIO_packet_type)
 
-    @retry
     def _noop(self):
         engineIO_packet_type = 6
         self._transport_instance.send_packet(engineIO_packet_type)
@@ -223,6 +230,7 @@ class EngineIO(LoggingMixin):
                 except TimeoutError:
                     pass
             except ConnectionError as e:
+                self._opened = False
                 try:
                     warning = Exception('[connection error] %s' % e)
                     warning_screen.throw(warning)
@@ -263,31 +271,31 @@ class EngineIO(LoggingMixin):
         except KeyError:
             raise PacketError(
                 'unexpected engine.io packet type (%s)' % engineIO_packet_type)
-        delegate(engineIO_packet_data, namespace._find_packet_callback)
+        delegate(engineIO_packet_data, namespace)
         if engineIO_packet_type is 4:
             return engineIO_packet_data
 
-    def _on_open(self, data, find_packet_callback):
-        find_packet_callback('open')()
+    def _on_open(self, data, namespace):
+        namespace._find_packet_callback('open')()
 
-    def _on_close(self, data, find_packet_callback):
-        find_packet_callback('close')()
+    def _on_close(self, data, namespace):
+        namespace._find_packet_callback('close')()
 
-    def _on_ping(self, data, find_packet_callback):
+    def _on_ping(self, data, namespace):
         self._pong(data)
-        find_packet_callback('ping')(data)
+        namespace._find_packet_callback('ping')(data)
 
-    def _on_pong(self, data, find_packet_callback):
-        find_packet_callback('pong')(data)
+    def _on_pong(self, data, namespace):
+        namespace._find_packet_callback('pong')(data)
 
-    def _on_message(self, data, find_packet_callback):
-        find_packet_callback('message')(data)
+    def _on_message(self, data, namespace):
+        namespace._find_packet_callback('message')(data)
 
-    def _on_upgrade(self, data, find_packet_callback):
-        find_packet_callback('upgrade')()
+    def _on_upgrade(self, data, namespace):
+        namespace._find_packet_callback('upgrade')()
 
-    def _on_noop(self, data, find_packet_callback):
-        find_packet_callback('noop')()
+    def _on_noop(self, data, namespace):
+        namespace._find_packet_callback('noop')()
 
 
 class SocketIO(EngineIO):
@@ -329,7 +337,7 @@ class SocketIO(EngineIO):
         for path, namespace in self._namespace_by_path.items():
             namespace._transport = self._transport_instance
             if path:
-                self.connect(path)
+                self.connect(path, with_transport_instance=True)
 
     def __exit__(self, *exception_pack):
         self.disconnect()
@@ -342,9 +350,10 @@ class SocketIO(EngineIO):
     # Define
 
     def define(self, Namespace, path=''):
+        self._namespace_by_path[path] = namespace = Namespace(self, path)
         if path:
             self.connect(path)
-        self._namespace_by_path[path] = namespace = Namespace(self, path)
+            self.wait(for_connect=True)
         return namespace
 
     def on(self, event, callback, path=''):
@@ -362,20 +371,23 @@ class SocketIO(EngineIO):
 
     # Act
 
-    def connect(self, path):
+    def connect(self, path, with_transport_instance=False):
         socketIO_packet_type = 0
         socketIO_packet_data = format_socketIO_packet_data(path)
-        self._message(str(socketIO_packet_type) + socketIO_packet_data)
+        self._message(
+            str(socketIO_packet_type) + socketIO_packet_data,
+            with_transport_instance)
 
     def disconnect(self, path=''):
-        if not self._opened:
-            return
-        if path:
+        if not path or not self._opened:
+            self._close()
+        elif path:
             socketIO_packet_type = 1
             socketIO_packet_data = format_socketIO_packet_data(path)
-            self._message(str(socketIO_packet_type) + socketIO_packet_data)
-        else:
-            self._close()
+            try:
+                self._message(str(socketIO_packet_type) + socketIO_packet_data)
+            except (TimeoutError, ConnectionError):
+                pass
         try:
             namespace = self._namespace_by_path.pop(path)
             namespace.on_disconnect()
@@ -405,13 +417,17 @@ class SocketIO(EngineIO):
 
     # React
 
-    def wait(self, seconds=None, for_callbacks=False):
-        super(SocketIO, self).wait(seconds, for_callbacks=for_callbacks)
-
     def wait_for_callbacks(self, seconds=None):
         self.wait(seconds, for_callbacks=True)
 
-    def _should_stop_waiting(self, for_callbacks):
+    def _should_stop_waiting(self, for_connect=False, for_callbacks=False):
+        if for_connect:
+            for namespace in self._namespace_by_path.values():
+                is_namespace_connected = getattr(
+                    namespace, '_connected', False)
+                if not is_namespace_connected:
+                    return False
+            return True
         if for_callbacks and not self._has_ack_callback:
             return True
         return super(SocketIO, self)._should_stop_waiting()
@@ -439,16 +455,18 @@ class SocketIO(EngineIO):
         except KeyError:
             raise PacketError(
                 'unexpected socket.io packet type (%s)' % socketIO_packet_type)
-        delegate(socketIO_packet_data, namespace._find_packet_callback)
+        delegate(socketIO_packet_data, namespace)
         return socketIO_packet_data
 
-    def _on_connect(self, data, find_packet_callback):
-        find_packet_callback('connect')()
+    def _on_connect(self, data, namespace):
+        namespace._connected = True
+        namespace._find_packet_callback('connect')()
 
-    def _on_disconnect(self, data, find_packet_callback):
-        find_packet_callback('disconnect')()
+    def _on_disconnect(self, data, namespace):
+        namespace._connected = False
+        namespace._find_packet_callback('disconnect')()
 
-    def _on_event(self, data, find_packet_callback):
+    def _on_event(self, data, namespace):
         data_parsed = parse_socketIO_packet_data(data)
         args = data_parsed.args
         try:
@@ -458,9 +476,9 @@ class SocketIO(EngineIO):
         if data_parsed.ack_id is not None:
             args.append(self._prepare_to_send_ack(
                 data_parsed.path, data_parsed.ack_id))
-        find_packet_callback(event)(*args)
+        namespace._find_packet_callback(event)(*args)
 
-    def _on_ack(self, data, find_packet_callback):
+    def _on_ack(self, data, namespace):
         data_parsed = parse_socketIO_packet_data(data)
         try:
             ack_callback = self._get_ack_callback(data_parsed.ack_id)
@@ -468,13 +486,13 @@ class SocketIO(EngineIO):
             return
         ack_callback(*data_parsed.args)
 
-    def _on_error(self, data, find_packet_callback):
-        find_packet_callback('error')(data)
+    def _on_error(self, data, namespace):
+        namespace._find_packet_callback('error')(data)
 
-    def _on_binary_event(self, data, find_packet_callback):
+    def _on_binary_event(self, data, namespace):
         self._warn('[not implemented] binary event')
 
-    def _on_binary_ack(self, data, find_packet_callback):
+    def _on_binary_ack(self, data, namespace):
         self._warn('[not implemented] binary ack')
 
     def _prepare_to_send_ack(self, path, ack_id):
diff --git a/socketIO_client/heartbeats.py b/socketIO_client/heartbeats.py
index 6823990..f79c5ca 100644
--- a/socketIO_client/heartbeats.py
+++ b/socketIO_client/heartbeats.py
@@ -1,3 +1,4 @@
+import logging
 from threading import Thread, Event
 
 from .exceptions import ConnectionError, TimeoutError
@@ -22,17 +23,17 @@ class HeartbeatThread(Thread):
     def run(self):
         try:
             while not self._halt.is_set():
+                try:
+                    self._send_heartbeat()
+                except TimeoutError:
+                    pass
                 if self._adrenaline.is_set():
                     interval_in_seconds = self._hurry_interval_in_seconds
                 else:
                     interval_in_seconds = self._relax_interval_in_seconds
                 self._rest.wait(interval_in_seconds)
-                try:
-                    self._send_heartbeat()
-                except TimeoutError:
-                    pass
         except ConnectionError:
-            pass
+            logging.debug('[heartbeat connection error]')
 
     def relax(self):
         self._adrenaline.clear()
@@ -42,6 +43,10 @@ class HeartbeatThread(Thread):
         self._rest.set()
         self._rest.clear()
 
+    @property
+    def hurried(self):
+        return self._adrenaline.is_set()
+
     def halt(self):
         self._rest.set()
         self._halt.set()
diff --git a/socketIO_client/namespaces.py b/socketIO_client/namespaces.py
index 84cd65c..e78529a 100644
--- a/socketIO_client/namespaces.py
+++ b/socketIO_client/namespaces.py
@@ -141,31 +141,31 @@ class SocketIONamespace(EngineIONamespace):
 class LoggingEngineIONamespace(EngineIONamespace):
 
     def on_open(self):
-        self._debug('[open]')
+        self._debug('[engine.io open]')
         super(LoggingEngineIONamespace, self).on_open()
 
     def on_close(self):
-        self._debug('[close]')
+        self._debug('[engine.io close]')
         super(LoggingEngineIONamespace, self).on_close()
 
     def on_ping(self, data):
-        self._debug('[ping] %s', data)
+        self._debug('[engine.io ping] %s', data)
         super(LoggingEngineIONamespace, self).on_ping(data)
 
     def on_pong(self, data):
-        self._debug('[pong] %s', data)
+        self._debug('[engine.io pong] %s', data)
         super(LoggingEngineIONamespace, self).on_pong(data)
 
     def on_message(self, data):
-        self._debug('[message] %s', data)
+        self._debug('[engine.io message] %s', data)
         super(LoggingEngineIONamespace, self).on_message(data)
 
     def on_upgrade(self):
-        self._debug('[upgrade]')
+        self._debug('[engine.io upgrade]')
         super(LoggingEngineIONamespace, self).on_upgrade()
 
     def on_noop(self):
-        self._debug('[noop]')
+        self._debug('[engine.io noop]')
         super(LoggingEngineIONamespace, self).on_noop()
 
     def on_event(self, event, *args):
@@ -173,22 +173,25 @@ class LoggingEngineIONamespace(EngineIONamespace):
         arguments = [repr(_) for _ in args]
         if callback:
             arguments.append('callback(*args)')
-        self._info('[event] %s(%s)', event, ', '.join(arguments))
+        self._info('[engine.io event] %s(%s)', event, ', '.join(arguments))
         super(LoggingEngineIONamespace, self).on_event(event, *args)
 
 
-class LoggingSocketIONamespace(SocketIONamespace):
+class LoggingSocketIONamespace(SocketIONamespace, LoggingEngineIONamespace):
 
     def on_connect(self):
-        self._debug('%s[connect]', _make_logging_header(self.path))
+        self._debug(
+            '%s[socket.io connect]', _make_logging_header(self.path))
         super(LoggingSocketIONamespace, self).on_connect()
 
     def on_reconnect(self):
-        self._debug('%s[reconnect]', _make_logging_header(self.path))
+        self._debug(
+            '%s[socket.io reconnect]', _make_logging_header(self.path))
         super(LoggingSocketIONamespace, self).on_reconnect()
 
     def on_disconnect(self):
-        self._debug('%s[disconnect]', _make_logging_header(self.path))
+        self._debug(
+            '%s[socket.io disconnect]', _make_logging_header(self.path))
         super(LoggingSocketIONamespace, self).on_disconnect()
 
     def on_event(self, event, *args):
@@ -197,12 +200,13 @@ class LoggingSocketIONamespace(SocketIONamespace):
         if callback:
             arguments.append('callback(*args)')
         self._info(
-            '%s[event] %s(%s)', _make_logging_header(self.path), event,
-            ', '.join(arguments))
+            '%s[socket.io event] %s(%s)', _make_logging_header(self.path),
+            event, ', '.join(arguments))
         super(LoggingSocketIONamespace, self).on_event(event, *args)
 
     def on_error(self, data):
-        self._debug('%s[error] %s', _make_logging_header(self.path), data)
+        self._debug(
+            '%s[socket.io error] %s', _make_logging_header(self.path), data)
         super(LoggingSocketIONamespace, self).on_error()
 
 
diff --git a/socketIO_client/tests/__init__.py b/socketIO_client/tests/__init__.py
index e7f75c1..1e7c37d 100644
--- a/socketIO_client/tests/__init__.py
+++ b/socketIO_client/tests/__init__.py
@@ -17,10 +17,11 @@ class BaseMixin(object):
     def setUp(self):
         super(BaseMixin, self).setUp()
         self.called_on_response = False
+        self.wait_time_in_seconds = 1
 
     def tearDown(self):
         super(BaseMixin, self).tearDown()
-        del self.socketIO
+        self.socketIO.disconnect()
 
     def test_disconnect(self):
         'Disconnect'
@@ -161,7 +162,6 @@ class Test_XHR_PollingTransport(BaseMixin, TestCase):
         self.socketIO = SocketIO(HOST, PORT, LoggingNamespace, transports=[
             'xhr-polling'], verify=False)
         self.assertEqual(self.socketIO.transport_name, 'xhr-polling')
-        self.wait_time_in_seconds = 1
 
 
 class Test_WebsocketTransport(BaseMixin, TestCase):
@@ -171,7 +171,6 @@ class Test_WebsocketTransport(BaseMixin, TestCase):
         self.socketIO = SocketIO(HOST, PORT, LoggingNamespace, transports=[
             'xhr-polling', 'websocket'], verify=False)
         self.assertEqual(self.socketIO.transport_name, 'websocket')
-        self.wait_time_in_seconds = 1
 
 
 class Namespace(LoggingNamespace):
diff --git a/socketIO_client/transports.py b/socketIO_client/transports.py
index 4a08131..03af415 100644
--- a/socketIO_client/transports.py
+++ b/socketIO_client/transports.py
@@ -3,6 +3,7 @@ import six
 import socket
 import ssl
 import sys
+import threading
 import time
 import websocket
 
@@ -54,10 +55,11 @@ class XHR_PollingTransport(AbstractTransport):
             'EIO': ENGINEIO_PROTOCOL, 'transport': 'polling'}
         if engineIO_session:
             self._request_index = 1
-            self._kw_get = dict(timeout=engineIO_session.ping_timeout)
-            self._kw_post = dict(headers={
-                'content-type': 'application/octet-stream',
-            })
+            self._kw_get = dict(
+                timeout=engineIO_session.ping_timeout)
+            self._kw_post = dict(
+                timeout=engineIO_session.ping_timeout,
+                headers={'content-type': 'application/octet-stream'})
             self._params['sid'] = engineIO_session.id
         else:
             self._request_index = 0
@@ -65,6 +67,8 @@ class XHR_PollingTransport(AbstractTransport):
             self._kw_post = {}
         http_scheme = 'https' if is_secure else 'http'
         self._http_url = '%s://%s/' % (http_scheme, url)
+        self._request_index_lock = threading.Lock()
+        self._send_packet_lock = threading.Lock()
 
     def recv_packet(self):
         params = dict(self._params)
@@ -79,21 +83,24 @@ class XHR_PollingTransport(AbstractTransport):
             yield engineIO_packet_type, engineIO_packet_data
 
     def send_packet(self, engineIO_packet_type, engineIO_packet_data=''):
-        params = dict(self._params)
-        params['t'] = self._get_timestamp()
-        response = get_response(
-            self.http_session.post,
-            self._http_url,
-            params=params,
-            data=encode_engineIO_content([
-                (engineIO_packet_type, engineIO_packet_data),
-            ]),
-            **self._kw_post)
-        assert response.content == b'ok'
+        with self._send_packet_lock:
+            params = dict(self._params)
+            params['t'] = self._get_timestamp()
+            response = get_response(
+                self.http_session.post,
+                self._http_url,
+                params=params,
+                data=encode_engineIO_content([
+                    (engineIO_packet_type, engineIO_packet_data),
+                ]),
+                **self._kw_post)
+            assert response.content == b'ok'
 
     def _get_timestamp(self):
-        timestamp = '%s-%s' % (int(time.time() * 1000), self._request_index)
-        self._request_index += 1
+        with self._request_index_lock:
+            timestamp = '%s-%s' % (
+                int(time.time() * 1000), self._request_index)
+            self._request_index += 1
         return timestamp
 
 
@@ -164,7 +171,7 @@ class WebsocketTransport(AbstractTransport):
 
 def get_response(request, *args, **kw):
     try:
-        response = request(*args, **kw)
+        response = request(*args, stream=True, **kw)
     except requests.exceptions.Timeout as e:
         raise TimeoutError(e)
     except requests.exceptions.ConnectionError as e:

From 4b6c562825065d4a6274a58b7c40c3b7b32e72f2 Mon Sep 17 00:00:00 2001
From: Roy Hyunjin Han <rhh@crosscompute.com>
Date: Wed, 15 Apr 2015 14:42:28 -0400
Subject: [PATCH 06/26] Update CHANGES

---
 CHANGES.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index b7e7cb1..6c09b87 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,8 @@
+0.6.2
+-----
+- Upgraded to socket.io protocol 1.x for websocket transport
+- Added locks to fix concurrency issues with polling transport
+
 0.6.1
 -----
 - Upgraded to socket.io protocol 1.x thanks to Sean Arietta and Joe Palmer

From 9e0bb069ad81bfb860795f088bf1a4b63b6be06b Mon Sep 17 00:00:00 2001
From: Roy Hyunjin Han <rhh@crosscompute.com>
Date: Wed, 15 Apr 2015 15:48:45 -0400
Subject: [PATCH 07/26] Fix SSL compatibility issues

---
 TODO.goals                        |  2 --
 socketIO_client/tests/__init__.py |  9 ++----
 socketIO_client/tests/serve.js    |  5 +--
 socketIO_client/tests/ssl.crt     | 38 +++++++++++-----------
 socketIO_client/tests/ssl.key     | 52 +++++++++++++++----------------
 socketIO_client/transports.py     |  9 +++---
 6 files changed, 56 insertions(+), 59 deletions(-)

diff --git a/TODO.goals b/TODO.goals
index 291ad75..4cfdeaf 100644
--- a/TODO.goals
+++ b/TODO.goals
@@ -1,5 +1,3 @@
-Fix https tests for xhr-polling
-Fix https tests for websocket
 Implement rooms #65
 Implement binary event
 Implement binary ack
diff --git a/socketIO_client/tests/__init__.py b/socketIO_client/tests/__init__.py
index 1e7c37d..a2ab653 100644
--- a/socketIO_client/tests/__init__.py
+++ b/socketIO_client/tests/__init__.py
@@ -10,6 +10,7 @@ PORT = 9000
 DATA = 'xxx'
 PAYLOAD = {'xxx': 'yyy'}
 logging.basicConfig(level=logging.DEBUG)
+logging.captureWarnings(True)
 
 
 class BaseMixin(object):
@@ -25,14 +26,10 @@ class BaseMixin(object):
 
     def test_disconnect(self):
         'Disconnect'
+        namespace = self.socketIO.define(Namespace)
         self.assertTrue(self.socketIO.connected)
+        self.assertFalse(namespace.called_on_disconnect)
         self.socketIO.disconnect()
-        self.assertFalse(self.socketIO.connected)
-        # Use context manager
-        with SocketIO(HOST, PORT, Namespace) as self.socketIO:
-            namespace = self.socketIO.get_namespace()
-            self.assertFalse(namespace.called_on_disconnect)
-            self.assertTrue(self.socketIO.connected)
         self.assertTrue(namespace.called_on_disconnect)
         self.assertFalse(self.socketIO.connected)
 
diff --git a/socketIO_client/tests/serve.js b/socketIO_client/tests/serve.js
index 54985c4..05907b1 100644
--- a/socketIO_client/tests/serve.js
+++ b/socketIO_client/tests/serve.js
@@ -3,9 +3,10 @@
 var argv = require('yargs').argv;
 if (argv.secure) {
   var fs = require('fs');
+  var path = require('path');
   var app = require('https').createServer({
-    key: fs.readFileSync('ssl.key'),
-    cert: fs.readFileSync('ssl.crt')
+    key: fs.readFileSync(path.resolve(__dirname, 'ssl.key')),
+    cert: fs.readFileSync(path.resolve(__dirname, 'ssl.crt'))
   }, serve);
 } else {
   var app = require('http').createServer(serve);
diff --git a/socketIO_client/tests/ssl.crt b/socketIO_client/tests/ssl.crt
index d14941a..711ac71 100644
--- a/socketIO_client/tests/ssl.crt
+++ b/socketIO_client/tests/ssl.crt
@@ -1,21 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIIDbTCCAlWgAwIBAgIJALVDKggptosBMA0GCSqGSIb3DQEBBQUAME0xCzAJBgNV
-BAYTAlVTMREwDwYDVQQIDAhOZXcgWW9yazERMA8GA1UEBwwITmV3IFlvcmsxGDAW
-BgNVBAoMD0V4YW1wbGUgQ29tcGFueTAeFw0xNTA0MTQyMzE5MDlaFw0xNjA0MTMy
-MzE5MDlaME0xCzAJBgNVBAYTAlVTMREwDwYDVQQIDAhOZXcgWW9yazERMA8GA1UE
-BwwITmV3IFlvcmsxGDAWBgNVBAoMD0V4YW1wbGUgQ29tcGFueTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALUOviKWvseO7gbqOXOBp+v6lUmReL2xFTiK
-vrbdi9BMUMbl1CE+yiP7JTmSHCFty72xv/iwRgPG3rfUgEOZfuedhYXwl8hsnBzI
-ZK3quQiBMxPzpGOO6w5I2moMI+u45gOFpmf8CySjlcnTsKaaMAAr+8IiP+NpiW3U
-zKYLPtTkGdwBnilFEdLPlL3N5+yZ1zLA9WVMoEVLkg2Jbo5NEDK3JaGh34zxBOxh
-WbhvarAgb8PYBcXJaf9Ctp6M077cr8qIVq/dtBjUQcBNspeDJksuhpMzIRQy0FFX
-Qsso132LUsGBZqF4hVuLiSl5m0kjxxY3SOrNcvcEyLhxHJG+jLMCAwEAAaNQME4w
-HQYDVR0OBBYEFAEu7HcWyPZYVWHp5NhUlmHTirV8MB8GA1UdIwQYMBaAFAEu7HcW
-yPZYVWHp5NhUlmHTirV8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
-AJIUPUwx4sYn1aDTukMzcaGu1uElSdeayCe5mOmKd7XBald0PuUFqboWsTKmqELH
-usFDAJNmWS/zCuEuW0huqb1c3orw9IfVFx+oPXAEGFvRmBhKd9UmFpqLmhhRcP25
-RT2By00vN1A1f/XW0H2Rj5pgIBdbKGwzabQVy8RTMmmtiNlQqHwElUzggq+EbS2m
-XwNJ3bMumwrjciZTbMo0MMTStqF5oqacCfvt2vTT1c2IdpiCafPMYqrldXOJddx5
-uJ/Tu75ZHf+pjfg7SRGq5WmoKP36VCKbQJSP6kXcbTMP4KvlWlbmQgDsWvmnA0Nm
-283Ms7he6efOphFh2XHxysU=
+MIIDZTCCAk2gAwIBAgIJAK1HKQ8zF3cCMA0GCSqGSIb3DQEBBQUAMEkxCzAJBgNV
+BAYTAlVTMQswCQYDVQQIDAJOWTELMAkGA1UEBwwCTlkxDDAKBgNVBAoMA1hZWjES
+MBAGA1UEAwwJbG9jYWxob3N0MB4XDTE1MDQxNTE5NDUwNFoXDTE2MDQxNDE5NDUw
+NFowSTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk5ZMQswCQYDVQQHDAJOWTEMMAoG
+A1UECgwDWFlaMRIwEAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDAQUM9+xbiDeJXg+7X6HgXwla2AnGKWbZ11hZZUYbQwHyq
+ABDSqRQXVWvzac6b59/trZiJ7cQEH4+c8ln1C4qbCLvr1aWkL1BDAtSbFUFhQ2Sb
+R/xkSUpq35yTuR5+oHgahDg1gbgXgPhB3Y6HoBlYMSpSUKF+INu354kxfYi0t4tP
+8f309KUe6eQH3gXgTBR7pPJEUpaPOsrk6UR3cHCMqyzHulyfhgvkk5FN+EtSR9ex
+dIrF6WXmfynhsAa/+bxbsgeBF9MNj3zvckCzxdQStdqOvy0mu40/7i9vwguh9cRo
+HDn6lx5EaE+gSGU48UNnKX5iQdqEhprNVDj31MiJAgMBAAGjUDBOMB0GA1UdDgQW
+BBRkFsPxYU+e6ZSFwmzoS45qiOzAaDAfBgNVHSMEGDAWgBRkFsPxYU+e6ZSFwmzo
+S45qiOzAaDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQB4JyOA5bZ3
+NbkMvOjpDw+tKzcNiXZIkGfoQ8NC1DbGVhgG7Ps4VjXgUB552YSUV7iwyd3G78OC
++cxEcr+BvxXHXL2Wlxy0c/ZgBjRI5VnGbYQjjI2Iy2qJV+x5IR2oZatv45soZSLq
+NFCg2KpOgcSRgs0oDGVBYO0d9m73s/kOySj2NGqVJsaQXqXtLWKnqToaCfl4Vnl+
+zcMdUv8ajBZEPRg6oNi2QIvcNT8fS5gd/T4OXBa7pYuC79yOZ1X6bkKsZrcAdNGM
+zO/jH6jKFjIBBx1Of+uZTzfAj/eoTu3foPuUQ+Z9NNE2nkE6SLyBSlxE7wD+SfjS
+4/J0PNj22Uh3
 -----END CERTIFICATE-----
diff --git a/socketIO_client/tests/ssl.key b/socketIO_client/tests/ssl.key
index f37ea41..5717306 100644
--- a/socketIO_client/tests/ssl.key
+++ b/socketIO_client/tests/ssl.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC1Dr4ilr7Hju4G
-6jlzgafr+pVJkXi9sRU4ir623YvQTFDG5dQhPsoj+yU5khwhbcu9sb/4sEYDxt63
-1IBDmX7nnYWF8JfIbJwcyGSt6rkIgTMT86RjjusOSNpqDCPruOYDhaZn/Asko5XJ
-07CmmjAAK/vCIj/jaYlt1MymCz7U5BncAZ4pRRHSz5S9zefsmdcywPVlTKBFS5IN
-iW6OTRAytyWhod+M8QTsYVm4b2qwIG/D2AXFyWn/QraejNO+3K/KiFav3bQY1EHA
-TbKXgyZLLoaTMyEUMtBRV0LLKNd9i1LBgWaheIVbi4kpeZtJI8cWN0jqzXL3BMi4
-cRyRvoyzAgMBAAECggEAWZMEoAoiMopU2ljwuWNw1z9usinlKTu9uu5xcfjjXdcT
-s4Mq0pPE3841WWkev68ZOC0DQ5651M6Di0D3f/olnaMB1wTzorWQ+nBt1tkkV7/L
-rFhCgPrI8ZU7cXG2J72fFij97b31KVhBF8vCPnpTuxIHiMD3CKRC2HKKGK/BkwK9
-cxlPjUlh2LawIULQM0jl/oLGC6jwTupNrbZogVLBf6Koi3S5o0e9F9KaBl127Mh9
-COZIFDnD0exGHCvH49YI/cuwHYeyDlU6Xi7Wv2f3cdmC/enUG5n8Ts/OpDTPiSgf
-cZOrVQ8nCm/4jc/qhTubBZwPGqkMpFbE+DRSGDsgKQKBgQDbndwec9lrnyHUgJ/r
-hBoMFwFMc6rZvAug4CF1ry7nZqLOI+Xg6rHjseu1Vc8aQMJCuK1YAr6ImYbN1Jwq
-5cta4cPlPKis4xBbwhcELfVJB550LIwv3hgN/94Sh8aojPueIJcoUsOrG87wJ2KS
-RCPK+Pz7W5b+cBc/Ii9ROGPAdwKBgQDTDY8E0P4Yp/okc2IyNU+gurSP61DITEpq
-N51QNQ1BmCID/G7yyErsRJeQHhCKVvGEijh/DB4nQKO9lJcVSh4v511NojwpQ35V
-FtSePXmhBY8J7vq/DAkvISi8g1/A6A10XEsPcO4ga7EL5CtzYWC4Vh14a0tWNGxW
-vUJWNoiApQKBgQCMxSsK+gcrTN1KcQgQ1qQ7i6NxddLVrgtmG0RXQus1uDwzFh+L
-g+RypuEHYvFVSp06V1YFS/0FYiNeXCGd/Z3Tq1L95VvZNdKOfmJyc2L+ZLvUi5lw
-NVQF5TRbfFyCPZwrR4iceDCjxTdoCFbOmo6209KU66hlf0PnW+oojZSjEQKBgDTY
-nkkcc6OE3BOoeJwN0URzu6aVy4J759400sU0o38bMtlAqh9Mm8YRXsoNXSLmpk8D
-tSXKyPoXK2ja/gGsr2ZbTneT+fBzH/z6XH7K8dup4qkgF9UilGIisWqSkrVg5Y2P
-VpQlONsRXCGYHnEjnu5JUdPHOfP56G7HsQaZXRCpAoGBAI2E2ui3nyzUWmnpT4gI
-vTZE4DqtLSWRL85xSJJdw7phI/dgAtVe5I7vnv8kapD+m4xMoa0J1O5jBwNdC4/C
-6rCmFC+wh3qu1f3DRwaUsM/hdkQyA7DQcYzayhiicPQCi0xuJuA8FuYHBkQCmOfN
-77zJjF6uScFwr+2Ozpb0H30V
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDAQUM9+xbiDeJX
+g+7X6HgXwla2AnGKWbZ11hZZUYbQwHyqABDSqRQXVWvzac6b59/trZiJ7cQEH4+c
+8ln1C4qbCLvr1aWkL1BDAtSbFUFhQ2SbR/xkSUpq35yTuR5+oHgahDg1gbgXgPhB
+3Y6HoBlYMSpSUKF+INu354kxfYi0t4tP8f309KUe6eQH3gXgTBR7pPJEUpaPOsrk
+6UR3cHCMqyzHulyfhgvkk5FN+EtSR9exdIrF6WXmfynhsAa/+bxbsgeBF9MNj3zv
+ckCzxdQStdqOvy0mu40/7i9vwguh9cRoHDn6lx5EaE+gSGU48UNnKX5iQdqEhprN
+VDj31MiJAgMBAAECggEANAFzbxC83+lhkMrfkQgRdFvdmN6QWBxsfvOql/61uUJY
+dqQN6O5TwPwad33npcTTjjenS6hFndfrwUjNjLvSgp2aN/FTHVavH3FkkY7uYKEa
+VebjHz20I7TZZhxtY1OFKacajV7JrZH1lduY8pccQ/8Is7ub88JvrQ+0zO5oTHnh
+KEPYY5r2wLxKrzGm0NavRW9MpiHxz1vUGykvaGq9vR8dVFvZlLC5szYII+BvlII+
+78XMnZbJ9ahT7dzfnzPdPPuyP3m4cdJ9c+7Advs0g2F3K/IDL3jZZCRZIaLxHIs0
+PeI17teW0OmK4RWrnf6dSf0bww05x5In8GzUYgppAQKBgQD4lJVi3UmAB319CGeP
+NE4cZFuMneNsuCkNEJONb8Cfsah2maM0if8tUNoR96JorjWgkUTG4oThGSQgJQw8
+fPy6cW4EUhSvWCO+Q4MFFWpTcf0hBiz5O1d06FHVo39o8Ct9dv2bxJqfNtCUUf31
+Fz5tvA+wvByOSazUC3AowQZ6FwKBgQDF/ksJbOBd/bu3ss7eJRjE2sXmuhfxrUiu
+P5RoOEqHROAifatJk/3hwT6lx2y1g+3kJpZm9V16dNTkcuybL0yJ/VBE3uWuodrj
+i9+wcg8XSnRp3BPVKzebKIKDTMdypOeb1f5yhx6cCtChRm1frKQdoXpMQqptM0jq
+w3B4bryWXwKBgQCWSv+nLrPpvJ2aoyI56x3u/J59fliquw3W4FbWBOMpqnh4fJu4
+gFbQRzoR8u82611xH2O9++brUhANf1jOmaMT9tDVu+rVuSyjNJ5azH/kw96PwPQg
+HEjcXjpcOOYnxE4HJZJgQ5ZY/QNPKeOp88vC/RlfedyqCtF7ww6lFU+dMQKBgQC2
+M7ut4sne9R8If74rZAwVLBauq1ZZi1O1NsFF33eGX/W7B9bXER+z3vfd61W4/L2x
+FWmXOflaNaWsza27aZ2P5tM1bcIEIOKkQBYL9Aq7LkNPH74Ij4rOeEsStVddwy94
+k0di8cFTbAhuQbdpMiCdO/qlrzvS3j0d/djEm3NlFQKBgQCpIrHaMcckCFsf2Y6o
+zMnbi3859hve94OOJjauQLlw/nRE/+OaDsDN8iJoxnK0seek8ro1ixSBTScpuX8W
+G2DBgqs9NrSQLe6FAckkGqVJdluoh5GewNneAcowkkauj2srnb6XtJDhFtTDY141
+EPbeqGB9PUY9Ny8VzHkAb1vi6g==
 -----END PRIVATE KEY-----
diff --git a/socketIO_client/transports.py b/socketIO_client/transports.py
index 03af415..ae741f6 100644
--- a/socketIO_client/transports.py
+++ b/socketIO_client/transports.py
@@ -86,13 +86,14 @@ class XHR_PollingTransport(AbstractTransport):
         with self._send_packet_lock:
             params = dict(self._params)
             params['t'] = self._get_timestamp()
+            data = encode_engineIO_content([
+                (engineIO_packet_type, engineIO_packet_data),
+            ])
             response = get_response(
                 self.http_session.post,
                 self._http_url,
                 params=params,
-                data=encode_engineIO_content([
-                    (engineIO_packet_type, engineIO_packet_data),
-                ]),
+                data=memoryview(data),
                 **self._kw_post)
             assert response.content == b'ok'
 
@@ -145,7 +146,7 @@ class WebsocketTransport(AbstractTransport):
         except websocket.WebSocketTimeoutException as e:
             raise TimeoutError('recv timed out (%s)' % e)
         except websocket.SSLError as e:
-            raise ConnectionError('recv disconnected (%s)' % e)
+            raise ConnectionError('recv disconnected by ssl (%s)' % e)
         except websocket.WebSocketConnectionClosedException as e:
             raise ConnectionError('recv disconnected (%s)' % e)
         except socket.error as e:

From b3f61bb26d53ed6947c54e06c121d0ac3f0c7018 Mon Sep 17 00:00:00 2001
From: Roy Hyunjin Han <rhh@crosscompute.com>
Date: Wed, 15 Apr 2015 15:49:35 -0400
Subject: [PATCH 08/26] Update changes

---
 CHANGES.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 6c09b87..2bb608c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,7 @@
 -----
 - Upgraded to socket.io protocol 1.x for websocket transport
 - Added locks to fix concurrency issues with polling transport
+- Fixed SSL support
 
 0.6.1
 -----

From fd106e623d2e84ff40a7998f3a31bb902571fda9 Mon Sep 17 00:00:00 2001
From: Roy Hyunjin Han <rhh@crosscompute.com>
Date: Wed, 15 Apr 2015 16:05:00 -0400
Subject: [PATCH 09/26] Update error message

---
 socketIO_client/transports.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/socketIO_client/transports.py b/socketIO_client/transports.py
index ae741f6..03bb69f 100644
--- a/socketIO_client/transports.py
+++ b/socketIO_client/transports.py
@@ -146,7 +146,7 @@ class WebsocketTransport(AbstractTransport):
         except websocket.WebSocketTimeoutException as e:
             raise TimeoutError('recv timed out (%s)' % e)
         except websocket.SSLError as e:
-            raise ConnectionError('recv disconnected by ssl (%s)' % e)
+            raise ConnectionError('recv disconnected by SSL (%s)' % e)
         except websocket.WebSocketConnectionClosedException as e:
             raise ConnectionError('recv disconnected (%s)' % e)
         except socket.error as e:

From eb0324cb68e79bbd385a9221b7f0d9eaee5fce26 Mon Sep 17 00:00:00 2001
From: Roy Hyunjin Han <rhh@crosscompute.com>
Date: Wed, 15 Apr 2015 16:32:46 -0400
Subject: [PATCH 10/26] Remove captureWarnings

---
 socketIO_client/tests/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/socketIO_client/tests/__init__.py b/socketIO_client/tests/__init__.py
index a2ab653..bcfc00e 100644
--- a/socketIO_client/tests/__init__.py
+++ b/socketIO_client/tests/__init__.py
@@ -10,7 +10,6 @@ PORT = 9000
 DATA = 'xxx'
 PAYLOAD = {'xxx': 'yyy'}
 logging.basicConfig(level=logging.DEBUG)
-logging.captureWarnings(True)
 
 
 class BaseMixin(object):

From e622312a7976e146dc9295885607c6b4559db4d9 Mon Sep 17 00:00:00 2001
From: Roy Hyunjin Han <rhh@crosscompute.com>
Date: Wed, 15 Apr 2015 16:47:56 -0400
Subject: [PATCH 11/26] Restore support for Python 2.6

---
 socketIO_client/symmetries.py | 4 ++++
 socketIO_client/transports.py | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/socketIO_client/symmetries.py b/socketIO_client/symmetries.py
index de9dbfe..f100ec6 100644
--- a/socketIO_client/symmetries.py
+++ b/socketIO_client/symmetries.py
@@ -7,6 +7,10 @@ try:
     from urlparse import urlparse as parse_url
 except ImportError:
     from urllib.parse import urlparse as parse_url
+try:
+    memoryview = memoryview
+except NameError:
+    memoryview = buffer
 
 
 def get_character(x, index):
diff --git a/socketIO_client/transports.py b/socketIO_client/transports.py
index 03bb69f..f4b4a7c 100644
--- a/socketIO_client/transports.py
+++ b/socketIO_client/transports.py
@@ -11,7 +11,7 @@ from .exceptions import ConnectionError, TimeoutError
 from .parsers import (
     encode_engineIO_content, decode_engineIO_content,
     format_packet_text, parse_packet_text)
-from .symmetries import format_query, parse_url
+from .symmetries import format_query, memoryview, parse_url
 
 
 if not hasattr(websocket, 'create_connection'):

From 16b538d847818f80bce67ddef83e0f31e58e9ccc Mon Sep 17 00:00:00 2001
From: Roy Hyunjin Han <rhh@crosscompute.com>
Date: Wed, 15 Apr 2015 17:23:56 -0400
Subject: [PATCH 12/26] Bump version

---
 CHANGES.rst                 | 2 +-
 setup.py                    | 2 +-
 socketIO_client/__init__.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 2bb608c..2839626 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,4 +1,4 @@
-0.6.2
+0.6.3
 -----
 - Upgraded to socket.io protocol 1.x for websocket transport
 - Added locks to fix concurrency issues with polling transport
diff --git a/setup.py b/setup.py
index 51ab595..0b6a1a7 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ DESCRIPTION = '\n\n'.join(open(join(HERE, _)).read() for _ in [
 ])
 setup(
     name='socketIO_client',
-    version='0.6.1',
+    version='0.6.3',
     description='A socket.io client library',
     long_description=DESCRIPTION,
     license='MIT',
diff --git a/socketIO_client/__init__.py b/socketIO_client/__init__.py
index b8186fd..dfe41e5 100644
--- a/socketIO_client/__init__.py
+++ b/socketIO_client/__init__.py
@@ -14,7 +14,7 @@ from .transports import (
 
 
 __all__ = 'SocketIO', 'SocketIONamespace'
-__version__ = '0.6.1'
+__version__ = '0.6.3'
 BaseNamespace = SocketIONamespace
 LoggingNamespace = LoggingSocketIONamespace
 

From fb3b66115ea7220d59ad307c42110b7ec45a172a Mon Sep 17 00:00:00 2001
From: Roy Hyunjin Han <rhh@crosscompute.com>
Date: Fri, 15 May 2015 22:47:15 -0400
Subject: [PATCH 13/26] Fix #74 thanks to @Nabla128k

---
 README.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.rst b/README.rst
index 9a20e0b..2b25451 100644
--- a/README.rst
+++ b/README.rst
@@ -6,6 +6,8 @@ socketIO-client
 ===============
 Here is a `socket.io <http://socket.io>`_ client library for Python.  You can use it to write test code for your socket.io server.
 
+Please note that this version implements `socket.io protocol 1.x <https://github.com/automattic/socket.io-protocol>`_, which is not backwards compatible.  If you want to communicate using `socket.io protocol 0.9 <https://github.com/learnboost/socket.io-spec>`_ (e.g. `gevent-socketio <https://github.com/abourget/gevent-socketio>`_), please use `socketIO-client 0.5.5 <https://pypi.python.org/pypi/socketIO-client/0.5.5>`.
+
 
 Installation
 ------------

From 829e6694030f339fa26845b443ff16f5dcd77644 Mon Sep 17 00:00:00 2001
From: Roy Hyunjin Han <rhh@crosscompute.com>
Date: Fri, 15 May 2015 22:48:33 -0400
Subject: [PATCH 14/26] Fix link

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 2b25451..017cb3b 100644
--- a/README.rst
+++ b/README.rst
@@ -6,7 +6,7 @@ socketIO-client
 ===============
 Here is a `socket.io <http://socket.io>`_ client library for Python.  You can use it to write test code for your socket.io server.
 
-Please note that this version implements `socket.io protocol 1.x <https://github.com/automattic/socket.io-protocol>`_, which is not backwards compatible.  If you want to communicate using `socket.io protocol 0.9 <https://github.com/learnboost/socket.io-spec>`_ (e.g. `gevent-socketio <https://github.com/abourget/gevent-socketio>`_), please use `socketIO-client 0.5.5 <https://pypi.python.org/pypi/socketIO-client/0.5.5>`.
+Please note that this version implements `socket.io protocol 1.x <https://github.com/automattic/socket.io-protocol>`_, which is not backwards compatible.  If you want to communicate using `socket.io protocol 0.9 <https://github.com/learnboost/socket.io-spec>`_ (e.g. `gevent-socketio <https://github.com/abourget/gevent-socketio>`_), please use `socketIO-client 0.5.5 <https://pypi.python.org/pypi/socketIO-client/0.5.5>`_.
 
 
 Installation

From 12fa6c523b77a2a05d14c3741d33eb2b3cbcc53c Mon Sep 17 00:00:00 2001
From: Matt Porritt <mattp@catalyst-au.net>
Date: Tue, 19 May 2015 15:09:22 +1000
Subject: [PATCH 15/26] explicitly set file open to user utf8 encoding when
 setup.py parses README and CHANGES file.  If this is not done some systems
 will throw unicode can't decode byte error

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 0b6a1a7..73c80d5 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ REQUIREMENTS = [
 
 
 HERE = dirname(abspath(__file__))
-DESCRIPTION = '\n\n'.join(open(join(HERE, _)).read() for _ in [
+DESCRIPTION = '\n\n'.join(open(join(HERE, _), encoding="utf8").read() for _ in [
     'README.rst',
     'CHANGES.rst',
 ])

From 29a3e0ebf69531357d832d6014d15a3fe2f76682 Mon Sep 17 00:00:00 2001
From: Roy Hyunjin Han <rhh@crosscompute.com>
Date: Wed, 20 May 2015 23:12:11 -0400
Subject: [PATCH 16/26] Support Python 2.6 & 2.7

---
 setup.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 73c80d5..b27975b 100644
--- a/setup.py
+++ b/setup.py
@@ -1,3 +1,4 @@
+import io
 from os.path import abspath, dirname, join
 from setuptools import find_packages, setup
 
@@ -10,7 +11,8 @@ REQUIREMENTS = [
 
 
 HERE = dirname(abspath(__file__))
-DESCRIPTION = '\n\n'.join(open(join(HERE, _), encoding="utf8").read() for _ in [
+LOAD_TEXT = lambda name: io.open(join(HERE, name), encoding='UTF-8').read()
+DESCRIPTION = '\n\n'.join(LOAD_TEXT(_) for _ in [
     'README.rst',
     'CHANGES.rst',
 ])

From 689648ba32840bf82207548d5c0813b6d823b3ee Mon Sep 17 00:00:00 2001
From: Matt Porritt <mattp@catalyst-au.net>
Date: Fri, 22 May 2015 17:11:21 +1000
Subject: [PATCH 17/26] fixing close method that is called as part of __del__.
 No longer throws error trying to call an attribute that will not exist if
 object fails during instantiation

---
 socketIO_client/__init__.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/socketIO_client/__init__.py b/socketIO_client/__init__.py
index dfe41e5..3d8d476 100644
--- a/socketIO_client/__init__.py
+++ b/socketIO_client/__init__.py
@@ -173,7 +173,10 @@ class EngineIO(LoggingMixin):
 
     def _close(self):
         self._wants_to_close = True
-        self._heartbeat_thread.halt()
+        try:
+            self._heartbeat_thread.halt()
+        except AttributeError:
+            pass
         if not self._opened:
             return
         engineIO_packet_type = 1

From 59dcd02a91657f2dca838fc463571fcbb134142e Mon Sep 17 00:00:00 2001
From: Roy Hyunjin Han <rhh@crosscompute.com>
Date: Mon, 1 Jun 2015 14:31:46 -0400
Subject: [PATCH 18/26] Prepare for minor release

---
 CHANGES.rst | 9 +++++++++
 README.rst  | 4 ++--
 setup.py    | 2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 2839626..cf4bf4a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,8 @@
+0.6.4
+-----
+- Fixed support for Python 3
+- Fixed thread cleanup
+
 0.6.3
 -----
 - Upgraded to socket.io protocol 1.x for websocket transport
@@ -8,6 +13,10 @@
 -----
 - Upgraded to socket.io protocol 1.x thanks to Sean Arietta and Joe Palmer
 
+0.5.6
+-----
+- Backported to support requests 0.8.2
+
 0.5.5
 -----
 - Fixed reconnection in the event of server restart
diff --git a/README.rst b/README.rst
index 017cb3b..4f544b2 100644
--- a/README.rst
+++ b/README.rst
@@ -6,7 +6,7 @@ socketIO-client
 ===============
 Here is a `socket.io <http://socket.io>`_ client library for Python.  You can use it to write test code for your socket.io server.
 
-Please note that this version implements `socket.io protocol 1.x <https://github.com/automattic/socket.io-protocol>`_, which is not backwards compatible.  If you want to communicate using `socket.io protocol 0.9 <https://github.com/learnboost/socket.io-spec>`_ (e.g. `gevent-socketio <https://github.com/abourget/gevent-socketio>`_), please use `socketIO-client 0.5.5 <https://pypi.python.org/pypi/socketIO-client/0.5.5>`_.
+Please note that this version implements `socket.io protocol 1.x <https://github.com/automattic/socket.io-protocol>`_, which is not backwards compatible.  If you want to communicate using `socket.io protocol 0.9 <https://github.com/learnboost/socket.io-spec>`_ (which is compatible with `gevent-socketio <https://github.com/abourget/gevent-socketio>`_), please use `socketIO-client 0.5.6 <https://pypi.python.org/pypi/socketIO-client/0.5.6>`_.
 
 
 Installation
@@ -166,5 +166,5 @@ Credits
 - `Alexandre Bourget <https://github.com/abourget>`_ wrote `gevent-socketio <https://github.com/abourget/gevent-socketio>`_, which is a socket.io server written in Python.
 - `Paul Kienzle <https://github.com/pkienzle>`_, `Zac Lee <https://github.com/zratic>`_, `Josh VanderLinden <https://github.com/codekoala>`_, `Ian Fitzpatrick <https://github.com/ifitzpatrick>`_, `Lucas Klein <https://github.com/lukasklein>`_, `Rui Chicoria <https://github.com/rchicoria>`_, `Travis Odom <https://github.com/burstaholic>`_, `Patrick Huber <https://github.com/stackmagic>`_, `Brad Campbell <https://github.com/bradjc>`_, `Daniel <https://github.com/dabidan>`_, `Sean Arietta <https://github.com/sarietta>`_ submitted code to expand support of the socket.io protocol.
 - `Bernard Pratz <https://github.com/guyzmo>`_, `Francis Bull <https://github.com/franbull>`_ wrote prototypes to support xhr-polling and jsonp-polling.
-- `Eric Chen <https://github.com/taiyangc>`_, `Denis Zinevich <https://github.com/dzinevich>`_, `Thiago Hersan <https://github.com/thiagohersan>`_, `Nayef Copty <https://github.com/nayefc>`_, `Jörgen Karlsson <https://github.com/jorgen-k>`_, `Branden Ghena <https://github.com/brghena>`_ suggested ways to make the connection more robust.
+- `Eric Chen <https://github.com/taiyangc>`_, `Denis Zinevich <https://github.com/dzinevich>`_, `Thiago Hersan <https://github.com/thiagohersan>`_, `Nayef Copty <https://github.com/nayefc>`_, `Jörgen Karlsson <https://github.com/jorgen-k>`_, `Branden Ghena <https://github.com/brghena>`_, `Tim Landscheidt <https://github.com/scfc>`_, `Matt Porritt <https://github.com/mattporritt>`_ suggested ways to make the connection more robust.
 - `Merlijn van Deen <https://github.com/valhallasw>`_, `Frederic Sureau <https://github.com/fredericsureau>`_, `Marcus Cobden <https://github.com/leth>`_, `Drew Hutchison <https://github.com/drewhutchison>`_, `wuurrd <https://github.com/wuurrd>`_, `Adam Kecer <https://github.com/amfg>`_, `Alex Monk <https://github.com/Krenair>`_, `Vishal P R <https://github.com/vishalwy>`_, `John Vandenberg <https://github.com/jayvdb>`_, `Thomas Grainger <https://github.com/graingert>`_ proposed changes that make the library more friendly and practical for you!
diff --git a/setup.py b/setup.py
index b27975b..8b0f71b 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@ DESCRIPTION = '\n\n'.join(LOAD_TEXT(_) for _ in [
 ])
 setup(
     name='socketIO_client',
-    version='0.6.3',
+    version='0.6.4',
     description='A socket.io client library',
     long_description=DESCRIPTION,
     license='MIT',

From ba82ffe5586f61324f3af4169e34c2ffff913168 Mon Sep 17 00:00:00 2001
From: Roy Hyunjin Han <rhh@crosscompute.com>
Date: Mon, 1 Jun 2015 15:58:49 -0400
Subject: [PATCH 19/26] Fix #80

---
 socketIO_client/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/socketIO_client/__init__.py b/socketIO_client/__init__.py
index 3d8d476..fbf2c7d 100644
--- a/socketIO_client/__init__.py
+++ b/socketIO_client/__init__.py
@@ -221,7 +221,7 @@ class EngineIO(LoggingMixin):
         # Use ping/pong to unblock recv for polling transport
         self._heartbeat_thread.hurry()
         # Use timeout to unblock recv for websocket transport
-        self._transport.set_timeout(seconds)
+        self._transport.set_timeout(seconds=1)
         # Listen
         warning_screen = self._yield_warning_screen(seconds)
         for elapsed_time in warning_screen:

From db59b16e257a68489effa3199a94934607ee4b19 Mon Sep 17 00:00:00 2001
From: Roy Hyunjin Han <rhh@crosscompute.com>
Date: Mon, 1 Jun 2015 16:06:48 -0400
Subject: [PATCH 20/26] Add documentation

---
 CHANGES.rst | 4 ++++
 setup.py    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index cf4bf4a..8970d11 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,7 @@
+0.6.5
+-----
+- Updated wait loop to be more responsive under websocket transport
+
 0.6.4
 -----
 - Fixed support for Python 3
diff --git a/setup.py b/setup.py
index 8b0f71b..8dc5016 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@ DESCRIPTION = '\n\n'.join(LOAD_TEXT(_) for _ in [
 ])
 setup(
     name='socketIO_client',
-    version='0.6.4',
+    version='0.6.5',
     description='A socket.io client library',
     long_description=DESCRIPTION,
     license='MIT',

From 1cd63a031bba986f2be5ed6d46480c7fc9f28608 Mon Sep 17 00:00:00 2001
From: Roy Hyunjin Han <rhh@crosscompute.com>
Date: Mon, 1 Jun 2015 16:16:32 -0400
Subject: [PATCH 21/26] Add classifier

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 8dc5016..a2a00e3 100644
--- a/setup.py
+++ b/setup.py
@@ -26,6 +26,7 @@ setup(
         'Intended Audience :: Developers',
         'Programming Language :: Python',
         'License :: OSI Approved :: MIT License',
+        'Development Status :: 5 - Production/Stable',
     ],
     keywords='socket.io node.js',
     author='Roy Hyunjin Han',

From fd88b9e0960222f01d11a513a0e7a8721badd90e Mon Sep 17 00:00:00 2001
From: Roy Hyunjin Han <starsareblueandfaraway@gmail.com>
Date: Thu, 22 Oct 2015 17:41:21 -0400
Subject: [PATCH 22/26] Prepare for updates

---
 LICENSE | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/LICENSE b/LICENSE
index 4e68cea..dca6c1b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,19 @@
 Copyright (c) 2013 Roy Hyunjin Han and contributors
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

From 4f04e6ca6249357c0dc390f61ed0b68186511c27 Mon Sep 17 00:00:00 2001
From: Roy Hyunjin Han <rhh@crosscompute.com>
Date: Mon, 2 Nov 2015 16:13:35 -0500
Subject: [PATCH 23/26] Replace basestring with str

---
 socketIO_client/transports.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/socketIO_client/transports.py b/socketIO_client/transports.py
index f4b4a7c..c2ca31b 100644
--- a/socketIO_client/transports.py
+++ b/socketIO_client/transports.py
@@ -129,7 +129,7 @@ class WebsocketTransport(AbstractTransport):
                     proxy_url_pack.username, proxy_url_pack.password)
         if http_session.verify:
             if http_session.cert:  # Specify certificate path on disk
-                if isinstance(http_session.cert, basestring):
+                if isinstance(http_session.cert, str):
                     kw['ca_certs'] = http_session.cert
                 else:
                     kw['ca_certs'] = http_session.cert[0]

From 7e9f3c734331d1e72beabde9afbe42b135fe0378 Mon Sep 17 00:00:00 2001
From: Roy Hyunjin Han <rhh@crosscompute.com>
Date: Tue, 10 Nov 2015 17:42:40 -0500
Subject: [PATCH 24/26] Use six.string_types

---
 socketIO_client/transports.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/socketIO_client/transports.py b/socketIO_client/transports.py
index c2ca31b..58824a1 100644
--- a/socketIO_client/transports.py
+++ b/socketIO_client/transports.py
@@ -6,6 +6,7 @@ import sys
 import threading
 import time
 import websocket
+from six import string_types
 
 from .exceptions import ConnectionError, TimeoutError
 from .parsers import (
@@ -129,7 +130,7 @@ class WebsocketTransport(AbstractTransport):
                     proxy_url_pack.username, proxy_url_pack.password)
         if http_session.verify:
             if http_session.cert:  # Specify certificate path on disk
-                if isinstance(http_session.cert, str):
+                if isinstance(http_session.cert, string_types):
                     kw['ca_certs'] = http_session.cert
                 else:
                     kw['ca_certs'] = http_session.cert[0]

From d3a5839678e0cf66247db5963d12bf48b488c6a9 Mon Sep 17 00:00:00 2001
From: Roy Hyunjin Han <rhh@crosscompute.com>
Date: Tue, 5 Jan 2016 09:10:16 -0500
Subject: [PATCH 25/26] Process issues

---
 TODO.goals | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/TODO.goals b/TODO.goals
index 4cfdeaf..dc8e0f6 100644
--- a/TODO.goals
+++ b/TODO.goals
@@ -1,3 +1,11 @@
-Implement rooms #65
+Implement rooms 
+    https://github.com/invisibleroads/socketIO-client/pull/65
+    https://github.com/invisibleroads/socketIO-client/issues/72
 Implement binary event
+    https://github.com/invisibleroads/socketIO-client/issues/70
 Implement binary ack
+    https://github.com/invisibleroads/socketIO-client/issues/71
+Backport to support requests 0.8.2
+    https://github.com/invisibleroads/socketIO-client/commit/b288d89c15d452a30bfeb00f38494f59f71f5a43
+Check why connected=True after termination
+    https://github.com/invisibleroads/socketIO-client/issues/80

From 8aa519e095d82660c8277cb5e6228c04d8c3caa6 Mon Sep 17 00:00:00 2001
From: Roy Hyunjin Han <starsareblueandfaraway@gmail.com>
Date: Tue, 19 Jan 2016 23:12:33 -0500
Subject: [PATCH 26/26] Order goals

---
 TODO.goals | 49 +++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 43 insertions(+), 6 deletions(-)

diff --git a/TODO.goals b/TODO.goals
index dc8e0f6..d72b083 100644
--- a/TODO.goals
+++ b/TODO.goals
@@ -1,11 +1,48 @@
-Implement rooms 
-    https://github.com/invisibleroads/socketIO-client/pull/65
-    https://github.com/invisibleroads/socketIO-client/issues/72
-Implement binary event
+= Consider supporting both protocols in the same library
+    https://github.com/invisibleroads/socketIO-client/issues/95
+Add binary support
+    https://github.com/invisibleroads/socketIO-client/pull/85
     https://github.com/invisibleroads/socketIO-client/issues/70
-Implement binary ack
     https://github.com/invisibleroads/socketIO-client/issues/71
-Backport to support requests 0.8.2
+    https://github.com/invisibleroads/socketIO-client/issues/91
+Check requests dependency
+    https://github.com/invisibleroads/socketIO-client/issues/92
+    https://github.com/invisibleroads/socketIO-client/pull/93
     https://github.com/invisibleroads/socketIO-client/commit/b288d89c15d452a30bfeb00f38494f59f71f5a43
+Check SSL
+    https://github.com/invisibleroads/socketIO-client/issues/86
+    https://github.com/invisibleroads/socketIO-client/pull/87
+Look into invalid namespace handling
+    https://github.com/invisibleroads/socketIO-client/issues/84
+Check unicode issues
+    https://github.com/invisibleroads/socketIO-client/issues/81
+Check python3 support for socketIO-client 0.5.6
+    https://github.com/invisibleroads/socketIO-client/issues/83
+Check OK assertion
+    https://github.com/invisibleroads/socketIO-client/issues/99
+    https://github.com/invisibleroads/socketIO-client/pull/103
 Check why connected=True after termination
     https://github.com/invisibleroads/socketIO-client/issues/80
+    https://github.com/invisibleroads/socketIO-client/issues/98
+Consider catching heartbeat thread exception
+    https://github.com/invisibleroads/socketIO-client/issues/100
+Check why it blocks when defining a namespace
+    https://github.com/invisibleroads/socketIO-client/issues/96
+Check why transports are not being set
+    https://github.com/invisibleroads/socketIO-client/issues/102
+Look at 404 not found error
+    https://github.com/invisibleroads/socketIO-client/issues/101
+Look at socketio off and socketio once
+    https://github.com/invisibleroads/socketIO-client/pull/94
+Implement rooms 
+    https://github.com/invisibleroads/socketIO-client/issues/72
+    https://github.com/invisibleroads/socketIO-client/pull/65
+Check tests
+    https://github.com/invisibleroads/socketIO-client/issues/90
+Check whether it works on Windows 8
+    https://github.com/invisibleroads/socketIO-client/issues/97
+Add debian packaging support
+    https://github.com/invisibleroads/socketIO-client/pull/89
+
++ Review issues and pull requests
++ Order issues