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
489 Commits 24 Branches 210 Tags
bd84609fa3c8d40c1dbd89781cb61be4dfc6846f
Commit Graph

312 Commits

Author SHA1 Message Date
Arnout Kazemier
f0d85b5a3f Merge branch 'master' of https://github.com/LearnBoost/Socket.IO 2011-06-20 11:38:48 +02:00
Arnout Kazemier
becc612279 Fixed url generation 2011-06-20 11:38:12 +02:00
Guillermo Rauch
1c8b8000de Merge branch 'master' of github.com:LearnBoost/Socket.IO 2011-06-20 06:17:18 -03:00
Guillermo Rauch
3fda1e6d35 Fixes cross domain XHR on IE8/9 2011-06-20 06:16:50 -03:00
Arnout Kazemier
e97d414439 Removed console.log 2011-06-20 10:53:13 +02:00
Arnout Kazemier
09d80164c3 Merge branch 'master' of https://github.com/LearnBoost/Socket.IO 2011-06-20 08:49:58 +02:00
Guillermo Rauch
67c9d02a93 Fixed ack handling for regular messages. 2011-06-19 20:55:09 -03:00
Arnout Kazemier
98811fdbc2 Fixed cross port connection issues, and simplified the prepareURL stuff 2011-06-20 00:55:51 +02:00
Arnout Kazemier
59355dd877 Handle reconnect advice 2011-06-20 00:42:47 +02:00
Guillermo Rauch
0aeac333da Removed dead code 2011-06-19 19:11:41 -03:00
Guillermo Rauch
98a5792bf7 Build conflict. 2011-06-19 18:25:58 -03:00
Guillermo Rauch
2766f777db Changed; expose CORS feature detection from util. 2011-06-19 18:23:43 -03:00
Guillermo Rauch
d392d132c0 Fixed; before we were handling a forced client disconnection as a transport 
disconnection, which is conceptually wrong as the connection was healthy.
 2011-06-19 18:23:02 -03:00
Guillermo Rauch
e8bea5cc1e Fixed; avoid reconnection on forced client disconnections (both for when the server 
kicks a client and the client disconnects itself.
 2011-06-19 18:22:09 -03:00
Guillermo Rauch
e6e34d461e Added Socket#disconnectSync private function. 2011-06-19 18:21:51 -03:00
Guillermo Rauch
a96df88297 Changed; make sure to attach a reason to forced client disconnection to attach a reason to forced client disconnection 2011-06-19 18:21:23 -03:00
Guillermo Rauch
ba96bff4f0 Removed sync logic from main disconnect function. 2011-06-19 18:21:01 -03:00
Guillermo Rauch
565974b651 Removed sync option from Socket#disconnect. 2011-06-19 18:20:13 -03:00
Guillermo Rauch
cfad7509ec Fixed style. 2011-06-19 18:19:58 -03:00
Guillermo Rauch
7080cd0145 Fixed sync disconnect packet, as it can only be done for non-cross domain situations 
and browsers with CORS (XDomainRequest does not allow for sync requests).
 2011-06-19 18:19:12 -03:00
Guillermo Rauch
0c49ee9ef0 Fixed json and message packets. 2011-06-19 18:18:46 -03:00
Guillermo Rauch
c5b7222866 Fixed; disconnect packet for namespace '' means total socket disconnection, and 
otherwise we just fire the `disconnect` event for the namespace.
 2011-06-19 18:16:26 -03:00
Guillermo Rauch
6075360235 Changed; handled connect packet type separately on socket namespaces. 2011-06-19 18:16:02 -03:00
Guillermo Rauch
5a2ff26d5e Added missing SocketNamespace#disconnect. 2011-06-19 18:15:27 -03:00
Arnout Kazemier
db7b2a01a9 Fixed io.connect, should take argument 2011-06-19 22:06:22 +02:00
Arnout Kazemier
9d4d06c5a6 Fixed socket.json.send and socket.json.emit 2011-06-19 20:08:53 +02:00
Arnout Kazemier
1509fbcb19 Removed option.host, it should be provided by default in the constructor 2011-06-19 19:40:09 +02:00
Arnout Kazemier
6363b62f43 Fixed #188 and fixed a bug where secure wasn't correctly set 2011-06-19 19:27:07 +02:00
Arnout Kazemier
0b2ee0849f Styling 2011-06-19 19:10:14 +02:00
Arnout Kazemier
52e578d410 Fixed json and messages, we should have used $emit 2011-06-19 12:16:26 +02:00
Arnout Kazemier
c35b8405d1 use indexOf instead of array.indexOf because thats not supported in IE 2011-06-18 22:28:30 +02:00
Arnout Kazemier
2d84ede3e4 don't emit errors when we are reconnecting 2011-06-18 22:17:33 +02:00
Guillermo Rauch
7f5e870b6e Default port to 443 in node 2011-06-18 15:22:16 -03:00
Guillermo Rauch
2b9b5493d0 Fixed; made removeAllListeners behavior with no arguments consistent between 
browser and node 0.4.
 2011-06-18 13:37:34 -03:00
Arnout Kazemier
4a17931d37 Merge branch 'master' of https://github.com/LearnBoost/Socket.IO into develop 
Conflicts:
	dist/socket.io.js
	dist/socket.io.min.js
 2011-06-18 16:56:51 +02:00
Guillermo Rauch
2c0f966728 Added default port as 443 if the port is specified but the uri protocol is secure 
and the page is not being transmitted over SSL.
 2011-06-18 11:30:24 -03:00
Arnout Kazemier
fc4b8c382e Include flashsocket above the websocket fallback so we can disable the 
AUTO-INITIALIZE before the code gets executed, preventing a double init call
 2011-06-18 16:18:22 +02:00
Guillermo Rauch
fe2ae1fa6c Fixed situation where there's a location.port but we're using https://, in which 
case we want to do 443.
 2011-06-18 11:09:54 -03:00
Arnout Kazemier
6a9207369c Added flashsocket to the /transports. 
The transport check now sends the socket instance so we can leverage methods
of that inside the check.
Updated the builder to also include flashsocket
 2011-06-18 16:07:05 +02:00
Arnout Kazemier
9a98a3ed21 Merge branch 'master' of https://github.com/LearnBoost/Socket.IO into develop 2011-06-18 01:19:57 +02:00
Guillermo Rauch
86b48908ce Whitespace fix 2011-06-17 19:33:12 -03:00
Arnout Kazemier
a67e909a0a Removed console.log 2011-06-17 22:39:41 +02:00
Guillermo Rauch
d203aea337 Changed; made framing shorter for json-p iframe POST. 2011-06-17 14:54:58 -03:00
Arnout Kazemier
ee7d4e6a9f better websocket detection + sniffing for WebSocket fallback 2011-06-17 11:19:47 +02:00
Arnout Kazemier
6ff99cd9f5 Merge branch 'master' of https://github.com/LearnBoost/Socket.IO into develop 2011-06-17 11:08:13 +02:00
Guillermo Rauch
b69d5e5ccb Fixed opera stateChange() 2011-06-17 01:52:13 -03:00
Arnout Kazemier
96a45713bc Merge branch 'master' of https://github.com/LearnBoost/Socket.IO into develop 2011-06-16 22:29:19 +02:00
Guillermo Rauch
27325a56a7 Fix for op precedence. 2011-06-16 16:37:09 -03:00
Guillermo Rauch
c6bdadcf05 Fixed XHR on opera. 2011-06-16 16:02:58 -03:00
Guillermo Rauch
67980da371 Removed unneeded check. 2011-06-16 16:02:42 -03:00