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
7,693 Commits 24 Branches 210 Tags
engine.io@6.6.6
Commit Graph

7693 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ddivernois
22b2fc78f6 Fixed calls to addEventListener which requires 3 parameters in old browsers 2014-10-08 14:06:33 +02:00
Tony Kovanen
b72c7f1530 Merge pull request #34 from divdavem/phantomJS 
Avoid sending Blobs on PhantomJS (as on Android)
 2014-10-06 12:40:17 +03:00
ddivernois
d2e1e94ef5 Avoid sending Blobs on PhantomJS (as on Android) 
Uploading a Blob with PhantomJS does not work correctly, as reported here:
https://github.com/ariya/phantomjs/issues/11395
 2014-10-06 11:13:11 +02:00
Alex Jeng
136fe960b7 Made comments more consistent 2014-10-05 22:10:13 -07:00
Guillermo Rauch
51f0528417 Merge pull request #352 from rase-/fix/defer-until-drain 
Fixed transport close deferring logic.
 2014-10-04 18:05:54 -07:00
Tony Kovanen
b462865bcb Fixed transport close deferring logic. 
Transport can still be upgrading after deferring until the drain event.
 2014-10-05 03:01:50 +03:00
Guillermo Rauch
0cc7cdfe6c Merge pull request #289 from rase-/fix/jsonp-test 
Add iframe onload handling to jsonp tests.
 2014-10-04 16:13:00 -07:00
Tony Kovanen
c89b085556 Add iframe onload handling to jsonp tests. 
`onload` handling required for the `drain` event to fire. We need this
for some tests that look at socket closing.
 2014-10-05 02:11:23 +03:00
Guillermo Rauch
cbbe44fba8 Merge pull request #351 from nkzawa/patch-6 
wait for buffer to be drained before closing
 2014-10-04 13:25:18 -07:00
Naoyuki Kanezawa
866a56ed20 wait for buffer to be drained before closing 2014-10-04 21:57:35 +09:00
Guillermo Rauch
3eb5b8929d Release 1.4.1 2014-10-03 10:17:39 -07:00
Guillermo Rauch
72c32caf3a Release 1.4.1 2014-10-03 10:17:38 -07:00
Guillermo Rauch
457d2fe5cc Merge pull request #349 from aaronk6/jsonpOnCloseFix 
Fixed "jsonp polling iframe removal error" on connection close
 2014-10-03 08:26:39 -07:00
Guillermo Rauch
aac04dfc98 Merge pull request #285 from lpinca/fix/gh-284 
socket: allow upgrades if the socket is still in closing state (courtesy of @3rd-Eden)
 2014-10-03 08:22:27 -07:00
Tony Kovanen
eafcf0b323 Merge pull request #762 from haqii/master 
Update repository url
 2014-10-03 17:11:54 +03:00
haqii
76850bef1b Update repository url 2014-10-03 22:08:12 +08:00
aaronk6
d9f4317bae Fixed "jsonp polling iframe removal error" on connection close when using polling (JSONP) transport 2014-09-30 12:29:52 +02:00
Luigi Pinca
00caf543b8 socket: allow upgrades if the socket is still in closing state 
Fixes #284, courtesy of @3rd-Eden
 2014-09-26 16:01:11 +02:00
李鑫(媒体内容业务线.202368)
0d4cda1fbb Bump debug module 2014-09-26 09:29:32 +08:00
Tony Kovanen
b4c1d063d4 Merge pull request #346 from rase-/fix/tests 
Move ws upgrade needing connection tests to a block checking browser support
 2014-09-26 01:43:32 +03:00
Tony Kovanen
16f1a06d97 Move ws upgrade needing connection tests to a block checking browser support. 2014-09-26 01:41:43 +03:00
Guillermo Rauch
0097a5e255 Merge pull request #324 from nkzawa/patch-5 
Defer close while upgrading a transport
 2014-09-25 15:32:33 -07:00
Tony Kovanen
da358084f0 Merge pull request #1773 from AjayMT/master 
Fix usage example for Server#close.
 2014-09-26 01:13:18 +03:00
Tony Kovanen
f9efb1eae6 Merge pull request #254 from pawelatomic/master 
added missing support for XSS filters on IE
 2014-09-25 23:51:48 +03:00
