Skip to content

fixes to event encoding and acknowledgement #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dvv wants to merge 17 commits into from
Closed

fixes to event encoding and acknowledgement #242

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8c3b7d9
fixed some typos; jsonp sets content-type:
dvv Jun 2, 2011
6879154
Merge branch 'develop' of github.com:LearnBoost/Socket.IO-node into d…
dvv Jun 6, 2011
8e590cc
unshielded error
dvv Jun 6, 2011
6985e46
Merge branch 'develop' of github.com:LearnBoost/Socket.IO-node into d…
dvv Jun 8, 2011
485f212
'event' message fix poc
dvv Jun 8, 2011
942ed48
htmlfile transport aggressively uses _, wiping underscore.js
dvv Jun 8, 2011
cb3d8b5
remove fired acks
dvv Jun 8, 2011
e648cc0
hz
dvv Jun 8, 2011
4a6591e
Merge branch 'develop' of github.com:LearnBoost/Socket.IO-node into d…
dvv Jun 9, 2011
e63d67a
Merge branch 'develop' of github.com:LearnBoost/Socket.IO-node into d…
dvv Jun 9, 2011
357dace
$emit
dvv Jun 9, 2011
52dbc10
Merge branch 'develop' of github.com:dvv/Socket.IO-node into develop
dvv Jun 10, 2011
23ce067
Merge branch 'develop' of github.com:LearnBoost/Socket.IO-node into d…
dvv Jun 10, 2011
920c681
guard unset consumer
dvv Jun 10, 2011
afe0a50
fixed unset consumer; fixed connection logic
dvv Jun 10, 2011
63850a5
connection logic
dvv Jun 10, 2011
a31a048
added filter() modifier -- useful for smarter selection of sessions t…
dvv Jun 10, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fixed some typos; jsonp sets content-type:
  • Loading branch information
@dvv
dvv committed Jun 2, 2011
commit 8c3b7d99c2e9a698c73e64b432e6a51b58194611
6 changes: 3 additions & 3 deletions lib/manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ Manager.prototype.handleRequest = function (req, res) {
this.log.debug('ignoring request outside socket.io namespace');

for (var i = 0, l = this.oldListeners.length; i < l; i++)
this.oldListeners[i].call(this, req, res);
this.oldListeners[i].call(this.server, req, res);

return;
}
Expand Down Expand Up @@ -441,9 +441,9 @@ Manager.prototype.handleHandshake = function (data, req, res) {
].join(':');

if (data.query.jsonp)
hs = 'io[' + data.query.jsonp + '](' + JSON.stringify(hs) + ');';
hs = 'io.j[' + data.query.jsonp + '](' + JSON.stringify(hs) + ');';

res.writeHead(200);
res.writeHead(200, {'content-type': 'application/javascript'});
Copy link
Contributor

@rauchg rauchg Jun 11, 2011

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Content-Type is preferred here
  • You're sending application/json for all handshakes, not just JSONP.

res.end(hs);
});
} else {
Expand Down