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,182 Commits 24 Branches 210 Tags
8cc2f574518eee1c35ffed226515facff1b28462
Commit Graph

1182 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Naoyuki Kanezawa
8cc2f57451 fix autoConnect option 2014-07-16 03:59:43 +09:00
Guillermo Rauch
70087e8abf Merge pull request #713 from Automattic/update/browserify-v4 
Update "browserify" to v4.1.11
 2014-07-01 00:15:27 -07:00
Nathan Rajlich
66ef715ee8 build 2014-06-26 10:20:06 -07:00
Nathan Rajlich
36754ef8e5 package: update "browserify" to v4.1.11 2014-06-26 10:19:44 -07:00
Guillermo Rauch
a3d653855c Merge pull request #711 from kevin-roark/update/has-binary-data 
update has-binary-data -> 1.0.3
 2014-06-24 11:08:06 -07:00
Kevin Roark
837aae2048 update has-binary-data -> 1.0.3 2014-06-23 20:27:41 -07:00
Guillermo Rauch
f8afcce007 Merge pull request #680 from FredyC/add-auto-connect 
Add autoConnect option
 2014-06-21 18:12:41 -07:00
Tony Kovanen
3340d6ed35 Merge pull request #708 from rase-/fix/reconnect_failed-double-fire 
Fix duplicate `reconnect_failed` event
 2014-06-21 17:28:30 +03:00
Tony Kovanen
05c96325fe Don't fire an extra reconnect when we're not reconnecting after a failed initial connect attempt 2014-06-21 17:22:34 +03:00
Guillermo Rauch
4f71fb04bd package: bump socket.io-parser for component-emitter dep fix 
cc @davglass @reid
 2014-06-20 16:57:15 -07:00
Guillermo Rauch
191b342e55 Release 1.0.6 2014-06-19 14:57:45 -07:00
Guillermo Rauch
7f363153cc package: bump engine.io-client 2014-06-19 14:51:20 -07:00
Tony Kovanen
b09370f895 Merge pull request #704 from rase-/fix/tests-on-ie 
Fix IE tests
 2014-06-19 03:21:34 +03:00
Tony Kovanen
f952b09e36 Fix possible security error on IE by closing all sockets 2014-06-19 03:20:18 +03:00
Tony Kovanen
c3d3b0b588 Fix error propagation test for old IE 2014-06-19 03:07:58 +03:00
Tony Kovanen
1bd6d6c309 Merge pull request #703 from rase-/event-propagation 
Added tests and enhanced event propagation
 2014-06-19 03:00:14 +03:00
Tony Kovanen
041c95e40a Added tests and enhanced event propagation 2014-06-19 02:58:22 +03:00
Guillermo Rauch
3f4ae6316d Merge pull request #702 from rase-/fix/duplicate-events-on-manual-reconnect 
Don't readd subs when reconnecting
 2014-06-18 13:21:58 -07:00
Tony Kovanen
ecc7ba8bda Only add subs once to begin with, so no need for an if for every .connect() call 2014-06-18 23:16:45 +03:00
Tony Kovanen
e5416ff741 Don't readd subs when reconnecting 2014-06-18 22:48:22 +03:00
Guillermo Rauch
799843b032 Release 1.0.5 2014-06-17 18:14:40 -07:00
Guillermo Rauch
1c68029030 Merge pull request #701 from rase-/fix/more-tests 
Test fixes.
 2014-06-17 17:03:51 -07:00
Tony Kovanen
8925b62e4e Test fixes. 
- Readded all the browsers to Zuul config.
- Fixed b64 encoding test, typo + we're better off asserting the actual b64
  encoding.
- Got rid of the base64-js dependency only needed by the test described above.
- Running iPhone tests for 6.0 and above due to some really weird timeout
  issues on older iPhone emulators, where tests do succeed when run
  individually (and fail on no other browser even together).
 2014-06-18 02:57:34 +03:00
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