Tony Kovanen
522215951b Merge pull request #280 from reem/patch-1 
README: Fix typo http_server.
 2014-09-25 23:39:41 +03:00
Guillermo Rauch
d4b4051290 Merge pull request #7 from keskival/master 
Updated the dependency version to be compatible with a current stack.
 2014-09-25 10:20:50 -07:00
Tero Keski-Valkama
f2cdb95985 Merged. 2014-09-25 19:50:29 +03:00
Tony Kovanen
1b4f6a5324 Merge pull request #1777 from akamensky/dynamic-cors 
Dynamic cors
 2014-09-22 13:38:14 -06:00
Tony Kovanen
99346eddc5 Merge pull request #1788 from jamesanthonyferguson/patch-1 
Change grammar issues in the chat/README.md
 2014-09-22 12:42:59 -06:00
Tony Kovanen
051ffa0440 Merge pull request #1626 from thanpolas/patch-1 
http.Server is a constructor
 2014-09-22 12:42:10 -06:00
Tony Kovanen
fa4fa3365a Merge pull request #1690 from rase-/fix/resource-option-bc 
Fix resource option BC with the set function
 2014-09-22 12:27:35 -06:00
Tony Kovanen
bafa184c6b Merge pull request #1792 from rase-/add/autopruning-test 
Add room autopruning test
 2014-09-22 12:25:23 -06:00
Tony Kovanen
baf60c1502 Merge pull request #732 from nkzawa/patch-10 
Enable to reconnect manually
 2014-09-21 14:18:50 -06:00
Tony Kovanen
e3149d5833 Bump adapter version. 2014-09-20 11:12:58 -06:00
Tony Kovanen
ae9d5277a9 Add test to check that empty rooms are autopruned. 2014-09-20 11:12:26 -06:00
Guillermo Rauch
006f19a225 Merge pull request #12 from rase-/fix/room-autopruning 
Fix room autopruning
 2014-09-19 23:25:17 -06:00
Tony Kovanen
3e6489bf71 Make the room exists when autopruning. 2014-09-19 18:07:08 -06:00
Tony Kovanen
2e061ee733 Fix room autopruning 2014-09-19 18:02:44 -06:00
James Ferguson
2e440722a6 Change grammar issues in the chat/README.md 
Added a few periods and commas which were missing. Also added the word each to clarify how multiple users each enter a unique username.
Very minor edit. No source code changed.
 2014-09-18 21:41:28 -07:00
Tony Kovanen
3fe6d4e8ec Merge pull request #1784 from matthewcanty/patch-1 
Change "there're" to "there are"
 2014-09-17 07:41:46 -06:00
Matthew Canty
3b93c1c562 Change "there're" to "there are" 
Not a commonly used contraction and looks a bit odd.
 2014-09-17 14:01:01 +01:00
akamensky
e89f82a9b0 Added Server#origins(v:Function) description for dynamic CORS 2014-09-12 11:32:20 +08:00
akamensky
1b90ae2587 Added test coverage for Server#origins(function) for dynamic CORS 2014-09-12 11:13:51 +08:00
akamensky
9658e32e7a Added optional Server#origins(function) for dynamic CORS 2014-09-12 10:53:14 +08:00
Tony Kovanen
99d76664aa Merge pull request #1766 from BrianGeppert/master 
package: fix main file for example application 'chat'.
 2014-09-11 18:05:58 +03:00
Guillermo Rauch
7912f14c94 Merge pull request #754 from toshipon/patch-1 
Support no schema relative url
 2014-09-11 17:56:17 +03:00
Tony Kovanen
4eb590e3e6 Merge pull request #342 from rase-/Inventorum 
Fixed problem when XHR would send in header "application/octet-stream; charset=utf-8" -- rebased
 2014-09-11 17:45:53 +03:00
Michał Hernas
f63735b35c Fixed problem when XHR would send in header "application/octet-stream; 
charset=utf-8", then Request.data would be "ok" instead of proper data
 2014-09-11 17:41:30 +03:00
Tony Kovanen
7793a33e04 Merge pull request #10 from rase-/patch-1 
Add autoprunning of empty rooms - rebased
 2014-09-11 16:52:38 +03:00
Tony Kovanen
b49b781f12 Style 2014-09-11 16:47:07 +03:00