Commit Graph

7693 Commits

Author SHA1 Message Date
Kevin Ingersoll
d08acd89c7 Use explicit port on url ID, not on url href 2014-06-12 14:32:39 -07:00
Kevin Ingersoll
f09d2b439c Fix protocol regex, use falsy port, use href as unique ID 2014-06-12 14:16:07 -07:00
Kevin Ingersoll
67d077af2e Fix ports when connecting to 80/443 from non-80/443 host 2014-06-12 14:15:57 -07:00
Guillermo Rauch
7d2b44e176 index: fix typo [thanks @yanatan16] 2014-06-11 10:42:48 -07:00
Tony Kovanen
1feb9d46e9 Merge pull request #309 from Automattic/add/smaller-inherits
smaller inherits utility
2014-06-09 00:52:32 +03:00
Guillermo Rauch
09c83a215d smaller inherits utility 2014-06-08 14:42:44 -07:00
Guillermo Rauch
f3c5981f70 Merge pull request #17 from kevin-roark/add/benchmarking
added benchmarking
2014-06-08 14:12:41 -07:00
Kevin Roark
17cf621e86 big binary bench as well 2014-06-08 14:08:10 -07:00
Kevin Roark
8a7e0b8b0a added benchmarking 2014-06-08 12:23:48 -07:00
Tony Kovanen
0b5fdf995a Merge pull request #1603 from nkzawa/patch-2
Add removeListener to blacklisted events
2014-06-08 14:40:25 +03:00
Naoyuki Kanezawa
a66bea5b33 add removeListener to blacklisted events 2014-06-08 20:34:50 +09:00
Tony Kovanen
b067840376 Merge pull request #308 from nkzawa/patch-3
Fix a test for ws
2014-06-08 14:15:23 +03:00
Naoyuki Kanezawa
9ea654138d fix a test for ws 2014-06-08 20:06:17 +09:00
Guillermo Rauch
ff7ef76ff9 Merge pull request #260 from ifraixedes/patch-1
Update README.md
2014-06-07 10:26:57 -07:00
Ivan Fraixedes
038d0ef21e Update README.md
`require(engine.io).listen()` can receive a second optional parameter as options
2014-06-07 17:14:41 +01:00
Guillermo Rauch
a1a88aaaaf Merge pull request #1600 from poldridge/master
Update index.js
2014-06-06 22:36:19 -07:00
poldridge
3f817c3a18 Update index.js
Added missing hasOwnProperty check. socket.io breaks without it when Object.prototype has been extended.
2014-06-06 22:08:58 -07:00
Roman Shtylman
79a1ac0398 README: use svg badges 2014-06-06 17:21:57 -04:00
Roman Shtylman
5f889a682f README: change badge organization to Automattic 2014-06-06 17:21:26 -04:00
Guillermo Rauch
1efe0d05c5 index: added BC for force new connection 2014-06-06 09:06:54 -07:00
Guillermo Rauch
0791a86d67 Merge pull request #687 from reid/deps
Merge-ready @davglass deps PR: component-emitter@1.1.2, component-bind@1.0.0
2014-06-04 15:26:13 -07:00
Reid Burke
e07cec53a0 Merge branch 'deps' of github.com:davglass/socket.io-client into deps
Conflicts:
	package.json
2014-06-04 15:20:44 -07:00
Guillermo Rauch
52477840c5 Merge pull request #306 from reid/component-emitter
Upgrade component-emitter to 1.1.2, fix #305
2014-06-04 15:17:41 -07:00
Guillermo Rauch
3c308369d2 Merge pull request #16 from reid/component-emitter
Upgrade component-emitter to 1.1.2
2014-06-04 15:17:37 -07:00
Reid Burke
035fa7dded Upgrade component-emitter to 1.1.2
Switch from depending on a tarball URL to the published
component-emitter package at its latest version.

Change all references to emitter module to the new
component-emitter name.
2014-06-04 15:03:37 -07:00
Reid Burke
4b40963f27 Upgrade component-emitter to 1.1.2, fix #305
Switch from depending on a tarball URL to the published
component-emitter package at its latest version.

Change all references to emitter module to the new
component-emitter name.
2014-06-04 14:52:42 -07: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
Guillermo Rauch
ce9e4720d9 Merge pull request #258 from mokesmokes/fix211
fix GH-211, set CORS headers when sending error message
2014-06-03 17:45:33 -07:00
Guillermo Rauch
baac860d5d Update package.json 2014-06-03 17:43:53 -07:00
Guillermo Rauch
dca8afc952 Update Readme.md 2014-06-03 17:43:40 -07:00
Mark Mokryn
b98406a678 fix GH-211, set CORS headers when sending error message 2014-06-04 03:21:11 +03:00
Guillermo Rauch
b6db0bb9b6 Update package.json
Fixes #673
2014-06-03 15:38:32 -07:00
Guillermo Rauch
99bbd74d14 Merge pull request #1582 from kevin-roark/add/clearer-example-instructions
Add/clearer example instructions
2014-06-02 20:44:34 -07:00
Kevin Roark
398511ddee Merge branch 'upstream' into add/clearer-example-instructions 2014-06-02 20:28:42 -07:00
Kevin Roark
fdf7937815 clearer instructions to install chat example 2014-06-02 20:28:19 -07:00
Guillermo Rauch
658b8fd36c Release 1.0.4 2014-06-02 20:08:33 -07:00
Guillermo Rauch
475909e642 Release 1.0.4 1.0.4 2014-06-02 20:08:33 -07:00
Guillermo Rauch
95acec8b94 package: bump socket.io-client 2014-06-02 20:07:07 -07:00
Kevin Roark
5812ddf2b0 added the client emit-buffer test 2014-06-01 23:20:42 -07:00
Kevin Roark
8e76ec1717 add a buffer for emitted events to only send after connection 2014-06-01 23:18:02 -07:00
FredyC
77fd9d110a updated tests to reflect autoConnect option 2014-06-01 10:09:53 +02:00
FredyC
29cc049f37 add autoConnect option to wait with connecting 2014-06-01 09:32:06 +02:00
Guillermo Rauch
955055bf53 Merge pull request #15 from kevin-roark/fix/parser-style-and-optimization
Less indentation and a decent optimization
2014-05-31 23:35:00 -07:00
Kevin Roark
5ca1da1c7e bump protocol version here too 2014-05-31 23:30:39 -07:00
Kevin Roark
4e33d6a6c5 Less indentation and a small optimization
The optimization is the "else if" instead of "if" for checking
array in _removeBlobs. No need to iterate over keys of a blob.
2014-05-31 22:41:12 -07:00