97 Commits

Author SHA1 Message Date
Erik
332ff6f40b handle error message 2015-04-09 01:39:27 -04:00
Erik
67c41c0107 use new if let 2015-04-09 01:01:14 -04:00
Erik
a01e85ba05 Merge branch 'master' into engineerrors 2015-04-09 00:39:43 -04:00
Erik
0588556c17 1.2 fixes single statement closures 2015-04-08 23:57:07 -04:00
Erik
076bbfc782 commit fix for binary 2015-04-08 21:51:11 -04:00
Erik
01e5e22e0b merge master 2015-04-08 21:16:56 -04:00
Erik
14487a1beb use int for enum 2015-04-08 21:14:52 -04:00
Erik
eb5d03c88b redo types 2015-04-08 20:51:44 -04:00
Erik
473d422668 replace fatalError with an error method 2015-04-07 15:50:01 -04:00
Erik
eb56a8de9c merge master 2015-04-06 13:05:21 -04:00
Erik
eb9d2bc744 better closing 2015-04-06 12:59:39 -04:00
Erik
a4e81fee6a fix outstanding poll messages after switch to websockets 2015-04-06 12:49:39 -04:00
Erik
9489676009 use weak references to client 2015-04-06 11:56:47 -04:00
Erik
a17f2b6e7a merge master 2015-04-03 16:37:02 -04:00
Erik
838dade0fa Fix messages getting stuck in post 2015-04-03 16:18:15 -04:00
Erik
affd792334 redo acks 2015-04-03 16:04:50 -04:00
Erik
c1b0d3abeb merge master 2015-04-01 16:08:23 -04:00
Erik
f7b064d80f refactor SocketEngine#sendPing 2015-04-01 14:49:01 -04:00
Erik
918d40d68c Merge branch 'master' into 1.2 2015-03-31 14:27:35 -04:00
Erik
01a699c7c6 add return to pong message 2015-03-31 00:04:09 -04:00
Erik
5fffa685e9 merge master 2015-03-28 16:58:12 -04:00
Erik
93f1cfe9dc fix socketio/socket.io-client-swift#36 2015-03-28 16:54:48 -04:00
Erik
a61f1c8484 merge master 2015-03-27 12:41:49 -04:00
Erik
57731bebf8 Fix for first polling messages with unicode 2015-03-27 12:35:12 -04:00
Erik
a4361a04b6 style 2015-03-27 12:14:45 -04:00
Erik
ffcd841267 Fix binary acks 2015-03-27 12:13:06 -04:00
Erik
98e0c355f9 add forcewebsockets option 2015-03-27 09:35:39 -04:00
Erik
77532acbd3 merge master 2015-03-25 17:03:55 -04:00
Erik
182ba0017b fix nuclearace/Socket.IO-Client-Swift#12 better closing 2015-03-25 11:50:25 -04:00
Erik
1d70305743 merge master 2015-03-22 15:10:12 -04:00
Erik
4de422e7f1 tweaks 2015-03-22 09:53:25 -04:00
Erik
8b893ad85e refactor 2015-03-21 18:16:09 -04:00
Erik
504d0fbd18 merge master 2015-03-21 11:42:52 -04:00
Erik
6ac69d1c2d fix for acks 2015-03-20 20:51:06 -04:00
Erik
5388084c79 seems to be on par with the native js-client most of the time 2015-03-20 20:24:59 -04:00
Erik
18b8f992d9 Tweaks for performance 2015-03-20 15:23:38 -04:00
Erik
b576294232 merge master 2015-03-20 11:03:28 -04:00
Erik
4832be5c8a better parsing 2015-03-20 10:51:26 -04:00
Erik
d70db2a8be merge master 2015-03-19 15:05:29 -04:00
Erik
cbc59d6004 fix race condition 2015-03-19 14:13:03 -04:00
Erik
72d5c07de1 refactor 2015-03-19 14:04:02 -04:00
Erik
54b2da8395 work on redesign 2015-03-19 13:22:58 -04:00
Erik
15954f36f5 Merge branch 'master' into 1.2 2015-03-19 08:30:08 -04:00
Erik
fd3dbee71c fixes 2015-03-19 08:23:43 -04:00
Erik
84752b463a merge master 2015-03-18 18:39:53 -04:00
Erik
5b180a0a6d fix socketio/socket.io-client-swift#20, change objc api 2015-03-18 18:04:43 -04:00
Erik
bb26dd05f8 merge master 2015-03-18 14:03:53 -04:00
Erik
1a5487fec5 Merge branch 'auth' 2015-03-18 13:27:06 -04:00
Erik
07f2d7465a merge master 2015-03-18 13:11:02 -04:00
Erik
89ae9bd349 handle utf8 in polling better 2015-03-18 13:05:39 -04:00