Skip to content

Commit

Permalink
Apply patch to node versions 0.10.22 and 0.10.23.
Browse files Browse the repository at this point in the history
0.10.23 just came out and hasn't made any changes to the streams
stuff we patch.
  • Loading branch information
n1mmy committed Dec 12, 2013
1 parent 0e21a38 commit d5d11f7
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
15 changes: 8 additions & 7 deletions History.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
## vNEXT

This version of Meteor contains a patch for a bug in Node 0.10 which most
commonly affects websockets. The patch is against Node v0.10.22. We strongly
recommend using this precise version of Node in production so that the patch
will be applied. If you use a newer version of Node with this version of Meteor,
Meteor will not apply the patch and will instead disable websockets.
## v0.6.7

This version of Meteor contains a patch for a bug in Node 0.10 which
most commonly affects websockets. The patch is against Node version
0.10.22 and 0.10.23. We strongly recommend using one of these precise
versions of Node in production so that the patch will be applied. If you
use a newer version of Node with this version of Meteor, Meteor will not
apply the patch and will instead disable websockets.

* Rework how Meteor gets realtime database updates from MongoDB. Meteor
now reads the MongoDB "oplog" -- a special collection that records all
Expand Down
6 changes: 3 additions & 3 deletions packages/meteor/node-issue-6506-workaround.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// Temporary workaround for https://github.com/joyent/node/issues/6506
// Our fix involves replicating a bunch of files in order to
//
if (process.version !== 'v0.10.22') {
if (process.version !== 'v0.10.22' && process.version !== 'v0.10.23') {
if (!process.env.DISABLE_WEBSOCKETS) {
console.error("This version of Meteor contains a patch for a bug in Node v0.10.");
console.error("The patch is against v0.10.22.");
console.error("The patch is against only versions 0.10.22 and 0.10.23.");
console.error("You are using version " + process.version + " instead, so we cannot apply the patch.");
console.error("To mitigate the most common effect of the bug, websockets will be disabled.");
console.error("To enable websockets, use Node v0.10.22 or upgrade to a later version of Meteor (if available).");
console.error("To enable websockets, use Node v0.10.22 or .23, or upgrade to a later version of Meteor (if available).");
process.env.DISABLE_WEBSOCKETS = 't';
}
} else {
Expand Down

0 comments on commit d5d11f7

Please sign in to comment.