Commit graph

123 commits

Author SHA1 Message Date
Roy Hyunjin Han
0c6d4cd4d7 Fix #62 2015-02-15 11:35:06 -05:00
Roy Hyunjin Han
0c8dda1316 Ensure that recv timeout is less than heartbeat timeout #34 2015-02-15 11:18:57 -05:00
Roy Hyunjin Han
6cdf1eb610 Merge branch 'leth-patch-2' 2015-02-15 10:50:26 -05:00
Roy Hyunjin Han
3aab1f1436 Merge conflicts 2015-02-15 10:50:20 -05:00
Roy Hyunjin Han
c19f9891e6 Merge branch 'dabidan-patch-1' 2015-02-15 10:38:15 -05:00
Roy Hyunjin Han
47b5f2dd69 Merge conflicts 2015-02-15 10:37:56 -05:00
Roy Hyunjin Han
18cf130d9e Fix #40 2015-02-15 10:20:11 -05:00
Roy Hyunjin Han
e16669a824 Merge branch 'Vodalys-websocket_headers' 2015-02-15 08:56:24 -05:00
Roy Hyunjin Han
b8f838b392 Merge #44 2015-02-15 08:56:13 -05:00
Roy Hyunjin Han
99b29ac841 Update goals 2015-02-15 08:54:06 -05:00
Roy Hyunjin Han
5f7937dc1e Add stream=True #45 2015-02-15 08:48:27 -05:00
Roy Hyunjin Han
4f7605c0b3 Merge branch '0.6.0' 2015-02-15 07:26:02 -05:00
Roy Hyunjin Han
1eb8faa247 Merge pull request #67 from amfg/patch-1
Update transports.py
2015-02-12 11:19:51 -05:00
Adam Kecer
fc3a8b5e32 Update transports.py
Under p3k, this code throws NameError (because of the unicode() function)
This fix should be valid under both python2 and python3
2015-02-11 18:45:23 +01:00
Roy Hyunjin Han
cfbaaa21eb Update goals 2015-02-10 22:04:38 -05:00
Roy Hyunjin Han
b9e63ff7cd Save before flight 2015-01-25 10:17:03 +09:00
Roy Hyunjin Han
c1e4924717 Merge pull request #37 from leth/patch-3
Catch AttributeError in client connected check
2015-01-09 22:15:36 +09:00
Roy Hyunjin Han
ee425459bd Merge pull request #39 from bradjc/on-reconnect
Make on_reconnect callback functional
2015-01-09 22:14:58 +09:00
Roy Hyunjin Han
01f166db1e Merge pull request #47 from Vodalys/unicode
Support unicode data in emit
2015-01-09 22:13:13 +09:00
Roy Hyunjin Han
6661d8be0e Merge branch 'wuurrd-master' 2015-01-09 22:11:54 +09:00
Roy Hyunjin Han
315b795a91 Merge conflicts 2015-01-09 22:11:45 +09:00
Roy Hyunjin Han
698d083665 Merge pull request #60 from valhallasw/master
Python 3: use urllib.parse.urlparse
2015-01-09 20:35:58 +09:00
Roy Hyunjin Han
88bf4c0bcc Merge branch 'leth-patch-1' 2015-01-09 20:23:35 +09:00
Roy Hyunjin Han
b394c8a55a Merge contribution from leth 2015-01-09 20:23:31 +09:00
Roy Hyunjin Han
5f27c22681 Merge remote-tracking branch 'origin/master' into 0.6.0 2015-01-09 20:08:41 +09:00
Roy Hyunjin Han
cdfbe55203 Merge pull request #55 from stackmagic/allow-nonstandart-resource
allow to pass in a different resource than just 'socket.io'
2015-01-09 20:07:54 +09:00
Roy Hyunjin Han
d73d6145f3 Merge pull request from drewhutchinson 2015-01-09 20:02:52 +09:00
Merlijn van Deen
f44485d3e2 Python 3: use urllib.parse.urlparse 2014-12-30 17:37:37 +01:00
Roy Hyunjin Han
63dea4f7a3 Wrote basic connect() 2014-12-22 12:38:40 +09:00
Roy Hyunjin Han
eda747ec4e Use GET request to get pong 2014-11-30 05:58:02 -05:00
Roy Hyunjin Han
cbdf009d46 Add content-type 2014-11-30 05:17:22 -05:00
Roy Hyunjin Han
a0b061cbdc Use single quotes 2014-11-27 02:14:51 -05:00
Roy Hyunjin Han
9611d5d107 Merge pull request #57 from jorgen-k/master
Fix SSL timeout error thansk to jorgen-k
2014-11-26 22:43:16 -05:00
Roy Hyunjin Han
c3428e0b68 Working through parse error on send 2014-11-25 06:01:53 -05:00
Roy Hyunjin Han
895d2447fd Experiment with socket.io 1.2.0 2014-11-18 10:45:22 -05:00
Roy Hyunjin Han
64d1c010a9 Update __init__.py 2014-11-18 10:42:57 -05:00
Roy Hyunjin Han
1c2a313002 Merge pull request #58 from antonzy/master
Working migration to 3.4.1
2014-11-18 10:38:32 -05:00
Roy Hyunjin Han
7254172545 Save experiments 2014-11-17 18:43:25 -05:00
jorgen
b0d67b98af Version bump 2014-09-23 06:27:27 +02:00
antonzy
e108c8a12a Migrate to 3.4 2014-09-22 17:12:08 +03:00
antonzy
9a80988e26 Migrate to 3.4 2014-09-22 17:08:44 +03:00
jorgen
557edb8620 SSL Timeout error 2014-09-15 21:39:11 +02:00
Patrick Huber
9285f3da02 allow to pass in a different resource than just 'socket.io' 2014-07-28 09:09:59 +02:00
David Buchmann
20b15872ee Fixed logging.WARNING typo 2014-06-26 14:42:25 +02:00
fredericsureau
6a5a35d84d Force packets encoding to utf-8 2014-03-21 18:02:03 +01:00
Frédéric Sureau
c82a8301bb Use HTTP headers for Websocket connection 2014-02-25 14:56:44 +01:00
drewhutchison
8f97e73bac check for exit condition before transport reconnects 2014-02-12 15:07:36 -07:00
Brad Campbell
e16652c4cc Make on_reconnect callback functional
Previously, if the socket.io connection got interrupted and reconnected
the on_connect callback got called again. I noticed that there is a
on_reconnect function to overide in the base namespace class, but since
there is no socket.io command corresponding to on_reconnect it never
gets called.

This commit adds a check to see if we have been connected before, and if
so, calls the on_reconnect callback instead of the on_connect callback agin.
2014-01-10 18:29:57 -05:00
Daniel
6bef8c0009 heartbeat_time independent from elapse_time 2014-01-01 14:48:15 +01:00
Marcus Cobden
fa454b5950 Catch AttributeError in client connected check
If the client has never connected, there will be no __transport attribute.
2013-12-23 13:46:37 +00:00