Commit Graph

295 Commits

Author SHA1 Message Date
Guillermo Rauch
90d3286dad Merge pull request #336 from apeace/bug/socketio-1910
Fixes socket.io#1910 by calling transport.close() on ping timeout
2015-08-27 13:20:50 -07:00
Guillermo Rauch
dafce5d36e Merge pull request #340 from nkzawa/patch-4
Ensure sockets are closed on error
2015-08-27 13:19:18 -07:00
nkzawa
5efbf46626 ensure sockets are closed on error 2015-08-21 03:37:49 +09:00
nkzawa
54617e994a fix transport readyState 2015-08-21 02:15:26 +09:00
Andrew Peace
8e1f063c54 Fixes socket.io#1910 by calling transport.close() on ping timeout 2015-08-06 15:43:00 -04:00
Naoyuki Kanezawa
c78c6d82f3 fix a test failure 2015-06-17 01:10:22 +09:00
Naoyuki Kanezawa
30d9d7fa6a fix wrong packet referring 2015-05-31 16:05:25 +09:00
zensh
df4331dd1a support custom socket id 2015-05-08 10:24:32 +08:00
Naoyuki Kanezawa
99b709cadc Merge branch 'master' into compression
Conflicts:
	package.json
2015-01-22 03:52:22 +09:00
Naoyuki Kanezawa
d11e17c8d7 support compression 2015-01-06 02:11:39 +09:00
Luigi Pinca
9526e0d27f polling: correctly abort the ongoing data request when closing transport 2015-01-03 21:13:43 +01:00
Guillermo Rauch
80aa1aaa49 Merge pull request #291 from lpinca/close/pending-request
polling: close the pending poll request when closing transport
2014-11-15 15:06:55 +09:00
Luigi Pinca
e754f7eb23 socket: flush the write buffer before closing the socket (fixes #293) 2014-10-25 22:04:16 +02:00
Luigi Pinca
1d8e074398 polling: close the pending poll request when closing transport 2014-10-24 17:23:32 +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
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
Guillermo Rauch
681b4fc27b server: ref fix by @nicokaiser 2014-07-30 01:42:01 -07:00
Guillermo Rauch
01e173c8d5 server: fix ws memory leak (fixes #268) 2014-07-29 17:35:32 -07:00
Tony Kovanen
15afd3e2c3 Cache remote address in handshake since it might be lost later. 2014-07-19 04:47:38 +03:00
Dainis Tillers
c998d68631 Merge branch '1.1.1_newline_escape_fix' into newline_escape_fix 2014-06-13 15:06:45 +03:00
Dainis Tillers
de0b4a9d4a Fixed - previously any json message which contained a newline would fail to parse as it would replace escaped newline incorrectly 2014-06-13 15:03:46 +03:00
Guillermo Rauch
2ec3d89d4b Merge pull request #213 from defunctzombie/server_attach
add Server.attach method
2014-06-04 11:16:57 -07:00
Roman Shtylman
b8366057d2 lib: remove unused file 2014-06-04 13:45:48 -04:00
Roman Shtylman
48f006f947 make require('engine.io')() return a new Server instance
fixes #212
2014-06-04 13:45:48 -04:00
Roman Shtylman
cb2b80afd9 remove lib/index.js
Needless level of indirection which blocks actually reading the
important parts of the code.
2014-06-04 13:45:47 -04:00
Roman Shtylman
d3ed8418a8 remove unused require 2014-06-04 13:45:47 -04:00
Roman Shtylman
d74f93e4f9 add Server.attach method
This method does what engine.attach use to do but is now on the
instantiated server instance. This makes it possible to create engine.io
servers without yet attaching them to any active http server.

When creating a project which will server static files/pages alongside
engine.io on the same domain/process this makes it easier to separate
logic into files without having to pass around the http server.
2014-06-04 13:45:43 -04:00
Mark Mokryn
b98406a678 fix GH-211, set CORS headers when sending error message 2014-06-04 03:21:11 +03:00
Pawel
5676699a1c added missing comment about Content-Type header 2014-05-21 11:21:32 +02:00
Pawel
bd42b1ee1e added missing support for XSS filters on IE
issue #252
2014-05-21 11:14:56 +02:00
Guillermo Rauch
10261c5211 removed flashsocket, moving to userland 2014-05-17 15:24:40 -07:00
Guillermo Rauch
76628a0d9e socket: removed unneeded clearTimeout (fixes #250) 2014-04-26 10:50:27 -07:00
Tony Kovanen
802f130080 Made the request verification process async 2014-04-11 01:17:57 +03:00
Tony Kovanen
db36d031bc Added support for giving a function to engine.io to decide whether a request should be allowed or not when verifying. This is used by socket.io to check for allowed origins. 2014-04-11 01:11:32 +03:00
Contra
1ebc286af4 use _query instead of query, fixes compat with restify 2014-04-03 18:03:16 -07:00
Tony Kovanen
f8100f9237 Added a maximum buffer size to received data from polling. Settable with the maxHttpBufferSize option 2014-03-26 21:19:54 +02:00
DimitarChristoff
e4593af733 fixing looping array via for in to normal loop 2014-03-21 11:32:13 +00:00
Guillermo Rauch
4d08358017 transports: fix jshint warnings and style 2014-03-06 14:03:44 -08:00
Guillermo Rauch
caacf6d442 polling-xhr: added OPTIONS support, fixes CORS 2014-03-06 11:33:05 -08:00
Julian Salazar
ef77af8c2f close() properly when triggered in connection handler 2014-02-20 01:06:41 -08:00
Guillermo Rauch
ab4ea948cc Merge pull request #218 from rase-/add/binary-support
Binary support
2014-02-18 17:28:57 -08:00
Tony Kovanen
20d06700c3 Removed the need to set any default values for binary support in transports 2014-02-18 23:56:01 +02:00
Tony Kovanen
a9a6f25e76 style 2014-02-18 23:33:22 +02:00
Tony Kovanen
8cd37f0839 Style 2014-02-15 09:15:12 +02:00
Guillermo Rauch
9ab3b106d9 socket: restore 0.8 compatibility 2014-02-12 12:40:22 -08:00
binlain
336e05b461 Fix dos by possibly creating many intervals 2014-02-12 22:12:39 +01:00
binlain
4c84571280 Merge pull request #1 from LearnBoost/master
123
2014-02-12 15:28:54 +01:00
Nick LaGrow
468ca23339 Merge branch 'master' of https://github.com/LearnBoost/engine.io into upgrade 2014-02-08 12:11:35 -08:00
Nick LaGrow
17143bde09 Deny upgrade when proxy doesn't support websocket
Some proxies - such as nginx and squid - don't support websocket. The client attempting to upgrade its transport caused the engine.io connection to break (see GH-177). THe server now checks within handleRequest to see if the transport has changed without an upgrade request - if this is the case, the upgrade request is denied (defaults to polling) and the connection is maintained
2014-02-08 12:10:47 -08:00
Tony Kovanen
d71fde22fd Making encoding work with callbacks. Not completely there yet. 2014-02-04 00:04:05 +02:00