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
461 Commits 24 Branches 210 Tags
1059147fa3b11f25ee5f7d0a0729c1a433ae28af
Commit Graph

461 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guillermo Rauch
1059147fa3 Merge pull request #141 from pokermania/to_learnboost_20130130 
close socket if upgrade is received and socket.readyState != open
 2013-02-08 08:17:08 -08:00
Guillermo Rauch
59281c0e56 Merge pull request #145 from st3redstripe/spelling 
Fix spelling errors
 2013-02-08 07:53:37 -08:00
stephen-bradshaw
f2bc5190b4 fix spelling errors 2013-02-08 09:27:52 +00:00
Guillermo Rauch
1d7157622e Merge pull request #144 from shtylman/fix-multiple-paths 
Only end upgrade socket connections if unhandled
 2013-01-31 19:44:14 -08:00
Roman Shtylman
fd36eeaf02 Only end upgrade socket connections if unhandled 
This fixes an issue where multiple engine.io instances (on different
paths) would result in the closing of websocket connections for all of
the instances. This happened because each engine.io instance would
register an `upgrade` handler on the server. This handler would check
for a matching path and otherwise call `socket.end()` Since multiple
upgrade events would be triggered with different paths, the peer
handlers would close each other.

This patch resolves this behavior in the following way:
- When an instance upgrade handler encounters a path which it does not
  recognize it creates a timeout for `destroyUpgradeTimeout`.
- At the end of the timeout, the socket is checked for writable state
  and bytes written. If there has been not activity and the socket is
  writable, then it will be ended.

This allows for peer socket handlers to keep the socket alive by sending
some data over it. This also mimics the core node behavior of closing
sockets on upgrade when no handler is specified. We consider not
handling an upgrade request similar to no handler. However, we cannot
immediately end the socket for the reasons noted above.

fixes #143
 2013-01-31 22:42:11 -05:00
Guillermo Rauch
150d2bfb0c Merge pull request #142 from shtylman/fix-package-deps 
fix websocket dependency
 2013-01-30 15:02:18 -08:00
Roman Shtylman
ee475f10f2 fix websocket dependency 
listing the dependency in dev dependencies clobbers the actual
dependency
 2013-01-30 17:25:56 -05:00
Andor Goetzendorff
4ef40991be close socket if upgrade is received and socket.readyState != open 2013-01-30 16:57:44 +01:00
Guillermo Rauch
0d718b4a9c Release 0.4.1 2013-01-27 10:25:47 -08:00
Guillermo Rauch
86c0b9e186 package: buped engine.io-parser 2013-01-26 09:00:49 -08:00
Guillermo Rauch
03c8c353c4 Merge pull request #137 from sweetieSong/ExtractParser 
Extract parser
 2013-01-26 08:57:00 -08:00
Sweet
b69264dad9 Removed the lib/index in all the files 2013-01-19 14:27:17 -08:00
Sweet
82ef6b416c Adding .tracis.yml for first build 2013-01-19 13:25:18 -08:00
Sweet
90c0cd0e3f parser.js: deleted 
package.json: updated the version for the client
everything else: fixed paths/requirements to the new protocol/parser repo
 2013-01-19 13:14:00 -08:00
Sweet
dd5a4cb939 Merge branch 'master' of github.com:LearnBoost/engine.io into ExstractParser 
Conflicts:
	package.json
 2013-01-19 12:37:37 -08:00
Sweet
face92f018 paerse.js: modified parser to be used with the parser repo 
package.json: updated with the correct parser dependency
common.js: changed the parser path
server.js: also changed the parser path
 2013-01-19 12:25:31 -08:00
Guillermo Rauch
851890c07c Merge pull request #136 from xixixao/master 
package:add git repo url
 2013-01-19 11:20:58 -08:00
Michal Srb
782bf6505a package:add git repo url 2013-01-19 18:57:25 +00:00
Michal Srb
ac120a16ed Merge remote-tracking branch 'upstream/master' 2013-01-19 18:40:44 +00:00
Michal Srb
6c479b36e5 Merge remote-tracking branch 'origin/master' 2013-01-19 18:40:13 +00:00
Guillermo Rauch
1c68636575 Merge pull request #134 from xixixao/master 
WebSocket setTimeout wrap when on iOS
 2013-01-19 10:36:13 -08:00
