215 Commits

Author SHA1 Message Date
Erik
31a41072c3 fix warning 2015-04-08 17:14:56 -04:00
Erik
a0dff2fea4 Merge branch '1.2' 2015-04-08 17:07:59 -04:00
Erik
acdb29dca4 add message about @objc_block 2015-04-08 11:10:35 -04:00
Erik
d8ea3a3c11 merge master 2015-04-07 21:56:36 -04:00
Erik
ac28c7541e fix socketio/socket.io-client-swift#46 2015-04-07 21:53:14 -04:00
Erik
fcc202ab04 fix indentation 2015-04-07 13:33:48 -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
63cbf49448 fixes 2015-04-04 10:47:53 -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
da1cf9eb89 socketio/socket.io-client-swift#37 2015-03-28 16:16:03 -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
81d58fbd69 fix nsp for default 2015-03-27 12:22:59 -04:00
Erik
c4731dc298 don't crash if nsp starts with / 2015-03-27 12:21:05 -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
d308111a8f fix for 1.2 2015-03-27 11:35:02 -04:00
Erik
f669267f51 Merge branch 'master' into 1.2 2015-03-27 11:30:41 -04:00
Erik
98e0c355f9 add forcewebsockets option 2015-03-27 09:35:39 -04:00
Erik
2cae405d29 try and avoid bad engine states 2015-03-26 13:15:43 -04:00
Erik
f008f116a6 fix socketio/socket.io-client-swift#27 2015-03-26 10:13:30 -04:00
Erik
77532acbd3 merge master 2015-03-25 17:03:55 -04:00
Erik
9512c8b9ac change api 2015-03-25 12:02:45 -04:00
Erik
90f50a1c7e add missing file 2015-03-25 11:51:55 -04:00
Erik
182ba0017b fix nuclearace/Socket.IO-Client-Swift#12 better closing 2015-03-25 11:50:25 -04:00
Erik
5b897ddfea indentation 2015-03-24 14:13:21 -04:00
Erik
4e6b686f37 Merge branch 'master' into 1.2 2015-03-24 12:26:49 -04:00
Erik
9044de53d9 fix socketio/socket.io-client-swift#25 2015-03-24 11:05:03 -04:00
Erik
e34cb61ae2 merge master 2015-03-23 11:40:10 -04:00
Erik
61ad14f23b refactor remaking packets 2015-03-23 11:34:28 -04:00
Erik
03c24659f2 use static property 2015-03-22 15:13:44 -04:00
Erik
5e1a19f638 fix for 1.2 2015-03-22 15:12:01 -04:00
Erik
1d70305743 merge master 2015-03-22 15:10:12 -04:00
Erik
5533545adb performance 2015-03-22 13:19:53 -04:00
Erik
8fa8944672 fix for no args acks 2015-03-22 11:05:56 -04:00
Erik
dee508c0f7 fix race condition 2015-03-22 11:02:31 -04:00
Erik
4de422e7f1 tweaks 2015-03-22 09:53:25 -04:00
Erik
4629565aaf clean up 2015-03-22 08:39:24 -04:00
Erik
8b893ad85e refactor 2015-03-21 18:16:09 -04:00