Commit Graph

451 Commits

Author SHA1 Message Date
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
Guillermo Rauch
94f082be0c Release 0.3.10 2012-12-03 09:09:33 -03:00
Guillermo Rauch
96902f54a5 package: bumped engine.io-client with close fixes 2012-12-03 09:07:24 -03:00
Guillermo Rauch
58ff8991d0 Merge branch 'master' of github.com:/LearnBoost/engine.io 2012-12-03 08:34:55 -03:00
Guillermo Rauch
472b3f15b1 Merge pull request #121 from Jxck/master
add pakcet, packetCreate document to README
2012-11-10 10:16:57 -08:00
Jxck
fe59f275d8 Merge branch 'master' of github.com:Jxck/engine.io 2012-11-10 22:46:34 +09:00
Jxck
8b549b622f add pakcet, packetCreate document to README 2012-11-10 22:45:26 +09:00
Jxck
d206381347 add pakcet, packetCreate document to README 2012-11-10 22:41:15 +09:00
Guillermo Rauch
3bafecd882 Merge branch 'master' of github.com:/LearnBoost/engine.io 2012-11-06 08:25:07 -08:00
upbot
5ff0c1976a Merge pull request #120 from Jxck/master
createPacket event
2012-11-06 08:21:12 -08:00
Jxck
b4d60687ac add packetCreate event for #99 2012-11-06 20:34:10 +09:00