github/socket.io
1
1
Fork 0
mirror of https://github.com/socketio/socket.io.git synced 2026-04-30 03:00:39 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,157 Commits 24 Branches 210 Tags
fb17a52bc9321daeeb9ffa5dc8d79458798f8213
Commit Graph

1157 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guillermo Rauch
fb17a52bc9 fix base64 test 2014-06-17 14:12:03 -07:00
Guillermo Rauch
b3129141e4 fix indent 2014-06-17 10:56:03 -07:00
Guillermo Rauch
570bcd0626 fix SCRIPT5022: SecurityError on IE 
this error is not caused by cross-domain, but by the limit
on how many open connections the tab might have

thus we close each connection after the test is done
 2014-06-17 09:34:41 -07:00
Guillermo Rauch
1c35f9ac32 Merge branch 'master' of github.com:automattic/socket.io-client 2014-06-17 08:09:14 -07:00
Guillermo Rauch
1d8630a874 socket: whitelist connect_error and connect_timeout (fixes #534) 2014-06-17 08:08:52 -07:00
Guillermo Rauch
8a77f1ebe3 socket: whitelist connect_error and connect_timeout 2014-06-17 08:01:56 -07:00
Guillermo Rauch
1b60056793 Merge pull request #697 from rase-/fix/tests 
Delete bad test, set timeouts before disconnecting eioc
 2014-06-16 17:27:30 -07:00
Tony Kovanen
5834fed8a9 Delete bad test, set timeouts before disconnecting eioc 2014-06-17 03:24:28 +03:00
Guillermo Rauch
b282b9654e Merge branch 'master' of github.com:automattic/socket.io-client 2014-06-16 14:56:08 -07:00
Guillermo Rauch
c511c7544a package: bump engine.io-client 2014-06-16 08:35:45 -07:00
Guillermo Rauch
bcba6b1aab Merge pull request #693 from holic/fix-url-port 
url: use strings for port, eqeq for port check
 2014-06-13 19:19:42 -07:00
Guillermo Rauch
7dcb4dcc9d Merge pull request #695 from audreyt/patch-1 
Handle io.connect(null, opts) correctly
 2014-06-13 19:16:24 -07:00
唐鳳
84da0c910e Handle io.connect(null, opts) correctly 
In migrating to Socket.IO 1.0.x, we had to change `null` into `"/"` in:

```
io.connect(null, opts)
```

( See adbc86e529 (diff-d87f0347aff1316677a2d709ec4b4777R49) )

This is because `typeof null` is `object`, so the options are discarded.

Fixed by checking for truth value of `uri` before checking its type.
 2014-06-14 06:26:42 +08:00
Kevin Ingersoll
9c7a0a34fe url: use strings for port, eqeq for port check 2014-06-13 14:38:50 -07:00
Guillermo Rauch
095acb49ce package: fix component-emitter 2014-06-13 12:39:19 -07:00
Guillermo Rauch
b177528107 Merge branch 'master' of github.com:automattic/socket.io-client 2014-06-13 12:35:57 -07:00
Guillermo Rauch
31d39285bd package: fix duplicate parser [Rase-] 2014-06-13 12:35:46 -07:00
Guillermo Rauch
f4c65a6ba0 Merge pull request #692 from rase-/add/reconnection-events-to-socket 
Reconnection events propagated to socket
 2014-06-13 11:26:57 -07:00
Tony Kovanen
3c6237f051 Rename propagateEvent to emitAll 2014-06-13 21:26:31 +03:00
Tony Kovanen
b9c4816aca Document events 2014-06-13 21:21:51 +03:00
Tony Kovanen
be3f3c4bb5 Use blacklist instead of internal emit function 2014-06-13 21:21:28 +03:00
Tony Kovanen
f15104dcba style 2014-06-13 20:27:39 +03:00
Guillermo Rauch
544aae4079 Merge pull request #682 from kevin-roark/add/emit-buffer 
add a buffer for emitted events to only send after connection
 2014-06-13 10:10:34 -07:00
Tony Kovanen
57551c1462 Propagate events to sockets without an internal event listener in Manager 2014-06-13 14:14:57 +03:00
Tony Kovanen
109395ee34 Propagating reconnecting and reconnection events to socket 2014-06-13 03:45:41 +03:00
Tony Kovanen
a20671c511 Propagate reconnection events to socket from manager 2014-06-13 03:28:38 +03:00
Guillermo Rauch
4d51b9f9a0 Merge pull request #655 from holic/fix-url-port 
Fix incorrect ports in connection URL
 2014-06-12 15:00:27 -07:00
Kevin Ingersoll
d08acd89c7 Use explicit port on url ID, not on url href 2014-06-12 14:32:39 -07:00
Kevin Ingersoll
f09d2b439c Fix protocol regex, use falsy port, use href as unique ID 2014-06-12 14:16:07 -07:00
Kevin Ingersoll
67d077af2e Fix ports when connecting to 80/443 from non-80/443 host 2014-06-12 14:15:57 -07:00
Guillermo Rauch
1efe0d05c5 index: added BC for force new connection 2014-06-06 09:06:54 -07:00
Guillermo Rauch
0791a86d67 Merge pull request #687 from reid/deps 
Merge-ready @davglass deps PR: component-emitter@1.1.2, component-bind@1.0.0
 2014-06-04 15:26:13 -07:00
Reid Burke
e07cec53a0 Merge branch 'deps' of github.com:davglass/socket.io-client into deps 
Conflicts:
	package.json
 2014-06-04 15:20:44 -07:00
Guillermo Rauch
b6db0bb9b6 Update package.json 
Fixes #673
 2014-06-03 15:38:32 -07:00
Guillermo Rauch
658b8fd36c Release 1.0.4 2014-06-02 20:08:33 -07:00
Kevin Roark
8e76ec1717 add a buffer for emitted events to only send after connection 2014-06-01 23:18:02 -07:00
Guillermo Rauch
fa60e791e9 Release 1.0.3 2014-05-31 18:34:49 -07:00
Tony Kovanen
5c3e0af944 Merge pull request #678 from rase-/bump/server 
Bump socket.io
 2014-05-31 21:54:20 +03:00
Tony Kovanen
4bf3d7b7ca Bump socket.io 2014-05-31 21:52:57 +03:00
Guillermo Rauch
36792e2b81 README: remove old notice 2014-05-31 11:37:17 -07:00
Guillermo Rauch
3a6cf6c967 Merge branch 'master' of github.com:automattic/socket.io-client 2014-05-31 11:36:34 -07:00
Guillermo Rauch
dc9881caed Merge pull request #677 from rase-/fix/tests 
Fix tests
 2014-05-31 09:49:04 -07:00
Tony Kovanen
57c85897bb Update socket.io dev dependency 2014-05-31 13:46:19 +03:00
Guillermo Rauch
6b67b9ce13 README: fix travis 2014-05-30 21:24:16 -07:00
Guillermo Rauch
62adb5efcd package; bump socket.io-parser for binary ack fix 2014-05-30 21:11:29 -07:00
Guillermo Rauch
647b51ef0b Merge pull request #676 from kevin-roark/add/binary-ack 
distinction between ACK and BINARY_ACK
 2014-05-30 20:49:05 -07:00
Kevin Roark
b43ef06adf distinction between ACK and BINARY_ACK 2014-05-30 18:42:42 -07:00
Guillermo Rauch
79e00801bd Merge pull request #674 from rase-/add/utf8-tests 
Add tests for utf8 multibyte chracters
 2014-05-30 15:48:47 -07:00
Tony Kovanen
8d5ef935de Add tests for utf8 multibyte chracters 2014-05-31 01:39:44 +03:00
Guillermo Rauch
f5b75b0a0e package: bump engine.io-client for binary utf8 fix 2014-05-30 14:09:33 -07:00