Guillermo Rauch
9011a0e0d4 Merge pull request #135 from xixixao/fix/119 
Fixed should trigger ping timeout test
 2013-01-19 10:26:37 -08:00
Michal Srb
86366e86a5 Fixed should trigger ping timeout test 2013-01-19 18:20:25 +00:00
Michal Srb
60c61af68e websocket:Improve send method 2013-01-19 18:15:32 +00:00
Michal Srb
ef6d89b3d5 Fixed should trigger ping timeout test 2013-01-19 17:45:13 +00:00
Michal Srb
bc5ba93296 WebSocket setTimeout wrap when on iOS 2013-01-19 04:26:03 +00:00
Guillermo Rauch
0b9d9c4efa Merge pull request #133 from xixixao/master 
Bump up version in package
 2013-01-18 15:53:09 -08:00
Michal Srb
8f0f586934 package: bumped versions 2013-01-18 23:48:06 +00:00
Guillermo Rauch
a103bd5e19 Merge pull request #132 from roamm/send_packet_callback 
Fixed bugs in the previous send callback fix and added new test cases
 2013-01-16 10:38:33 -08:00
roam
148f654c92 Fixed bugs in previous send callback fix and updated test cases 2013-01-16 17:31:42 +08:00
roam
72861f3d49 Added a test case which makes the code before the send callback fix fail 2013-01-16 15:13:50 +08:00
roam
06b39687eb Fixed send callback test failures 2013-01-16 14:35:56 +08:00
roam
41ee77e3c6 Revert "Revert "Fixed packet send callback design issue"" 
This reverts commit ead08d6e5b.
 2013-01-15 17:17:47 +08:00
Guillermo Rauch
ead08d6e5b Revert "Fixed packet send callback design issue" 
This reverts commit 0dfa68c710.
 2012-12-26 17:19:41 -03:00
Guillermo Rauch
3c968fcb55 Merge pull request #130 from roamm/packet_send_callback 
Fixed packet send callback issues
 2012-12-26 12:15:06 -08:00
roam
0dfa68c710 Fixed packet send callback design issue 
There were two issues here.
1. When Socket.send called with or without callback alternately,
   the trigger order is incorrect.
2. The 'drain' event from transport is one per packet for transports
   supporting framing like websocket and is all in one for those without
   framing like polling.
 2012-12-20 00:49:32 +08:00
Guillermo Rauch
9d9fe9e2e2 socket: emit data event (synonym with message) 2012-12-17 09:57:54 -03:00
Guillermo Rauch
95ded5d885 engine.io: style 2012-12-17 08:45:14 -03:00
Guillermo Rauch
12f1821f1c socket: added Socket#write 2012-12-16 23:35:42 -03:00
Guillermo Rauch
01e06d7a4f engine.io: cleanup 2012-12-16 20:35:54 -03:00
Guillermo Rauch
c59bb42e85 engine.io: deprecated resource 2012-12-16 20:25:08 -03:00
Guillermo Rauch
73c772d0b3 Revert "engine.io: added middleware attachment possibility (eg: for express)" 
This reverts commit 7b3243dbea.
 2012-12-16 18:49:06 -03:00
Guillermo Rauch
be99036ebc package: bumped versions 2012-12-13 12:30:41 -03:00
Guillermo Rauch
c10a9ae6a0 test: adapted version checking for 0.4 2012-12-13 12:30:26 -03:00
Guillermo Rauch
7b3243dbea engine.io: added middleware attachment possibility (eg: for express) 2012-12-13 12:29:37 -03:00
Guillermo Rauch
7e0cdcad42 Merge pull request #128 from Raynos/patch-1 
`npm docs engine.io` works now
 2012-12-07 02:15:49 -08:00
Raynos
aad92df830 Update package.json 2012-12-06 21:50:30 -08:00
Raynos
640b760f58 npm docs engine.io works now 2012-12-06 21:49:56 -08:00
Guillermo Rauch
ebc1bebefa Merge pull request #126 from venportman/patch-1 
Update README.md
 2012-12-04 19:20:57 -08:00
ven
d336a12228 Update README.md 
fixed spelling error 'chaning' > 'changing'
 2012-12-04 22:04:06 -05:00