From f89fc9e979104eb6c8f252c17da5fbd06f7d6109 Mon Sep 17 00:00:00 2001
From: Geoff Jacobsen <geoffjacobsen@gmail.com>
Date: Wed, 15 May 2013 16:42:16 +1200
Subject: [PATCH 001/335] Return counts for collection update and remove
 commands

In order to support optimistic locking the counts from the MongoDB
update and remove commands need to be returned to the application code
so that the update/remove can be verified they took place and action
taken if they did not (like throwing a 409 Error).

For consistency make LocalCollection return counts also.
---
 packages/minimongo/minimongo.js               |  5 +++++
 packages/minimongo/minimongo_tests.js         | 20 +++++++++++++------
 packages/mongo-livedata/collection.js         |  4 +++-
 packages/mongo-livedata/mongo_driver.js       |  6 ++++--
 .../mongo-livedata/mongo_livedata_tests.js    | 17 ++++++++++++++--
 5 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index ceac91e251..256e450005 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -498,6 +498,7 @@ LocalCollection.prototype.remove = function (selector) {
       LocalCollection._recomputeResults(query);
   });
   self._observeQueue.drain();
+  return remove.length;
 };
 
 // XXX atomicity: if multi is true, and one modification fails, do
@@ -523,12 +524,15 @@ LocalCollection.prototype.update = function (selector, mod, options) {
   });
   var recomputeQids = {};
 
+  var updateCount = 0;
+
   for (var id in self.docs) {
     var doc = self.docs[id];
     if (selector_f(doc)) {
       // XXX Should we save the original even if mod ends up being a no-op?
       self._saveOriginal(id, doc);
       self._modifyAndNotify(doc, mod, recomputeQids);
+      ++updateCount;
       if (!options.multi)
         break;
     }
@@ -541,6 +545,7 @@ LocalCollection.prototype.update = function (selector, mod, options) {
                                         qidToOriginalResults[qid]);
   });
   self._observeQueue.drain();
+  return updateCount;
 };
 
 LocalCollection.prototype._modifyAndNotify = function (
diff --git a/packages/minimongo/minimongo_tests.js b/packages/minimongo/minimongo_tests.js
index 23b938dea6..e30784e46a 100644
--- a/packages/minimongo/minimongo_tests.js
+++ b/packages/minimongo/minimongo_tests.js
@@ -66,7 +66,8 @@ var log_callbacks = function (operations) {
 // XXX test shared structure in all MM entrypoints
 Tinytest.add("minimongo - basics", function (test) {
   var c = new LocalCollection(),
-      fluffyKitten_id;
+      fluffyKitten_id,
+      count;
 
   fluffyKitten_id = c.insert({type: "kitten", name: "fluffy"});
   c.insert({type: "kitten", name: "snookums"});
@@ -87,7 +88,8 @@ Tinytest.add("minimongo - basics", function (test) {
   test.length(c.find({type: "kitten"}).fetch(), 2);
   test.length(c.find({type: "cryptographer"}).fetch(), 2);
 
-  c.update({name: "snookums"}, {$set: {type: "cryptographer"}});
+  count = c.update({name: "snookums"}, {$set: {type: "cryptographer"}});
+  test.equal(count, 1);
   test.equal(c.find().count(), 4);
   test.equal(c.find({type: "kitten"}).count(), 1);
   test.equal(c.find({type: "cryptographer"}).count(), 3);
@@ -102,10 +104,12 @@ Tinytest.add("minimongo - basics", function (test) {
   c.remove({_id: null});
   c.remove({_id: false});
   c.remove({_id: undefined});
-  c.remove();
+  count = c.remove();
+  test.equal(count, 0);
   test.equal(c.find().count(), 4);
 
-  c.remove({});
+  count = c.remove({});
+  test.equal(count, 4);
   test.equal(c.find().count(), 0);
 
   c.insert({_id: 1, name: "strawberry", tags: ["fruit", "red", "squishy"]});
@@ -1647,7 +1651,8 @@ Tinytest.add("minimongo - diff", function (test) {
 
 Tinytest.add("minimongo - saveOriginals", function (test) {
   // set up some data
-  var c = new LocalCollection();
+  var c = new LocalCollection(),
+      count;
   c.insert({_id: 'foo', x: 'untouched'});
   c.insert({_id: 'bar', x: 'updateme'});
   c.insert({_id: 'baz', x: 'updateme'});
@@ -1658,9 +1663,12 @@ Tinytest.add("minimongo - saveOriginals", function (test) {
   c.saveOriginals();
   c.insert({_id: "hooray", z: 'insertme'});
   c.remove({y: 'removeme'});
-  c.update({x: 'updateme'}, {$set: {z: 5}}, {multi: true});
+  count = c.update({x: 'updateme'}, {$set: {z: 5}}, {multi: true});
   c.update('bar', {$set: {k: 7}});  // update same doc twice
 
+  // Verify returned count is correct
+  test.equal(count, 2);
+
   // Verify the originals.
   var originals = c.retrieveOriginals();
   var affected = ['bar', 'baz', 'quux', 'whoa', 'hooray'];
diff --git a/packages/mongo-livedata/collection.js b/packages/mongo-livedata/collection.js
index d67ea71158..b0bfd0f899 100644
--- a/packages/mongo-livedata/collection.js
+++ b/packages/mongo-livedata/collection.js
@@ -357,7 +357,9 @@ _.each(["insert", "update", "remove"], function (name) {
       // it's my collection.  descend into the collection object
       // and propagate any exception.
       try {
-        self._collection[name].apply(self._collection, args);
+        var result = self._collection[name].apply(self._collection, args);
+        if (ret === undefined)
+          ret = result;
       } catch (e) {
         if (callback) {
           callback(e);
diff --git a/packages/mongo-livedata/mongo_driver.js b/packages/mongo-livedata/mongo_driver.js
index 1922570c4e..f1aa92a59b 100644
--- a/packages/mongo-livedata/mongo_driver.js
+++ b/packages/mongo-livedata/mongo_driver.js
@@ -228,9 +228,10 @@ _Mongo.prototype.remove = function (collection_name, selector) {
     var future = new Future;
     collection.remove(replaceTypes(selector, replaceMeteorAtomWithMongo),
                       {safe: true}, future.resolver());
-    future.wait();
+    var result = future.wait();
     // XXX We don't have to run this on error, right?
     self._refresh(collection_name, selector);
+    return result;
   } finally {
     write.committed();
   }
@@ -266,8 +267,9 @@ _Mongo.prototype.update = function (collection_name, selector, mod, options) {
     collection.update(replaceTypes(selector, replaceMeteorAtomWithMongo),
                       replaceTypes(mod, replaceMeteorAtomWithMongo),
                       mongoOpts, future.resolver());
-    future.wait();
+    var result = future.wait();
     self._refresh(collection_name, selector);
+    return result;
   } finally {
     write.committed();
   }
diff --git a/packages/mongo-livedata/mongo_livedata_tests.js b/packages/mongo-livedata/mongo_livedata_tests.js
index 948a7962bd..f7875fff5e 100644
--- a/packages/mongo-livedata/mongo_livedata_tests.js
+++ b/packages/mongo-livedata/mongo_livedata_tests.js
@@ -191,8 +191,14 @@ Tinytest.addAsync("mongo-livedata - basics, " + idGeneration, function (test, on
   test.equal(_.pluck(coll.find({run: run}, {sort: {x: -1}}).fetch(), "x"),
              [4, 1]);
 
+  expectObserve('', function () {
+    var count = coll.update({run: run, x: -1}, {$inc: {x: 2}}, {multi: true});
+    test.equal(count, 0);
+  });
+
   expectObserve('c(3,0,1)c(6,1,4)', function () {
-    coll.update({run: run}, {$inc: {x: 2}}, {multi: true});
+    var count = coll.update({run: run}, {$inc: {x: 2}}, {multi: true});
+    test.equal(count, 2);
     test.equal(_.pluck(coll.find({run: run}, {sort: {x: -1}}).fetch(), "x"),
                [6, 3]);
   });
@@ -205,7 +211,8 @@ Tinytest.addAsync("mongo-livedata - basics, " + idGeneration, function (test, on
   });
 
   expectObserve('r(13,1)', function () {
-    coll.remove({run: run, x: {$gt: 10}});
+    var count = coll.remove({run: run, x: {$gt: 10}});
+    test.equal(count, 1);
     test.equal(coll.find({run: run}).count(), 1);
   });
 
@@ -214,6 +221,12 @@ Tinytest.addAsync("mongo-livedata - basics, " + idGeneration, function (test, on
     test.equal(coll.find({run: run}).count(), 0);
   });
 
+  expectObserve('', function () {
+    var count = coll.remove({run: run});
+    test.equal(count, 0);
+    test.equal(coll.find({run: run}).count(), 0);
+  });
+
   obs.stop();
   onComplete();
 });

From c4203e35000e308c95ded657cbf5fd64fc1b3ff3 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Mon, 26 Aug 2013 19:28:25 -0700
Subject: [PATCH 002/335] Fix typo in package description.

---
 packages/amplify/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/amplify/package.js b/packages/amplify/package.js
index c808eda438..012777f8b1 100644
--- a/packages/amplify/package.js
+++ b/packages/amplify/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  summary: "API for Persistant Storage, PubSub and Request"
+  summary: "API for Persistent Storage, PubSub and Request"
 });
 
 Package.on_use(function (api) {

From 6b9bfe8b5ace6418b557775d274ce88485b670af Mon Sep 17 00:00:00 2001
From: David Greenspan <dgreenspan@alum.mit.edu>
Date: Thu, 15 Aug 2013 12:20:29 -0700
Subject: [PATCH 003/335] update esprima to take fix for regex parsing bug

---
 packages/js-analyze/.npm/package/npm-shrinkwrap.json | 2 +-
 packages/js-analyze/package.js                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/js-analyze/.npm/package/npm-shrinkwrap.json b/packages/js-analyze/.npm/package/npm-shrinkwrap.json
index 04b9946958..52f2263019 100644
--- a/packages/js-analyze/.npm/package/npm-shrinkwrap.json
+++ b/packages/js-analyze/.npm/package/npm-shrinkwrap.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "esprima": {
-      "from": "https://github.com/ariya/esprima/tarball/5044b87f94fb802d9609f1426c838874ec2007b3"
+      "from": "https://github.com/ariya/esprima/tarball/2a41dbf0ddadade0b09a9a7cc9a0c8df9c434018"
     },
     "estraverse": {
       "version": "1.1.2-1"
diff --git a/packages/js-analyze/package.js b/packages/js-analyze/package.js
index 71087fefc3..8bc4b460b6 100644
--- a/packages/js-analyze/package.js
+++ b/packages/js-analyze/package.js
@@ -13,7 +13,7 @@ Package.describe({
 Npm.depends({
   // This code was originally written against the unreleased 1.1 branch. We can
   // probably switch to a built NPM version when it gets released.
-  esprima: "https://github.com/ariya/esprima/tarball/5044b87f94fb802d9609f1426c838874ec2007b3",
+  esprima: "https://github.com/ariya/esprima/tarball/2a41dbf0ddadade0b09a9a7cc9a0c8df9c434018",
   estraverse: "1.1.2-1",
   // Fork to add ignoreEval option.
   // https://github.com/Constellation/escope/pull/18

From 5784c811aee9e8da0133113073879fe37eb5c79d Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Tue, 20 Aug 2013 11:14:44 -0700
Subject: [PATCH 004/335] Don't number lines that end in backslash.

Fixes #1326
---
 tools/linker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/linker.js b/tools/linker.js
index 8392d28877..6d12925d51 100644
--- a/tools/linker.js
+++ b/tools/linker.js
@@ -355,7 +355,7 @@ _.extend(File.prototype, {
       _.each(lines, function (line) {
         var suffix = "\n";
 
-        if (line.length <= width) {
+        if (line.length <= width && line[line.length - 1] !== "\\") {
           suffix = padding.slice(line.length, width) + " // " + num + "\n";
         }
         f(line, suffix, num);

From a79db877a4badec4777a74efdb729fb94fdac84a Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Mon, 19 Aug 2013 16:25:46 -0700
Subject: [PATCH 005/335] Add EJSON to standard-app-packages. Fixes #1343.

---
 packages/standard-app-packages/package.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/standard-app-packages/package.js b/packages/standard-app-packages/package.js
index eeb12c1574..147674e8e5 100644
--- a/packages/standard-app-packages/package.js
+++ b/packages/standard-app-packages/package.js
@@ -38,6 +38,8 @@ Package.on_use(function(api) {
     // $(".usefulToo")
     'jquery',
     // Life isn't always predictable.
-    'random'
+    'random',
+    // People like being able to clone objects.
+    'ejson'
   ]);
 });

From 70a691661d59bd6b781fc0f6a4d86f573d46d5d3 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Tue, 20 Aug 2013 11:37:11 -0700
Subject: [PATCH 006/335] Use decoded pathnames in staticFiles keys.

Fixes #1339
---
 packages/webapp/webapp_server.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js
index d167942557..a3fc604ab1 100644
--- a/packages/webapp/webapp_server.js
+++ b/packages/webapp/webapp_server.js
@@ -234,10 +234,14 @@ var runWebAppServer = function () {
   // Auto-compress any json, javascript, or text.
   app.use(connect.compress());
 
+  var getItemPathname = function (itemUrl) {
+    return decodeURIComponent(url.parse(itemUrl).pathname);
+  };
+
   var staticFiles = {};
   _.each(clientJson.manifest, function (item) {
     if (item.url && item.where === "client") {
-      staticFiles[url.parse(item.url).pathname] = {
+      staticFiles[getItemPathname(item.url)] = {
         path: item.path,
         cacheable: item.cacheable,
         // Link from source to its map
@@ -247,7 +251,7 @@ var runWebAppServer = function () {
       if (item.sourceMap) {
         // Serve the source map too, under the specified URL. We assume all
         // source maps are cacheable.
-        staticFiles[url.parse(item.sourceMapUrl).pathname] = {
+        staticFiles[getItemPathname(item.sourceMapUrl)] = {
           path: item.sourceMap,
           cacheable: true
         };

From 9847720a3b79c2d25573347d982c34c13779f26d Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Mon, 19 Aug 2013 21:47:34 -0700
Subject: [PATCH 007/335] Various bugs involving idStringify.

In minimongo, we support various types as _id fields; the most important are
strings and ObjectIds. We have a special encoding that we use when we need to
represent them as strings, but we had a few bugs with using it.

minimongo: The duplicate-ID check in insert needed to check using the encoded
string.

spark OrderedDict: due to linker changes, it was not successfully finding
LocalCollection._idStringify, and so it fell back to the identity
function. Fixed to use weak dependencies. Also, later refactorings have removed
the need for idStringify(null) === null so that special case is removed.

spark branch labels: use idStringify in various places where _id is used as a
branch label.
---
 packages/handlebars/evaluate-handlebars.js |  7 ++++++-
 packages/handlebars/package.js             |  4 ++++
 packages/minimongo/minimongo.js            |  2 +-
 packages/spark/convenience.js              |  3 ++-
 packages/spark/package.js                  |  3 +++
 packages/spark/spark.js                    | 19 +++++++------------
 packages/templating/deftemplate.js         |  6 +++++-
 packages/templating/package.js             |  3 +++
 8 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/packages/handlebars/evaluate-handlebars.js b/packages/handlebars/evaluate-handlebars.js
index fa3df9bcd2..05b7d9deba 100644
--- a/packages/handlebars/evaluate-handlebars.js
+++ b/packages/handlebars/evaluate-handlebars.js
@@ -12,6 +12,10 @@ Handlebars.json_ast_to_func = function (ast) {
   };
 };
 
+var idStringify = Package.minimongo
+  ? Package.minimongo.LocalCollection._idStringify
+  : function (id) { return id; };
+
 // block helpers take:
 // (N args), options (hash args, plus 'fn' and 'inverse')
 // and return text
@@ -38,7 +42,8 @@ Handlebars._default_helpers = {
     if (data && data.length > 0)
       return _.map(data, function(x, i) {
         // infer a branch key from the data
-        var branch = ((x && x._id) || (typeof x === 'string' ? x : null) ||
+        var branch = ((x && x._id && idStringify(x._id)) ||
+                      (typeof x === 'string' ? x : null) ||
                       Spark.UNIQUE_LABEL);
         return Spark.labelBranch(branch, function() {
           return options.fn(x);
diff --git a/packages/handlebars/package.js b/packages/handlebars/package.js
index 90e3631cce..dfbecc219f 100644
--- a/packages/handlebars/package.js
+++ b/packages/handlebars/package.js
@@ -11,6 +11,10 @@ Package.on_use(function (api) {
 
   api.export('Handlebars');
 
+
+  // If we have minimongo available, use its idStringify function.
+  api.use('minimongo', 'client', {weak: true});
+
   // XXX these should be split up into two different slices, not
   // different code with totally different APIs that is sent depending
   // on the architecture
diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index d50b9de011..7787977f10 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -427,7 +427,7 @@ LocalCollection.prototype.insert = function (doc, callback) {
   }
   var id = LocalCollection._idStringify(doc._id);
 
-  if (_.has(self.docs, doc._id))
+  if (_.has(self.docs, id))
     throw MinimongoError("Duplicate _id '" + doc._id + "'");
 
   self._saveOriginal(id, undefined);
diff --git a/packages/spark/convenience.js b/packages/spark/convenience.js
index e4b3c3f81a..a8e5a82fb6 100644
--- a/packages/spark/convenience.js
+++ b/packages/spark/convenience.js
@@ -11,7 +11,8 @@ Meteor.render = function (htmlFunc) {
 Meteor.renderList = function (cursor, itemFunc, elseFunc) {
   return Spark.render(function () {
     return Spark.list(cursor, function (item) {
-      return Spark.labelBranch(item._id || null, function () {
+      var label = item._id ? idStringify(item._id) : null;
+      return Spark.labelBranch(label, function () {
         return Spark.isolate(_.bind(itemFunc, null, item));
       });
     }, function () {
diff --git a/packages/spark/package.js b/packages/spark/package.js
index afcbc42d58..8b2f8fbeb5 100644
--- a/packages/spark/package.js
+++ b/packages/spark/package.js
@@ -8,6 +8,9 @@ Package.on_use(function (api) {
            'ordered-dict', 'deps', 'ejson'],
           'client');
 
+  // If we have minimongo available, use its idStringify function.
+  api.use('minimongo', 'client', {weak: true});
+
   api.export('Spark', 'client');
   api.export('SparkTest', 'client', {testOnly: true});
 
diff --git a/packages/spark/spark.js b/packages/spark/spark.js
index 7c3cf27911..2055cc7a67 100644
--- a/packages/spark/spark.js
+++ b/packages/spark/spark.js
@@ -903,18 +903,13 @@ var applyChanges = function (doc, changeFields) {
 };
 
 
-var idStringify;
-
-if (typeof LocalCollection !== 'undefined') {
-  idStringify = function (id) {
-    if (id === null)
-      return id;
-    else
-      return LocalCollection._idStringify(id);
-  };
-} else {
-  idStringify = function (id) { return id; };
-}
+// If minimongo is available (it's a weak dependency) use its ID stringifier (so
+// that, eg, ObjectId and strings don't overlap). Otherwise just use the
+// identity function.
+// This is also used in convenience.js.
+idStringify = Package.minimongo
+  ? Package.minimongo.LocalCollection._idStringify
+  : function (id) { return id; };
 
 Spark.list = function (cursor, itemFunc, elseFunc) {
   elseFunc = elseFunc || function () { return ''; };
diff --git a/packages/templating/deftemplate.js b/packages/templating/deftemplate.js
index ad27795451..ba5fb14ca7 100644
--- a/packages/templating/deftemplate.js
+++ b/packages/templating/deftemplate.js
@@ -2,6 +2,10 @@ Template = {};
 
 var registeredPartials = {};
 
+var idStringify = Package.minimongo
+  ? Package.minimongo.LocalCollection._idStringify
+  : function (id) { return id; };
+
 // XXX Handlebars hooking is janky and gross
 var hookHandlebars = function () {
   hookHandlebars = function(){}; // install the hook only once
@@ -17,7 +21,7 @@ var hookHandlebars = function () {
       arg,
       function (item) {
         return Spark.labelBranch(
-          (item && item._id) || Spark.UNIQUE_LABEL, function () {
+          (item && item._id && idStringify(item._id)) || Spark.UNIQUE_LABEL, function () {
             var html = Spark.isolate(_.bind(options.fn, null, item));
             return Spark.setDataContext(item, html);
           });
diff --git a/packages/templating/package.js b/packages/templating/package.js
index 702ef253d2..1dc56a6de7 100644
--- a/packages/templating/package.js
+++ b/packages/templating/package.js
@@ -26,6 +26,9 @@ Package.on_use(function (api) {
 
   api.export('Template', 'client');
 
+
+  // If we have minimongo available, use its idStringify function.
+  api.use('minimongo', 'client', {weak: true});
   // provides the runtime logic to instantiate our templates
   api.add_files('deftemplate.js', 'client');
 

From 99d29cc9d2386cb63e13ba25720c2b9870710197 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Mon, 19 Aug 2013 22:15:52 -0700
Subject: [PATCH 008/335] More comments on idStringify fix.

---
 packages/handlebars/evaluate-handlebars.js | 3 +++
 packages/templating/deftemplate.js         | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/packages/handlebars/evaluate-handlebars.js b/packages/handlebars/evaluate-handlebars.js
index 05b7d9deba..ab895c2550 100644
--- a/packages/handlebars/evaluate-handlebars.js
+++ b/packages/handlebars/evaluate-handlebars.js
@@ -12,6 +12,9 @@ Handlebars.json_ast_to_func = function (ast) {
   };
 };
 
+// If minimongo is available (it's a weak dependency) use its ID stringifier to
+// label branches (so that, eg, ObjectId and strings don't overlap). Otherwise
+// just use the identity function.
 var idStringify = Package.minimongo
   ? Package.minimongo.LocalCollection._idStringify
   : function (id) { return id; };
diff --git a/packages/templating/deftemplate.js b/packages/templating/deftemplate.js
index ba5fb14ca7..7aafefcb1b 100644
--- a/packages/templating/deftemplate.js
+++ b/packages/templating/deftemplate.js
@@ -2,6 +2,9 @@ Template = {};
 
 var registeredPartials = {};
 
+// If minimongo is available (it's a weak dependency) use its ID stringifier to
+// label branches (so that, eg, ObjectId and strings don't overlap). Otherwise
+// just use the identity function.
 var idStringify = Package.minimongo
   ? Package.minimongo.LocalCollection._idStringify
   : function (id) { return id; };

From 2c68882fffc47e92aa237ec96f9620cf469e5b16 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Tue, 20 Aug 2013 11:08:50 -0700
Subject: [PATCH 009/335] Fix d3 tab character

---
 packages/d3/d3.v3.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/d3/d3.v3.js b/packages/d3/d3.v3.js
index 08aff88cea..361a3e113e 100644
--- a/packages/d3/d3.v3.js
+++ b/packages/d3/d3.v3.js
@@ -1789,7 +1789,7 @@ d3 = function() {
     return dsv;
   }
   d3.csv = d3_dsv(",", "text/csv");
-  d3.tsv = d3_dsv(" ", "text/tab-separated-values");
+  d3.tsv = d3_dsv("\t", "text/tab-separated-values");
   var d3_timer_id = 0, d3_timer_byId = {}, d3_timer_queue = null, d3_timer_interval, d3_timer_timeout;
   d3.timer = function(callback, delay, then) {
     if (arguments.length < 3) {

From 61d9510ef173e902c4b1ac4d2233efc7da95c753 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Mon, 19 Aug 2013 19:51:01 -0700
Subject: [PATCH 010/335] Export Spiderable symbol, so people can override user
 agents. Also add twitterbot to agents. Fixes #1300.

---
 packages/spiderable/package.js    | 2 ++
 packages/spiderable/spiderable.js | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/spiderable/package.js b/packages/spiderable/package.js
index 425c2ae8bb..431cc5c77e 100644
--- a/packages/spiderable/package.js
+++ b/packages/spiderable/package.js
@@ -7,6 +7,8 @@ Package.on_use(function (api) {
   api.use(['templating'], 'client');
   api.use(['underscore'], ['client', 'server']);
 
+  api.export('Spiderable', 'server');
+
   api.add_files('spiderable.html', 'client');
   api.add_files('spiderable.js', 'server');
 });
diff --git a/packages/spiderable/spiderable.js b/packages/spiderable/spiderable.js
index 2e5bd04c4a..9bc8f8118f 100644
--- a/packages/spiderable/spiderable.js
+++ b/packages/spiderable/spiderable.js
@@ -9,7 +9,13 @@ Spiderable = {};
 // not obey the _escaped_fragment_ protocol. The page is served
 // statically to any client whos user agent matches any of these
 // regexps. Users may modify this array.
-Spiderable.userAgentRegExps = [/^facebookexternalhit/i, /^linkedinbot/i];
+//
+// An original goal with the spiderable package was to avoid doing
+// user-agent based tests. But the reality is not enough bots support
+// the _escaped_fragment_ protocol, so we need to hardcode a list
+// here. I shed a silent tear.
+Spiderable.userAgentRegExps = [
+    /^facebookexternalhit/i, /^linkedinbot/i, /^twitterbot/i];
 
 // how long to let phantomjs run before we kill it
 var REQUEST_TIMEOUT = 15*1000;

From 7f73833991c6e3c37a72787200beb0395a604d94 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Mon, 26 Aug 2013 19:28:25 -0700
Subject: [PATCH 011/335] Fix typo in package description.

---
 packages/amplify/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/amplify/package.js b/packages/amplify/package.js
index c808eda438..012777f8b1 100644
--- a/packages/amplify/package.js
+++ b/packages/amplify/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  summary: "API for Persistant Storage, PubSub and Request"
+  summary: "API for Persistent Storage, PubSub and Request"
 });
 
 Package.on_use(function (api) {

From bab5c1685da9de7bc7573b4806fde1828ea65c07 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Tue, 20 Aug 2013 10:52:45 -0700
Subject: [PATCH 012/335] Fix docs typo.

Fixes #1297
---
 docs/client/api.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/client/api.html b/docs/client/api.html
index cc75bdc559..5d30aec68c 100644
--- a/docs/client/api.html
+++ b/docs/client/api.html
@@ -2409,7 +2409,7 @@ from the call to `check` or `Match.test`. Examples:
     NonEmptyString = Match.Where(function (x) {
       check(x, String);
       return x.length > 0;
-    }
+    });
     check(arg, NonEmptyString);
 {{/dtdd}}
 </dl>

From 0e70184fd071271d590b150c41d14f3c99db4c7d Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Wed, 14 Aug 2013 13:57:02 -0700
Subject: [PATCH 013/335] fix typo.

---
 docs/client/concepts.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/client/concepts.html b/docs/client/concepts.html
index 9626162e93..127c9860f1 100644
--- a/docs/client/concepts.html
+++ b/docs/client/concepts.html
@@ -724,7 +724,7 @@ might have two or three (for example, a package that provides several
 classes that work together).
 
 You see only the exports of the packages that you use directly. If you
-use package A, and package B uses package A, then you only see package
+use package A, and package A uses package B, then you only see package
 A's exports. Package B's exports don't "leak" into your namespace just
 because you used package A. This keeps each namespace nice and
 tidy. Each app or package only sees their own globals plus the APIs of

From f6b0bab5179623334306375caf1139b25fb202d8 Mon Sep 17 00:00:00 2001
From: Geoff Schmidt <geoff@geoffschmidt.com>
Date: Wed, 14 Aug 2013 13:38:43 -0700
Subject: [PATCH 014/335] Docs: CoffeeScript namespacing, other tweaks

---
 docs/client/concepts.html              | 27 +++++++++++++------
 docs/client/packages/coffeescript.html | 37 ++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/docs/client/concepts.html b/docs/client/concepts.html
index 127c9860f1..7376b18001 100644
--- a/docs/client/concepts.html
+++ b/docs/client/concepts.html
@@ -752,6 +752,17 @@ debugger, you've got two options:
   you can access `Package.email.Email.send` even from namespaces that
   don't use the `email` package directly.
 
+When declaring functions, keep in mind that `function x () {}` is just
+shorthard for `var x = function () {}` in JavaScript. Consider these
+examples:
+
+    // This is the same as 'var x = function () ...'. So x() is
+    // file-scope and can be called only from within this one file.
+    function x () { ... }
+
+    // No 'var', so x() is package-scope and can be called from
+    // any file inside this app or package.
+    x = function () { ... }
 
 {{#note}}
 Technically speaking, globals in an app (as opposed to in a package)
@@ -924,14 +935,14 @@ quick tips:
   to load before A. This is occasionally useful for resolving circular
   dependencies.
 
-* It is also for one package to imply another package with
-  `api.imply`. If package A implies package B, then when someone
-  depends on package A, it's as if they also depended on package B as
-  well. In particular, they get B's exports. This can be used to
-  create umbrella packages such as `standard-app-packages` that are a
-  shortcut for pulling in a set of packages, or it can be helpful in
-  factoring common code out of a set of packages as with
-  `accounts-base`.
+* The build system also supports package implication. If package A
+  implies package B, then it means that when someone depends on
+  package A, it's as if they also depended on package B as well. In
+  particular, they get B's exports. This is done with `api.imply` and
+  can be used to create umbrella packages such as
+  `standard-app-packages` that are a shortcut for pulling in a set of
+  packages, or it can be helpful in factoring common code out of a set
+  of packages as with `accounts-base`.
 
 * The build system understands the idea of native code and has a
   system of architecture names to ensure that packages that are
diff --git a/docs/client/packages/coffeescript.html b/docs/client/packages/coffeescript.html
index 08e09c3e9c..d01284cf4f 100644
--- a/docs/client/packages/coffeescript.html
+++ b/docs/client/packages/coffeescript.html
@@ -11,5 +11,42 @@ CoffeeScript is supported on both the client and the server. Files
 ending with `.coffee` or `.litcoffee` are automatically compiled to
 JavaScript.
 
+### Namespacing and CoffeeScript
+
+Here's how CoffeeScript works with Meteor's namespacing.
+
+* Per the usual CoffeeScript convention, CoffeeScript variable are
+  file-scoped by default (visible only in the `.coffee` file where
+  they are defined.)
+
+* When writing a package, CoffeeScript-defined variables can be
+  exported like any other variable (see [Writing
+  Packages](#writingpackages)). Exporting a variable pulls it up to
+  package scope, meaning that it will be visible to all of the code in
+  your app or package (both `.js` and `.coffee` files).
+
+* Package-scope variables declared in `.js` files are visible in any
+  `.coffee` files in the same app or project.
+
+* There is no way to make a package-scope variable from a `.coffee`
+  file other than exporting it. We couldn't figure out a way to make
+  this fit naturally inside the CoffeeScript language. If you want to
+  use package-scope variables with CoffeeScript, one way is to make a
+  short `.js` file that declares all of your package-scope
+  variables. They can then be used and assigned to from `.coffee`
+  files.
+
+* If you want to share variables between `.coffee` files in the same
+  package, and don't want to separately declare them in a `.js` file,
+  we have an experimental feature that you may like. An object called
+  `share` is visible in CoffeeScript code and is shared across all
+  `.coffee` files in the same package. So, you can write `share.foo`
+  for a value that is shared between all CoffeeScript code in a
+  package, but doesn't escape that package.
+
+Heavy CoffeeScript users, please let us know how this arrangement
+works for you, whether `share` is helpful for you, and anything else
+you'd like to see changed.
+
 {{/better_markdown}}
 </template>

From 6a4216f16fe2c469e63fe5876e2f733ef771389a Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Wed, 14 Aug 2013 16:52:39 -0700
Subject: [PATCH 015/335] Fix doc on how to get correct fibers.

---
 docs/client/concepts.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/client/concepts.html b/docs/client/concepts.html
index 7376b18001..f0c59d774f 100644
--- a/docs/client/concepts.html
+++ b/docs/client/concepts.html
@@ -842,7 +842,7 @@ created on.  To run on a different platform, you'll need to rebuild
 the native packages included in the bundle.  To do that, make sure you
 have `npm` available, and run the following:
 
-    $ cd bundle/server/node_modules
+    $ cd bundle/programs/server/node_modules
     $ rm -r fibers
     $ npm install fibers@1.0.1
 {{/warning}}

From fab6f3fe5d14d492b1a199bc401cdab1e596a10a Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Mon, 26 Aug 2013 20:30:41 -0700
Subject: [PATCH 016/335] First pass at history for 0.6.5.1

---
 History.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/History.md b/History.md
index 9ded11a003..0a00833214 100644
--- a/History.md
+++ b/History.md
@@ -1,6 +1,25 @@
 
 ## vNEXT
 
+## v0.6.5.1
+
+* Fix syntax errors on lines that end with a backslash. #1326
+
+* Fix serving static files with special characters in their name. #1339
+
+* Upgrade `esprima` JavaScript parser to fix bug parsing complex regexps.
+
+* Export `Spiderable` from `spiderable` package to allow users to set
+  `Spiderable.userAgentRegExps` to control what user agents are treated
+  as spiders.
+
+* Add EJSON to standard-app-packages. #1343
+
+* Fix bug in d3 tab character parsing.
+
+* Fix regression when using Mongo ObjectIDs in Spark templates.
+
+
 ## v0.6.5
 
 * New package system with package compiler and linker:

From 61f84eb7e7296795bceb404efd5e2f3ddd174e0e Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Tue, 27 Aug 2013 20:17:59 -0700
Subject: [PATCH 017/335] banner and notices for 0.6.5.1

---
 scripts/admin/banner.txt   | 5 +++--
 scripts/admin/notices.json | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/admin/banner.txt b/scripts/admin/banner.txt
index 8947659e2e..f0422b945e 100644
--- a/scripts/admin/banner.txt
+++ b/scripts/admin/banner.txt
@@ -1,4 +1,5 @@
-=> Meteor 0.6.5: namespacing, modularity, new build system, source maps!
+=> Meteor 0.6.5.1: a few bugfixes, including fixes for lines ending with
+   backslashes, filenames with with spaces, and tab characters in d3.
 
    This is being downloaded in the background. Update your project
-   to Meteor 0.6.5 by running 'meteor update'.
+   to Meteor 0.6.5.1 by running 'meteor update'.
diff --git a/scripts/admin/notices.json b/scripts/admin/notices.json
index 7eea43698d..176e5eb606 100644
--- a/scripts/admin/notices.json
+++ b/scripts/admin/notices.json
@@ -51,6 +51,9 @@
       "https://docs.meteor.com/#writingpackages"
     ]
   },
+  {
+    "release": "0.6.5.1"
+  },
   {
     "release": "NEXT"
   }

From cdb6f90b6617df84cb1cef58f5b911fcb1ee58f7 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Wed, 14 Aug 2013 17:03:45 -0700
Subject: [PATCH 018/335] Bump docs version to latest galaxy

---
 docs/.meteor/release | 2 +-
 docs/client/docs.js  | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/.meteor/release b/docs/.meteor/release
index ef5e445445..3f50c3b805 100644
--- a/docs/.meteor/release
+++ b/docs/.meteor/release
@@ -1 +1 @@
-0.6.5
+galaxy-appconfig-2
diff --git a/docs/client/docs.js b/docs/client/docs.js
index dfa8773234..ece40199c3 100644
--- a/docs/client/docs.js
+++ b/docs/client/docs.js
@@ -1,5 +1,8 @@
 Template.headline.release = function () {
-  return Meteor.release || "(checkout)";
+  // XXX This is commented out because for now galaxy apps have to be on a
+  // different Meteor release that has a bug fix.
+  return "0.6.5";
+  //  return Meteor.release || "(checkout)";
 };
 
 

From 5d4849d3615dd54bea836b60ca792f8b5dbe21d7 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Tue, 27 Aug 2013 20:28:56 -0700
Subject: [PATCH 019/335] bump docs version too. eventually this won't be
 needed.

---
 docs/client/docs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/client/docs.js b/docs/client/docs.js
index ece40199c3..c057ef71bd 100644
--- a/docs/client/docs.js
+++ b/docs/client/docs.js
@@ -1,7 +1,7 @@
 Template.headline.release = function () {
   // XXX This is commented out because for now galaxy apps have to be on a
   // different Meteor release that has a bug fix.
-  return "0.6.5";
+  return "0.6.5.1";
   //  return Meteor.release || "(checkout)";
 };
 

From 16b8f0b0b6ff49533597d0ec63063d37808c02bd Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Wed, 28 Aug 2013 14:13:09 -0700
Subject: [PATCH 020/335] update examples for 0.6.5.1

---
 examples/leaderboard/.meteor/release | 2 +-
 examples/parties/.meteor/release     | 2 +-
 examples/todos/.meteor/release       | 2 +-
 examples/wordplay/.meteor/release    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/leaderboard/.meteor/release b/examples/leaderboard/.meteor/release
index ef5e445445..dd8bfff626 100644
--- a/examples/leaderboard/.meteor/release
+++ b/examples/leaderboard/.meteor/release
@@ -1 +1 @@
-0.6.5
+0.6.5.1
diff --git a/examples/parties/.meteor/release b/examples/parties/.meteor/release
index ef5e445445..dd8bfff626 100644
--- a/examples/parties/.meteor/release
+++ b/examples/parties/.meteor/release
@@ -1 +1 @@
-0.6.5
+0.6.5.1
diff --git a/examples/todos/.meteor/release b/examples/todos/.meteor/release
index ef5e445445..dd8bfff626 100644
--- a/examples/todos/.meteor/release
+++ b/examples/todos/.meteor/release
@@ -1 +1 @@
-0.6.5
+0.6.5.1
diff --git a/examples/wordplay/.meteor/release b/examples/wordplay/.meteor/release
index ef5e445445..dd8bfff626 100644
--- a/examples/wordplay/.meteor/release
+++ b/examples/wordplay/.meteor/release
@@ -1 +1 @@
-0.6.5
+0.6.5.1

From e082d9745a1e6db128a905bfb5cca7167897c35d Mon Sep 17 00:00:00 2001
From: Mitar <mitar.git@tnode.com>
Date: Sat, 31 Aug 2013 10:03:41 -0700
Subject: [PATCH 021/335] Check for err.stack in logErr in wrapAsync.

---
 packages/meteor/helpers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/meteor/helpers.js b/packages/meteor/helpers.js
index 0804eff775..7edd152bcc 100644
--- a/packages/meteor/helpers.js
+++ b/packages/meteor/helpers.js
@@ -84,7 +84,7 @@ _.extend(Meteor, {
       var logErr = function (err) {
         if (err)
           return Meteor._debug("Exception in callback of async function",
-                               err ? err.stack : err);
+                               err.stack ? err.stack : err);
       };
 
       // Pop off optional args that are undefined

From ba34b2550bf4b73bb13e0ef79367ed18c79833c4 Mon Sep 17 00:00:00 2001
From: Andrew Wilcox <andrew.wilcox@gmail.com>
Date: Tue, 27 Aug 2013 17:19:04 -0400
Subject: [PATCH 022/335] Chrome for iOS supports the appcache

---
 docs/client/packages/appcache.html   | 3 ++-
 packages/appcache/appcache-server.js | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/client/packages/appcache.html b/docs/client/packages/appcache.html
index fd7591618f..4f2885b189 100644
--- a/docs/client/packages/appcache.html
+++ b/docs/client/packages/appcache.html
@@ -44,7 +44,8 @@ You can also disable the application cache for specific browsers:
     });
 
 The supported browsers that can be enabled or disabled are `android`,
-`chrome`, `chromium`, `firefox`, `ie`, `mobileSafari` and `safari`.
+`chrome`, `chromium`, `chromeMobileIOS`, `firefox`, `ie`,
+`mobileSafari` and `safari`.
 
 Browsers limit the amount of data they will put in the application
 cache, which can vary due to factors such as how much disk space is
diff --git a/packages/appcache/appcache-server.js b/packages/appcache/appcache-server.js
index ce64327820..acd7006012 100644
--- a/packages/appcache/appcache-server.js
+++ b/packages/appcache/appcache-server.js
@@ -6,6 +6,7 @@ var knownBrowsers = [
   'android',
   'chrome',
   'chromium',
+  'chromeMobileIOS',
   'firefox',
   'ie',
   'mobileSafari',
@@ -16,6 +17,7 @@ var browsersEnabledByDefault = [
   'android',
   'chrome',
   'chromium',
+  'chromeMobileIOS',
   'ie',
   'mobileSafari',
   'safari'

From afa8afd9a993c742be6bf38f23bb0e7858eea8fb Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Wed, 21 Aug 2013 22:16:41 -0700
Subject: [PATCH 023/335] Keep track of open DDP connections by login token.

---
 packages/accounts-base/accounts_server.js | 10 +++---
 packages/livedata/livedata_common.js      | 11 ++++++
 packages/livedata/livedata_server.js      | 43 +++++++++++++++++++++--
 3 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index cdcd995ace..4868b7c845 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -74,15 +74,17 @@ Meteor.methods({
     var result = tryAllLoginHandlers(options);
     if (result !== null) {
       this.setUserId(result.id);
-      this._sessionData.loginToken = result.token;
+      this._setLoginToken(result.token);
     }
     return result;
   },
 
   logout: function() {
-    if (this._sessionData.loginToken && this.userId)
-      removeLoginToken(this.userId, this._sessionData.loginToken);
+    var token = this._getLoginToken();
+    if (token && this.userId)
+      removeLoginToken(this.userId, token);
     this.setUserId(null);
+    this._setLoginToken(null);
   }
 });
 
@@ -115,7 +117,7 @@ Accounts._generateStampedLoginToken = function () {
   return {token: Random.id(), when: (new Date)};
 };
 
-removeLoginToken = function (userId, loginToken) {
+var removeLoginToken = function (userId, loginToken) {
   Meteor.users.update(userId, {
     $pull: {
       "services.resume.loginTokens": { "token": loginToken }
diff --git a/packages/livedata/livedata_common.js b/packages/livedata/livedata_common.js
index b39b65e491..589465ccd9 100644
--- a/packages/livedata/livedata_common.js
+++ b/packages/livedata/livedata_common.js
@@ -29,6 +29,10 @@ MethodInvocation = function (options) {
   // reruns subscriptions
   this._setUserId = options.setUserId || function () {};
 
+  // saves the login token so we can delete it later when the user logs out, is
+  // deleted, etc.
+  this._setLoginToken = options._setLoginToken || function () {};
+
   // Scratch data scoped to this connection (livedata_connection on the
   // client, livedata_session on the server). This is only used
   // internally, but we should have real and documented API for this
@@ -48,6 +52,13 @@ _.extend(MethodInvocation.prototype, {
       throw new Error("Can't call setUserId in a method after calling unblock");
     self.userId = userId;
     self._setUserId(userId);
+  },
+  _setLoginToken: function (token) {
+    this._setLoginToken(token, this._sessionData.loginToken);
+    this._sessionData.loginToken = token;
+  },
+  _getLoginToken: function (token) {
+    return this._sessionData.loginToken;
   }
 });
 
diff --git a/packages/livedata/livedata_server.js b/packages/livedata/livedata_server.js
index 5c396c4a00..8e8602c9e8 100644
--- a/packages/livedata/livedata_server.js
+++ b/packages/livedata/livedata_server.js
@@ -594,9 +594,15 @@ _.extend(Session.prototype, {
         self._setUserId(userId);
       };
 
+      var setLoginToken = function (newToken, oldToken) {
+        self._setLoginToken(newToken, oldToken);
+      };
+
       var invocation = new MethodInvocation({
         isSimulation: false,
-        userId: self.userId, setUserId: setUserId,
+        userId: self.userId,
+        setUserId: setUserId,
+        _setLoginToken: setLoginToken,
         unblock: unblock,
         sessionData: self.sessionData
       });
@@ -651,6 +657,11 @@ _.extend(Session.prototype, {
     });
   },
 
+  _setLoginToken: function (newToken, oldToken) {
+    var self = this;
+    self.server._loginTokenChanged(self, newToken, oldToken);
+  },
+
   // Sets the current user id in all appropriate contexts and reruns
   // all subscriptions
   _setUserId: function(userId) {
@@ -1026,6 +1037,12 @@ Server = function () {
 
   self.sessions = {}; // map from id to session
 
+  // Keeps track of the open connections associated with particular login
+  // tokens. Used for logging out all a user's open connections, expiring login
+  // tokens, etc.
+  self.sessionsByLoginToken = {};
+
+
   self.stream_server = new StreamServer;
 
   self.stream_server.register(function (socket) {
@@ -1269,17 +1286,26 @@ _.extend(Server.prototype, {
       var setUserId = function() {
         throw new Error("Can't call setUserId on a server initiated method call");
       };
+      var setLoginToken = function () {
+        throw new Error("Can't call _setLoginToken on a server " +
+                        "initiated method call");
+      };
       var currentInvocation = DDP._CurrentInvocation.get();
       if (currentInvocation) {
         userId = currentInvocation.userId;
         setUserId = function(userId) {
           currentInvocation.setUserId(userId);
         };
+        setLoginToken = function (newToken, oldToken) {
+          currentInvocation._setLoginToken(newToken, oldToken);
+        };
       }
 
       var invocation = new MethodInvocation({
         isSimulation: false,
-        userId: userId, setUserId: setUserId,
+        userId: userId,
+        setUserId: setUserId,
+        _setLoginToken: setLoginToken,
         sessionData: self.sessionData
       });
       try {
@@ -1304,6 +1330,19 @@ _.extend(Server.prototype, {
     if (exception)
       throw exception;
     return result;
+  },
+
+  _loginTokenChanged: function (session, newToken, oldToken) {
+    if (oldToken) {
+      // Remove the session from the list of open sessions for the old token.
+      self.sessionsByLoginToken[oldToken] = _.without(
+        self.sessionsByLoginToken[oldToken],
+        session.id
+      );
+    }
+    if (! _.has(self.sessionsByLoginToken, newToken))
+      self.sessionsByLoginToken[newToken] = [];
+    self.sessionsByLoginToken[newToken].push(session.id);
   }
 });
 

From 7dfff264a325d96b861608588fbc40b9d2f2101a Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Wed, 21 Aug 2013 22:50:55 -0700
Subject: [PATCH 024/335] Add method that logs the user out everywhere.

Might need some UI work; currently causes confusing error message "Couldn't find
login token."
---
 packages/accounts-base/accounts_server.js | 17 ++++++++++++++++
 packages/livedata/livedata_common.js      |  3 +++
 packages/livedata/livedata_server.js      | 24 +++++++++++++++++++++++
 3 files changed, 44 insertions(+)

diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index 4868b7c845..53c209f5f9 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -85,6 +85,23 @@ Meteor.methods({
       removeLoginToken(this.userId, token);
     this.setUserId(null);
     this._setLoginToken(null);
+    // XXX should close all connections open with this token?
+  },
+
+  // Nuke everything: delete all the user's tokens and close all open
+  // connections logged in as this user. XXX Should eventually get a fresh new
+  // token on the connection that called it and not get closed.
+  logoutAll: function () {
+    var user = Meteor.users.findOne(this.userId);
+    if (user) {
+      var tokens = user.services.resume.loginTokens;
+      Meteor.users.update(this.userId, {
+        $set: { "services.resume.loginTokens": [] }
+      });
+      this._closeAllForTokens(_.map(tokens, function (token) {
+        return token.token;
+      }));
+    }
   }
 });
 
diff --git a/packages/livedata/livedata_common.js b/packages/livedata/livedata_common.js
index 589465ccd9..93db53fd97 100644
--- a/packages/livedata/livedata_common.js
+++ b/packages/livedata/livedata_common.js
@@ -33,6 +33,9 @@ MethodInvocation = function (options) {
   // deleted, etc.
   this._setLoginToken = options._setLoginToken || function () {};
 
+  // Closes all open connections associated with the given tokens.
+  this._closeAllForTokens = options._closeAllForTokens || function () {};
+
   // Scratch data scoped to this connection (livedata_connection on the
   // client, livedata_session on the server). This is only used
   // internally, but we should have real and documented API for this
diff --git a/packages/livedata/livedata_server.js b/packages/livedata/livedata_server.js
index 8e8602c9e8..d4cc7b79db 100644
--- a/packages/livedata/livedata_server.js
+++ b/packages/livedata/livedata_server.js
@@ -598,11 +598,16 @@ _.extend(Session.prototype, {
         self._setLoginToken(newToken, oldToken);
       };
 
+      var closeAll = function (tokens) {
+        self._closeAllForTokens(tokens);
+      };
+
       var invocation = new MethodInvocation({
         isSimulation: false,
         userId: self.userId,
         setUserId: setUserId,
         _setLoginToken: setLoginToken,
+        _closeAllForTokens: closeAll,
         unblock: unblock,
         sessionData: self.sessionData
       });
@@ -662,6 +667,11 @@ _.extend(Session.prototype, {
     self.server._loginTokenChanged(self, newToken, oldToken);
   },
 
+  _closeAllForTokens: function (tokens) {
+    var self = this;
+    self.server._closeAllForTokens(tokens);
+  },
+
   // Sets the current user id in all appropriate contexts and reruns
   // all subscriptions
   _setUserId: function(userId) {
@@ -1333,6 +1343,7 @@ _.extend(Server.prototype, {
   },
 
   _loginTokenChanged: function (session, newToken, oldToken) {
+    var self = this;
     if (oldToken) {
       // Remove the session from the list of open sessions for the old token.
       self.sessionsByLoginToken[oldToken] = _.without(
@@ -1343,6 +1354,19 @@ _.extend(Server.prototype, {
     if (! _.has(self.sessionsByLoginToken, newToken))
       self.sessionsByLoginToken[newToken] = [];
     self.sessionsByLoginToken[newToken].push(session.id);
+  },
+
+  _closeAllForTokens: function (tokens) {
+    var self = this;
+    _.each(tokens, function (token) {
+      if (_.has(self.sessionsByLoginToken, token)) {
+        _.each(self.sessionsByLoginToken[token], function (sessionId) {
+          self.sessions[sessionId].cleanup();
+          self.sessions[sessionId].destroy();
+          delete self.sessions[sessionId];
+        });
+      }
+    });
   }
 });
 

From 3403b31c425802d21392755cece6dcbbacb01f96 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Thu, 22 Aug 2013 22:36:34 -0700
Subject: [PATCH 025/335] Preserve the connection that called logoutAll.

---
 packages/accounts-base/accounts_client.js | 12 ++++++++++++
 packages/accounts-base/accounts_server.js | 14 +++++++++++---
 packages/livedata/livedata_server.js      | 16 ++++++++++------
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/packages/accounts-base/accounts_client.js b/packages/accounts-base/accounts_client.js
index 3dd0c5cd35..ceb9affd89 100644
--- a/packages/accounts-base/accounts_client.js
+++ b/packages/accounts-base/accounts_client.js
@@ -174,6 +174,18 @@ Meteor.logout = function (callback) {
   });
 };
 
+Meteor._logoutAll = function (callback) {
+  Meteor.apply('_logoutAll', [], {wait: true}, function (error, result) {
+    if (error) {
+      callback && callback(error);
+    } else {
+      // The method should return a new valid token that we should start using.
+      makeClientLoggedIn(Meteor.userId(), result.token);
+      callback && callback();
+    }
+  });
+};
+
 ///
 /// LOGIN SERVICES
 ///
diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index 53c209f5f9..e69e8dead9 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -89,9 +89,8 @@ Meteor.methods({
   },
 
   // Nuke everything: delete all the user's tokens and close all open
-  // connections logged in as this user. XXX Should eventually get a fresh new
-  // token on the connection that called it and not get closed.
-  logoutAll: function () {
+  // connections logged in as this user.
+  _logoutAll: function () {
     var user = Meteor.users.findOne(this.userId);
     if (user) {
       var tokens = user.services.resume.loginTokens;
@@ -101,6 +100,15 @@ Meteor.methods({
       this._closeAllForTokens(_.map(tokens, function (token) {
         return token.token;
       }));
+
+      var newToken = Accounts._generateStampedLoginToken();
+      Meteor.users.update(this.userId, {
+        $push: {
+          "services.resume.loginTokens": newToken
+        }
+      });
+      this._setLoginToken(newToken);
+      return newToken;
     }
   }
 });
diff --git a/packages/livedata/livedata_server.js b/packages/livedata/livedata_server.js
index d4cc7b79db..33e30b1a9b 100644
--- a/packages/livedata/livedata_server.js
+++ b/packages/livedata/livedata_server.js
@@ -599,7 +599,7 @@ _.extend(Session.prototype, {
       };
 
       var closeAll = function (tokens) {
-        self._closeAllForTokens(tokens);
+        self._closeAllForTokens(tokens, [self.id]);
       };
 
       var invocation = new MethodInvocation({
@@ -669,7 +669,7 @@ _.extend(Session.prototype, {
 
   _closeAllForTokens: function (tokens) {
     var self = this;
-    self.server._closeAllForTokens(tokens);
+    self.server._closeAllForTokens(tokens, [self.id]);
   },
 
   // Sets the current user id in all appropriate contexts and reruns
@@ -1356,14 +1356,18 @@ _.extend(Server.prototype, {
     self.sessionsByLoginToken[newToken].push(session.id);
   },
 
-  _closeAllForTokens: function (tokens) {
+  // Close all open sessions associated with any of the tokens in `tokens`,
+  // except for sessions with ids in `excludeSessions`.
+  _closeAllForTokens: function (tokens, excludeSessions) {
     var self = this;
     _.each(tokens, function (token) {
       if (_.has(self.sessionsByLoginToken, token)) {
         _.each(self.sessionsByLoginToken[token], function (sessionId) {
-          self.sessions[sessionId].cleanup();
-          self.sessions[sessionId].destroy();
-          delete self.sessions[sessionId];
+          if (_.indexOf(excludeSessions, sessionId) === -1) {
+            self.sessions[sessionId].cleanup();
+            self.sessions[sessionId].destroy();
+            delete self.sessions[sessionId];
+          }
         });
       }
     });

From 12c0d8ef5e3ab64908d52c8fe32f48f1e96133d5 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Fri, 23 Aug 2013 17:46:03 -0700
Subject: [PATCH 026/335] Rename to Meteor._logoutAllOthers

---
 packages/accounts-base/accounts_client.js | 4 ++--
 packages/accounts-base/accounts_server.js | 5 +++--
 packages/livedata/livedata_server.js      | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/accounts-base/accounts_client.js b/packages/accounts-base/accounts_client.js
index ceb9affd89..f538d16388 100644
--- a/packages/accounts-base/accounts_client.js
+++ b/packages/accounts-base/accounts_client.js
@@ -174,8 +174,8 @@ Meteor.logout = function (callback) {
   });
 };
 
-Meteor._logoutAll = function (callback) {
-  Meteor.apply('_logoutAll', [], {wait: true}, function (error, result) {
+Meteor._logoutAllOthers = function (callback) {
+  Meteor.apply('_logoutAllOthers', [], {wait: true}, function (error, result) {
     if (error) {
       callback && callback(error);
     } else {
diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index e69e8dead9..a66f795947 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -89,8 +89,9 @@ Meteor.methods({
   },
 
   // Nuke everything: delete all the user's tokens and close all open
-  // connections logged in as this user.
-  _logoutAll: function () {
+  // connections logged in as this user, except this connection. Returns a fresh
+  // new login token that this client can use.
+  _logoutAllOthers: function () {
     var user = Meteor.users.findOne(this.userId);
     if (user) {
       var tokens = user.services.resume.loginTokens;
diff --git a/packages/livedata/livedata_server.js b/packages/livedata/livedata_server.js
index 33e30b1a9b..5c4a99ea4c 100644
--- a/packages/livedata/livedata_server.js
+++ b/packages/livedata/livedata_server.js
@@ -598,6 +598,7 @@ _.extend(Session.prototype, {
         self._setLoginToken(newToken, oldToken);
       };
 
+      // Closes all sessions associated with these tokens except this one.
       var closeAll = function (tokens) {
         self._closeAllForTokens(tokens, [self.id]);
       };

From 4b7f052ce06e9fac45ca23c14642fd9d925d6619 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Fri, 23 Aug 2013 18:05:23 -0700
Subject: [PATCH 027/335] Wait 10 seconds before closing other logged-in
 sessions.

Gives other tabs sharing a token with the caller time to find the new token in
localStorage. This is sort of a hack for now; one possibility for making it less
hacky is to add a DDP disconnect message to allow the server to tell clients
that they are being disconnected but can reconnect with the provided token.
---
 packages/accounts-base/accounts_server.js | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index a66f795947..a50b335fa7 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -92,23 +92,29 @@ Meteor.methods({
   // connections logged in as this user, except this connection. Returns a fresh
   // new login token that this client can use.
   _logoutAllOthers: function () {
-    var user = Meteor.users.findOne(this.userId);
+    var self = this;
+    var user = Meteor.users.findOne(self.userId);
     if (user) {
       var tokens = user.services.resume.loginTokens;
-      Meteor.users.update(this.userId, {
+      Meteor.users.update(self.userId, {
         $set: { "services.resume.loginTokens": [] }
       });
-      this._closeAllForTokens(_.map(tokens, function (token) {
-        return token.token;
-      }));
+      // Wait 10 seconds before closing the connections. This is to give other
+      // clients using our token a chance to find a new token in localStorage so
+      // that when they get disconnected they reconnect with a valid token.
+      Meteor.setTimeout(function () {
+        self._closeAllForTokens(_.map(tokens, function (token) {
+          return token.token;
+        }));
+      }, 10*1000);
 
       var newToken = Accounts._generateStampedLoginToken();
-      Meteor.users.update(this.userId, {
+      Meteor.users.update(self.userId, {
         $push: {
           "services.resume.loginTokens": newToken
         }
       });
-      this._setLoginToken(newToken);
+      self._setLoginToken(newToken);
       return newToken;
     }
   }

From 1887d6960b14b90e4f0b47c8b332f3d050c67444 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Thu, 29 Aug 2013 12:25:56 -0700
Subject: [PATCH 028/335] Expire login tokens periodically.

When a login token expires, all open connections associated with that token will
be closed. It will be up to client code to avoid trying to connect with a login
token that is set to expire soon.
---
 packages/accounts-base/accounts_server.js | 38 +++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index a50b335fa7..6671ec61bc 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -125,6 +125,11 @@ Meteor.methods({
 ///
 /// support reconnecting using a meteor login token
 
+// how often (in seconds) we check for expired tokens
+var EXPIRE_TOKENS_INTERVAL = 600; // 10 minutes
+// how long (in seconds) until a login token expires
+var TOKEN_LIFETIME = 604800; // one week
+
 // Login handler for resume tokens.
 Accounts.registerLoginHandler(function(options) {
   if (!options.resume)
@@ -134,6 +139,7 @@ Accounts.registerLoginHandler(function(options) {
   var user = Meteor.users.findOne({
     "services.resume.loginTokens.token": ""+options.resume
   });
+
   if (!user)
     throw new Meteor.Error(403, "Couldn't find login token");
 
@@ -157,6 +163,38 @@ var removeLoginToken = function (userId, loginToken) {
   });
 };
 
+// Deletes expired tokens from the database and closes all open connections
+// associated with these tokens.
+expireTokens = function () {
+  var oldestValidDate = new Date(new Date() - TOKEN_LIFETIME * 1000);
+  var usersWithExpiredTokens = Meteor.users.find({
+    "services.resume.loginTokens.when": { $lt: oldestValidDate }
+  });
+
+  var oldTokens = [];
+  usersWithExpiredTokens.forEach(function (user) {
+    _.each(user.services.resume.loginTokens, function (token) {
+      if (token.when < oldestValidDate)
+        oldTokens.push(token.token);
+    });
+  });
+
+  Meteor.users.update({
+    "services.resume.loginTokens.when": { $lt: oldestValidDate }
+  }, {
+    $pull: {
+      "services.resume.loginTokens": {
+        when: { $lt: oldestValidDate }
+      }
+    }
+  });
+
+  Meteor.server._closeAllForTokens(oldTokens);
+};
+
+Meteor.users._ensureIndex("services.resume.loginTokens.when", { sparse: true });
+Meteor.setInterval(expireTokens, EXPIRE_TOKENS_INTERVAL);
+
 
 ///
 /// CREATE USER HOOKS

From d39726d737f5c4583c88005fc5f6e7189ad8e756 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Thu, 29 Aug 2013 13:23:17 -0700
Subject: [PATCH 029/335] Store login token on livedata session.

Allows us to remove sessions from sessionsByLoginToken when they are destroyed.
---
 packages/livedata/livedata_common.js |  2 +-
 packages/livedata/livedata_server.js | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/packages/livedata/livedata_common.js b/packages/livedata/livedata_common.js
index 93db53fd97..dc2510c353 100644
--- a/packages/livedata/livedata_common.js
+++ b/packages/livedata/livedata_common.js
@@ -57,7 +57,7 @@ _.extend(MethodInvocation.prototype, {
     self._setUserId(userId);
   },
   _setLoginToken: function (token) {
-    this._setLoginToken(token, this._sessionData.loginToken);
+    this._setLoginToken(token);
     this._sessionData.loginToken = token;
   },
   _getLoginToken: function (token) {
diff --git a/packages/livedata/livedata_server.js b/packages/livedata/livedata_server.js
index 5c4a99ea4c..bbceeaf7eb 100644
--- a/packages/livedata/livedata_server.js
+++ b/packages/livedata/livedata_server.js
@@ -238,6 +238,7 @@ var Session = function (server, version) {
   self._universalSubs = [];
 
   self.userId = null;
+  self.loginToken = null;
 
   // Per-connection scratch area. This is only used internally, but we
   // should have real and documented API for this sort of thing someday.
@@ -594,8 +595,8 @@ _.extend(Session.prototype, {
         self._setUserId(userId);
       };
 
-      var setLoginToken = function (newToken, oldToken) {
-        self._setLoginToken(newToken, oldToken);
+      var setLoginToken = function (newToken) {
+        self._setLoginToken(newToken);
       };
 
       // Closes all sessions associated with these tokens except this one.
@@ -663,8 +664,10 @@ _.extend(Session.prototype, {
     });
   },
 
-  _setLoginToken: function (newToken, oldToken) {
+  _setLoginToken: function (newToken) {
     var self = this;
+    var oldToken = self.loginToken;
+    self.loginToken = newToken;
     self.server._loginTokenChanged(self, newToken, oldToken);
   },
 
@@ -1127,6 +1130,11 @@ Server = function () {
       }
     });
     _.each(destroyedIds, function (id) {
+      var session = self.sessions[id];
+      self.sessionsByLoginToken[session.loginToken] = _.without(
+        self.sessionsByLoginToken[session.loginToken],
+        id
+      );
       delete self.sessions[id];
     });
   }, 1 * 60 * 1000);
@@ -1307,8 +1315,8 @@ _.extend(Server.prototype, {
         setUserId = function(userId) {
           currentInvocation.setUserId(userId);
         };
-        setLoginToken = function (newToken, oldToken) {
-          currentInvocation._setLoginToken(newToken, oldToken);
+        setLoginToken = function (newToken) {
+          currentInvocation._setLoginToken(newToken);
         };
       }
 

From d84334a34b154f391a158f9709adda63c0f2fe5b Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Thu, 29 Aug 2013 15:44:59 -0700
Subject: [PATCH 030/335] Make client aware of token expiration times.

accounts-password will not try to auto-login with (and will clear) a login token
that is going to expire within an hour, to try to avoid abrupt disconnects from
an expiring token. Login handlers return a new tokenExpires field to help the
client do this. Made tokenExpires a separate field on the login handlers' result
object instead of just returning the whole token (token + when fields) in the
result to avoid breaking code that assumes that login handlers return a string
as the token field. The tokenExpires field is optional, so other login handlers
that don't set it aren't broken.
---
 packages/accounts-base/accounts_client.js     |  8 +++---
 packages/accounts-base/accounts_common.js     |  6 +++++
 packages/accounts-base/accounts_server.js     | 25 +++++++++++++++----
 packages/accounts-base/localstorage_token.js  | 17 ++++++++++++-
 packages/accounts-password/password_server.js | 25 ++++++++++++++++---
 5 files changed, 67 insertions(+), 14 deletions(-)

diff --git a/packages/accounts-base/accounts_client.js b/packages/accounts-base/accounts_client.js
index f538d16388..2b3c2fad8c 100644
--- a/packages/accounts-base/accounts_client.js
+++ b/packages/accounts-base/accounts_client.js
@@ -139,7 +139,7 @@ Accounts.callLoginMethod = function (options) {
     }
 
     // Make the client logged in. (The user data should already be loaded!)
-    makeClientLoggedIn(result.id, result.token);
+    makeClientLoggedIn(result.id, result.token, result.tokenExpires);
     options.userCallback();
   };
 
@@ -158,8 +158,8 @@ makeClientLoggedOut = function() {
   Meteor.connection.onReconnect = null;
 };
 
-makeClientLoggedIn = function(userId, token) {
-  storeLoginToken(userId, token);
+makeClientLoggedIn = function(userId, token, tokenExpires {
+  storeLoginToken(userId, token, tokenExpires);
   Meteor.connection.setUserId(userId);
 };
 
@@ -180,7 +180,7 @@ Meteor._logoutAllOthers = function (callback) {
       callback && callback(error);
     } else {
       // The method should return a new valid token that we should start using.
-      makeClientLoggedIn(Meteor.userId(), result.token);
+      makeClientLoggedIn(Meteor.userId(), result.token, result.tokenExpires);
       callback && callback();
     }
   });
diff --git a/packages/accounts-base/accounts_common.js b/packages/accounts-base/accounts_common.js
index 0db0271db9..b6ab826002 100644
--- a/packages/accounts-base/accounts_common.js
+++ b/packages/accounts-base/accounts_common.js
@@ -66,3 +66,9 @@ Accounts.LoginCancelledError.numericError = 0x8acdc2f;
 Accounts.LoginCancelledError.prototype = new Error();
 Accounts.LoginCancelledError.prototype.name = 'Accounts.LoginCancelledError';
 
+// how long (in seconds) until a login token expires
+// XXX maybe should be configurable
+TOKEN_LIFETIME = 604800; // one week
+Accounts._tokenExpiration = function (when) {
+  return new Date(when.getTime() + TOKEN_LIFETIME * 1000);
+};
diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index 6671ec61bc..77044a5183 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -34,7 +34,11 @@ Meteor.user = function () {
 // @param handler {Function} A function that receives an options object
 // (as passed as an argument to the `login` method) and returns one of:
 // - `undefined`, meaning don't handle;
-// - {id: userId, token: *}, if the user logged in successfully.
+// - {id: userId, token: *, tokenExpires: *}, if the user logged in
+//   successfully. tokenExpires is optional and intends to provide a hint to the
+//   client as to when the token will expire. If not provided, the client
+//   will assume the token expires TOKEN_LIFETIME seconds from when it receives
+//   it.
 // - throw an error, if the user failed to log in.
 //
 Accounts.registerLoginHandler = function(handler) {
@@ -115,7 +119,10 @@ Meteor.methods({
         }
       });
       self._setLoginToken(newToken);
-      return newToken;
+      return {
+        token: newToken.token,
+        tokenExpires: Accounts._tokenExpiration(newToken.when)
+      };
     }
   }
 });
@@ -127,8 +134,6 @@ Meteor.methods({
 
 // how often (in seconds) we check for expired tokens
 var EXPIRE_TOKENS_INTERVAL = 600; // 10 minutes
-// how long (in seconds) until a login token expires
-var TOKEN_LIFETIME = 604800; // one week
 
 // Login handler for resume tokens.
 Accounts.registerLoginHandler(function(options) {
@@ -143,8 +148,13 @@ Accounts.registerLoginHandler(function(options) {
   if (!user)
     throw new Meteor.Error(403, "Couldn't find login token");
 
+  var token = _.find(user.services.resume.loginTokens, function (token) {
+    return token.token === options.resume;
+  });
+
   return {
     token: options.resume,
+    tokenExpires: Accounts._tokenExpiration(token.when),
     id: user._id
   };
 });
@@ -236,6 +246,7 @@ Accounts.insertUserDoc = function (options, user) {
   if (options.generateLoginToken) {
     var stampedToken = Accounts._generateStampedLoginToken();
     result.token = stampedToken.token;
+    result.tokenExpires = Accounts._tokenExpiration(stampedToken.when);
     Meteor._ensure(user, 'services', 'resume');
     if (_.has(user.services.resume, 'loginTokens'))
       user.services.resume.loginTokens.push(stampedToken);
@@ -352,7 +363,11 @@ Accounts.updateOrCreateUserFromExternalService = function(
       user._id,
       {$set: setAttrs,
        $push: {'services.resume.loginTokens': stampedToken}});
-    return {token: stampedToken.token, id: user._id};
+    return {
+      token: stampedToken.token,
+      id: user._id,
+      tokenExpires: Accounts._tokenExpiration(stampedToken.when)
+    };
   } else {
     // Create a new user with the service data. Pass other options through to
     // insertUserDoc.
diff --git a/packages/accounts-base/localstorage_token.js b/packages/accounts-base/localstorage_token.js
index 91205a6742..46bea22549 100644
--- a/packages/accounts-base/localstorage_token.js
+++ b/packages/accounts-base/localstorage_token.js
@@ -4,6 +4,9 @@
 // browser.
 
 var lastLoginTokenWhenPolled;
+// We don't try to auto-login with a token that is going to expire within
+// MIN_TOKEN_LIFETIME seconds, to avoid abrupt disconnects from expiring tokens.
+var MIN_TOKEN_LIFETIME = 3600; // one hour
 
 // Login with a Meteor access token. This is the only public function
 // here.
@@ -27,6 +30,7 @@ Accounts._enableAutoLogin = function () {
 
 // Key names to use in localStorage
 var loginTokenKey = "Meteor.loginToken";
+var loginTokenExpiresKey = "Meteor.loginTokenExpires";
 var userIdKey = "Meteor.userId";
 
 // Call this from the top level of the test file for any test that does
@@ -37,9 +41,12 @@ Accounts._isolateLoginTokenForTest = function () {
   userIdKey = userIdKey + Random.id();
 };
 
-storeLoginToken = function(userId, token) {
+storeLoginToken = function(userId, token, tokenExpires) {
   Meteor._localStorage.setItem(userIdKey, userId);
   Meteor._localStorage.setItem(loginTokenKey, token);
+  if (! tokenExpires)
+    tokenExpires = Accounts._tokenExpiration(new Date());
+  Meteor._localStorage.setItem(loginTokenExpiresKey, tokenExpires);
 
   // to ensure that the localstorage poller doesn't end up trying to
   // connect a second time
@@ -49,6 +56,7 @@ storeLoginToken = function(userId, token) {
 unstoreLoginToken = function() {
   Meteor._localStorage.removeItem(userIdKey);
   Meteor._localStorage.removeItem(loginTokenKey);
+  Meteor._localStorage.removeItem(loginTokenExpiresKey);
 
   // to ensure that the localstorage poller doesn't end up trying to
   // connect a second time
@@ -66,6 +74,12 @@ var storedUserId = function() {
   return Meteor._localStorage.getItem(userIdKey);
 };
 
+var unstoreLoginTokenIfExpiresSoon = function () {
+  var tokenExpires = Meteor._localStorage.getItem(loginTokenExpiresKey);
+  if (tokenExpires &&
+      new Date() > (new Date(tokenExpires) - MIN_TOKEN_LIFETIME * 1000))
+    unstoreLoginToken();
+};
 
 ///
 /// AUTO-LOGIN
@@ -74,6 +88,7 @@ var storedUserId = function() {
 if (autoLoginEnabled) {
   // Immediately try to log in via local storage, so that any DDP
   // messages are sent after we have established our user account
+  unstoreLoginTokenIfExpiresSoon();
   var token = storedLoginToken();
   if (token) {
     // On startup, optimistically present us as logged in while the
diff --git a/packages/accounts-password/password_server.js b/packages/accounts-password/password_server.js
index 58782a7c6b..1031e2fbf4 100644
--- a/packages/accounts-password/password_server.js
+++ b/packages/accounts-password/password_server.js
@@ -98,7 +98,12 @@ Accounts.registerLoginHandler(function (options) {
   Meteor.users.update(
     userId, {$push: {'services.resume.loginTokens': stampedLoginToken}});
 
-  return {token: stampedLoginToken.token, id: userId, HAMK: serialized.HAMK};
+  return {
+    token: stampedLoginToken.token,
+    tokenExpires: Accounts._tokenExpiration(stampedLoginToken.when),
+    id: userId,
+    HAMK: serialized.HAMK
+  };
 });
 
 // Handler to login with plaintext password.
@@ -137,7 +142,11 @@ Accounts.registerLoginHandler(function (options) {
   Meteor.users.update(
     user._id, {$push: {'services.resume.loginTokens': stampedLoginToken}});
 
-  return {token: stampedLoginToken.token, id: user._id};
+  return {
+    token: stampedLoginToken.token,
+    tokenExpires: Accounts._tokenExpires(stampedLoginToken.when),
+    id: user._id
+  };
 });
 
 
@@ -321,7 +330,11 @@ Meteor.methods({resetPassword: function (token, newVerifier) {
   });
 
   this.setUserId(user._id);
-  return {token: stampedLoginToken.token, id: user._id};
+  return {
+    token: stampedLoginToken.token,
+    tokenExpires: Accounts._tokenExpiration(stampedLoginToken.when),
+    id: user._id
+  };
 }});
 
 ///
@@ -408,7 +421,11 @@ Meteor.methods({verifyEmail: function (token) {
      $push: {'services.resume.loginTokens': stampedLoginToken}});
 
   this.setUserId(user._id);
-  return {token: stampedLoginToken.token, id: user._id};
+  return {
+    token: stampedLoginToken.token,
+    tokenExpires: Accounts._tokenExpiration(stampedLoginToken.when),
+    id: user._id
+  };
 }});
 
 

From 2ebdeb0d957a6e5b1b150061d7c83fd2ac682aab Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Thu, 29 Aug 2013 16:08:53 -0700
Subject: [PATCH 031/335] Make token expiration times configurable via
 Accounts.config.

---
 packages/accounts-base/accounts_client.js |  2 +-
 packages/accounts-base/accounts_common.js | 13 ++++++++++---
 packages/accounts-base/accounts_server.js | 18 +++++++++++-------
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/packages/accounts-base/accounts_client.js b/packages/accounts-base/accounts_client.js
index 2b3c2fad8c..a153c7d9ee 100644
--- a/packages/accounts-base/accounts_client.js
+++ b/packages/accounts-base/accounts_client.js
@@ -158,7 +158,7 @@ makeClientLoggedOut = function() {
   Meteor.connection.onReconnect = null;
 };
 
-makeClientLoggedIn = function(userId, token, tokenExpires {
+makeClientLoggedIn = function(userId, token, tokenExpires) {
   storeLoginToken(userId, token, tokenExpires);
   Meteor.connection.setUserId(userId);
 };
diff --git a/packages/accounts-base/accounts_common.js b/packages/accounts-base/accounts_common.js
index b6ab826002..c63adbd18a 100644
--- a/packages/accounts-base/accounts_common.js
+++ b/packages/accounts-base/accounts_common.js
@@ -19,10 +19,15 @@ Accounts._options = {};
 //     client signups.
 // - forbidClientAccountCreation {Boolean}
 //     Do not allow clients to create accounts directly.
+// - _tokenLifetime {Number}
+//     Seconds until a login token expires.
+// - _tokenExpirationInterval {Number}
+//     How often (in seconds) to check for expired tokens
 //
 Accounts.config = function(options) {
   // validate option keys
-  var VALID_KEYS = ["sendVerificationEmail", "forbidClientAccountCreation"];
+  var VALID_KEYS = ["sendVerificationEmail", "forbidClientAccountCreation",
+                    "_tokenLifetime", "_tokenExpirationInterval"];
   _.each(_.keys(options), function (key) {
     if (!_.contains(VALID_KEYS, key)) {
       throw new Error("Accounts.config: Invalid key: " + key);
@@ -68,7 +73,9 @@ Accounts.LoginCancelledError.prototype.name = 'Accounts.LoginCancelledError';
 
 // how long (in seconds) until a login token expires
 // XXX maybe should be configurable
-TOKEN_LIFETIME = 604800; // one week
+DEFAULT_TOKEN_LIFETIME = 604800; // one week
 Accounts._tokenExpiration = function (when) {
-  return new Date(when.getTime() + TOKEN_LIFETIME * 1000);
+  var tokenLifetime = Accounts._options._tokenLifetime ||
+        DEFAULT_TOKEN_LIFETIME;
+  return new Date(when.getTime() + tokenLifetime * 1000);
 };
diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index 77044a5183..94123db9f3 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -36,9 +36,9 @@ Meteor.user = function () {
 // - `undefined`, meaning don't handle;
 // - {id: userId, token: *, tokenExpires: *}, if the user logged in
 //   successfully. tokenExpires is optional and intends to provide a hint to the
-//   client as to when the token will expire. If not provided, the client
-//   will assume the token expires TOKEN_LIFETIME seconds from when it receives
-//   it.
+//   client as to when the token will expire. If not provided, the client will
+//   call Accounts._tokenExpiration, passing it the date that it received the
+//   token.
 // - throw an error, if the user failed to log in.
 //
 Accounts.registerLoginHandler = function(handler) {
@@ -133,7 +133,7 @@ Meteor.methods({
 /// support reconnecting using a meteor login token
 
 // how often (in seconds) we check for expired tokens
-var EXPIRE_TOKENS_INTERVAL = 600; // 10 minutes
+var DEFAULT_EXPIRE_TOKENS_INTERVAL = 600; // 10 minutes
 
 // Login handler for resume tokens.
 Accounts.registerLoginHandler(function(options) {
@@ -175,8 +175,10 @@ var removeLoginToken = function (userId, loginToken) {
 
 // Deletes expired tokens from the database and closes all open connections
 // associated with these tokens.
-expireTokens = function () {
-  var oldestValidDate = new Date(new Date() - TOKEN_LIFETIME * 1000);
+// Exported for tests.
+var expireTokens = Accounts._expireTokens = function () {
+  var tokenLifetime = Accounts._options.tokenLifetime || DEFAULT_TOKEN_LIFETIME;
+  var oldestValidDate = new Date(new Date() - tokenLifetime * 1000);
   var usersWithExpiredTokens = Meteor.users.find({
     "services.resume.loginTokens.when": { $lt: oldestValidDate }
   });
@@ -203,7 +205,9 @@ expireTokens = function () {
 };
 
 Meteor.users._ensureIndex("services.resume.loginTokens.when", { sparse: true });
-Meteor.setInterval(expireTokens, EXPIRE_TOKENS_INTERVAL);
+var expireInterval = Accounts._options.tokenExpirationInterval ||
+      DEFAULT_EXPIRE_TOKENS_INTERVAL;
+Meteor.setInterval(expireTokens, expireInterval * 1000);
 
 
 ///

From 8621c18bc1f47723e40826322bb327ae2ae3aba2 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Thu, 29 Aug 2013 18:46:58 -0700
Subject: [PATCH 032/335] Add token expiration test and fix bugs so it passes.

Also make all token-expiration-related times configurable via Accounts.config.
---
 packages/accounts-base/accounts_client.js     | 30 +++++++++------
 packages/accounts-base/accounts_common.js     | 19 +++++++++-
 packages/accounts-base/accounts_server.js     | 22 +++++++----
 packages/accounts-base/localstorage_token.js  |  6 +--
 packages/accounts-password/password_server.js |  2 +-
 packages/accounts-password/password_tests.js  | 38 ++++++++++++++++++-
 packages/livedata/livedata_server.js          | 13 +++++--
 7 files changed, 97 insertions(+), 33 deletions(-)

diff --git a/packages/accounts-base/accounts_client.js b/packages/accounts-base/accounts_client.js
index a153c7d9ee..3c48a6c9a4 100644
--- a/packages/accounts-base/accounts_client.js
+++ b/packages/accounts-base/accounts_client.js
@@ -93,18 +93,24 @@ Accounts.callLoginMethod = function (options) {
     } else {
       Meteor.connection.onReconnect = function() {
         reconnected = true;
-        Accounts.callLoginMethod({
-          methodArguments: [{resume: result.token}],
-          // Reconnect quiescence ensures that the user doesn't see an
-          // intermediate state before the login method finishes. So we don't
-          // need to show a logging-in animation.
-          _suppressLoggingIn: true,
-          userCallback: function (error) {
-            if (error) {
-              makeClientLoggedOut();
-            }
-            options.userCallback(error);
-          }});
+        // XXX A DDP disconnect message would be helpful here, to know if our
+        // connection got closed because of an expired token.
+        if (! result.tokenExpires)
+          result.tokenExpires = Accounts._tokenExpiration(new Date());
+        if (! Accounts._tokenExpiresSoon(result.tokenExpires)) {
+          Accounts.callLoginMethod({
+            methodArguments: [{resume: result.token}],
+            // Reconnect quiescence ensures that the user doesn't see an
+            // intermediate state before the login method finishes. So we don't
+            // need to show a logging-in animation.
+            _suppressLoggingIn: true,
+            userCallback: function (error) {
+              if (error) {
+                makeClientLoggedOut();
+              }
+              options.userCallback(error);
+            }});
+        }
       };
     }
   };
diff --git a/packages/accounts-base/accounts_common.js b/packages/accounts-base/accounts_common.js
index c63adbd18a..ffbd10ad57 100644
--- a/packages/accounts-base/accounts_common.js
+++ b/packages/accounts-base/accounts_common.js
@@ -23,11 +23,15 @@ Accounts._options = {};
 //     Seconds until a login token expires.
 // - _tokenExpirationInterval {Number}
 //     How often (in seconds) to check for expired tokens
+// - _minTokenLifetime {Number}
+//     The minimum number of seconds until a token expires in order for the
+//     client to be willing to connect with that token.
 //
 Accounts.config = function(options) {
   // validate option keys
   var VALID_KEYS = ["sendVerificationEmail", "forbidClientAccountCreation",
-                    "_tokenLifetime", "_tokenExpirationInterval"];
+                    "_tokenLifetime", "_tokenExpirationInterval",
+                    "_minTokenLifetime"];
   _.each(_.keys(options), function (key) {
     if (!_.contains(VALID_KEYS, key)) {
       throw new Error("Accounts.config: Invalid key: " + key);
@@ -41,6 +45,8 @@ Accounts.config = function(options) {
         throw new Error("Can't set `" + key + "` more than once");
       } else {
         Accounts._options[key] = options[key];
+        if (key === "_tokenExpirationInterval" && Meteor.isServer)
+          initExpireTokenInterval();
       }
     }
   });
@@ -72,10 +78,19 @@ Accounts.LoginCancelledError.prototype = new Error();
 Accounts.LoginCancelledError.prototype.name = 'Accounts.LoginCancelledError';
 
 // how long (in seconds) until a login token expires
-// XXX maybe should be configurable
 DEFAULT_TOKEN_LIFETIME = 604800; // one week
+// We don't try to auto-login with a token that is going to expire within
+// MIN_TOKEN_LIFETIME seconds, to avoid abrupt disconnects from expiring tokens.
+var DEFAULT_MIN_TOKEN_LIFETIME = 3600; // one hour
+
 Accounts._tokenExpiration = function (when) {
   var tokenLifetime = Accounts._options._tokenLifetime ||
         DEFAULT_TOKEN_LIFETIME;
   return new Date(when.getTime() + tokenLifetime * 1000);
 };
+
+Accounts._tokenExpiresSoon = function (when) {
+  var minLifetime = Accounts._options._minTokenLifetime ||
+        DEFAULT_MIN_TOKEN_LIFETIME;
+  return new Date() > (new Date(when) - minLifetime * 1000);
+};
diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index 94123db9f3..5d47e83cda 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -175,9 +175,8 @@ var removeLoginToken = function (userId, loginToken) {
 
 // Deletes expired tokens from the database and closes all open connections
 // associated with these tokens.
-// Exported for tests.
-var expireTokens = Accounts._expireTokens = function () {
-  var tokenLifetime = Accounts._options.tokenLifetime || DEFAULT_TOKEN_LIFETIME;
+var expireTokens = function () {
+  var tokenLifetime = Accounts._options._tokenLifetime || DEFAULT_TOKEN_LIFETIME;
   var oldestValidDate = new Date(new Date() - tokenLifetime * 1000);
   var usersWithExpiredTokens = Meteor.users.find({
     "services.resume.loginTokens.when": { $lt: oldestValidDate }
@@ -186,6 +185,8 @@ var expireTokens = Accounts._expireTokens = function () {
   var oldTokens = [];
   usersWithExpiredTokens.forEach(function (user) {
     _.each(user.services.resume.loginTokens, function (token) {
+      if (typeof token.when === "number")
+        token.when = new Date(token.when);
       if (token.when < oldestValidDate)
         oldTokens.push(token.token);
     });
@@ -199,16 +200,21 @@ var expireTokens = Accounts._expireTokens = function () {
         when: { $lt: oldestValidDate }
       }
     }
-  });
+  }, { multi: true });
 
   Meteor.server._closeAllForTokens(oldTokens);
 };
 
 Meteor.users._ensureIndex("services.resume.loginTokens.when", { sparse: true });
-var expireInterval = Accounts._options.tokenExpirationInterval ||
-      DEFAULT_EXPIRE_TOKENS_INTERVAL;
-Meteor.setInterval(expireTokens, expireInterval * 1000);
-
+var expireTokenInterval;
+initExpireTokenInterval = function () {
+  if (expireTokenInterval)
+    Meteor.clearInterval(expireTokenInterval);
+  var expirePeriod = Accounts._options._tokenExpirationInterval ||
+        DEFAULT_EXPIRE_TOKENS_INTERVAL;
+  expireTokenInterval = Meteor.setInterval(expireTokens, expirePeriod * 1000);
+};
+initExpireTokenInterval();
 
 ///
 /// CREATE USER HOOKS
diff --git a/packages/accounts-base/localstorage_token.js b/packages/accounts-base/localstorage_token.js
index 46bea22549..023913cbfa 100644
--- a/packages/accounts-base/localstorage_token.js
+++ b/packages/accounts-base/localstorage_token.js
@@ -4,9 +4,6 @@
 // browser.
 
 var lastLoginTokenWhenPolled;
-// We don't try to auto-login with a token that is going to expire within
-// MIN_TOKEN_LIFETIME seconds, to avoid abrupt disconnects from expiring tokens.
-var MIN_TOKEN_LIFETIME = 3600; // one hour
 
 // Login with a Meteor access token. This is the only public function
 // here.
@@ -76,8 +73,7 @@ var storedUserId = function() {
 
 var unstoreLoginTokenIfExpiresSoon = function () {
   var tokenExpires = Meteor._localStorage.getItem(loginTokenExpiresKey);
-  if (tokenExpires &&
-      new Date() > (new Date(tokenExpires) - MIN_TOKEN_LIFETIME * 1000))
+  if (tokenExpires && Accounts._tokenExpiresSoon(tokenExpires))
     unstoreLoginToken();
 };
 
diff --git a/packages/accounts-password/password_server.js b/packages/accounts-password/password_server.js
index 1031e2fbf4..1771cb1e91 100644
--- a/packages/accounts-password/password_server.js
+++ b/packages/accounts-password/password_server.js
@@ -144,7 +144,7 @@ Accounts.registerLoginHandler(function (options) {
 
   return {
     token: stampedLoginToken.token,
-    tokenExpires: Accounts._tokenExpires(stampedLoginToken.when),
+    tokenExpires: Accounts._tokenExpiration(stampedLoginToken.when),
     id: user._id
   };
 });
diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index 3cfec9511f..0195ee1b18 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -1,3 +1,9 @@
+Accounts.config({
+  _tokenLifetime: 5,
+  _tokenExpirationInterval: 5,
+  _minTokenLifetime: 1
+});
+
 if (Meteor.isClient) (function () {
 
   // XXX note, only one test can do login/logout things at once! for
@@ -255,6 +261,7 @@ if (Meteor.isClient) (function () {
         test.equal(result, null);
       }));
     },
+    logoutStep,
     function(test, expect) {
       var expectLoginError = expect(function (err) {
         test.isTrue(err);
@@ -267,8 +274,35 @@ if (Meteor.isClient) (function () {
           Meteor.loginWithToken(token, expectLoginError);
         });
       });
-    }
-
+    },
+    logoutStep,
+    function(test, expect) {
+      // Test that login tokens get expired. We should get logged out when a
+      // token expires, and not be able to log in again with the same token.
+      var expectLoggedOut = expect(function () {
+        test.equal(Meteor.user(), undefined);
+      });
+      var expectLoginError = expect(function (err) {
+        test.isTrue(err);
+      });
+      var expectNoError = expect(function (err) {
+        test.equal(err, undefined);
+      });
+      var expectToken = expect(function (token) {
+        test.isTrue(token);
+      });
+      var token;
+      Meteor.loginWithPassword(username, password2, function (error) {
+        expectNoError(error);
+        token = Accounts._storedLoginToken();
+      });
+      Meteor.setTimeout(function () {
+        expectToken(token);
+        expectLoggedOut();
+        Meteor.loginWithToken(token, expectLoginError);
+      }, 10*1000);
+    },
+    logoutStep
   ]);
 
 }) ();
diff --git a/packages/livedata/livedata_server.js b/packages/livedata/livedata_server.js
index bbceeaf7eb..2942736a22 100644
--- a/packages/livedata/livedata_server.js
+++ b/packages/livedata/livedata_server.js
@@ -238,7 +238,6 @@ var Session = function (server, version) {
   self._universalSubs = [];
 
   self.userId = null;
-  self.loginToken = null;
 
   // Per-connection scratch area. This is only used internally, but we
   // should have real and documented API for this sort of thing someday.
@@ -666,8 +665,8 @@ _.extend(Session.prototype, {
 
   _setLoginToken: function (newToken) {
     var self = this;
-    var oldToken = self.loginToken;
-    self.loginToken = newToken;
+    var oldToken = self.sessionData.loginToken;
+    self.sessionData.loginToken = newToken;
     self.server._loginTokenChanged(self, newToken, oldToken);
   },
 
@@ -1371,13 +1370,21 @@ _.extend(Server.prototype, {
     var self = this;
     _.each(tokens, function (token) {
       if (_.has(self.sessionsByLoginToken, token)) {
+        var destroyedIds = [];
         _.each(self.sessionsByLoginToken[token], function (sessionId) {
           if (_.indexOf(excludeSessions, sessionId) === -1) {
             self.sessions[sessionId].cleanup();
             self.sessions[sessionId].destroy();
             delete self.sessions[sessionId];
+            destroyedIds.push(sessionId);
           }
         });
+        self.sessionsByLoginToken[token] = _.filter(
+          self.sessionsByLoginToken[token],
+          function (sessionId) {
+            return _.indexOf(destroyedIds, sessionId) === -1;
+          }
+        );
       }
     });
   }

From 10d49451d949919437dcccbfe4db5a81ccb27a49 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Fri, 30 Aug 2013 18:06:49 -0700
Subject: [PATCH 033/335] Add experimental "disconnected" DDP message.

Client uses this to unset user id when a forced logout happens.
---
 packages/livedata/DDP.md                 | 12 ++++++
 packages/livedata/livedata_connection.js | 11 ++++++
 packages/livedata/livedata_server.js     | 48 +++++++++++++++++-------
 3 files changed, 58 insertions(+), 13 deletions(-)

diff --git a/packages/livedata/DDP.md b/packages/livedata/DDP.md
index dc59ece7c9..2ef93578e3 100644
--- a/packages/livedata/DDP.md
+++ b/packages/livedata/DDP.md
@@ -222,6 +222,18 @@ The error message contains the following fields:
  * `offendingMessage`: if the original message parsed properly, it is included
    here
 
+## Disconnection
+
+### Messages:
+
+ * `disconnected` (server->client)
+   - `reason`: string ("logged_out" or "token_expired")
+
+### Procedure:
+
+ * Before the server disconnects a client, it can optionally send a disconnected
+   message to indicate the cause of the disconnect.
+
 ## Appendix: EJSON
 
 EJSON is a way of embedding more than the built-in JSON types in JSON.  It
diff --git a/packages/livedata/livedata_connection.js b/packages/livedata/livedata_connection.js
index 04fb380f90..68ea20ced0 100644
--- a/packages/livedata/livedata_connection.js
+++ b/packages/livedata/livedata_connection.js
@@ -209,6 +209,8 @@ var Connection = function (url, options) {
       self._livedata_nosub(msg);
     else if (msg.msg === 'result')
       self._livedata_result(msg);
+    else if (msg.msg === 'disconnected')
+      self._livedata_disconnected(msg);
     else if (msg.msg === 'error')
       self._livedata_error(msg);
     else
@@ -1319,6 +1321,15 @@ _.extend(Connection.prototype, {
     });
   },
 
+  _livedata_disconnected: function (msg) {
+    var self = this;
+    var reason = msg.reason;
+    if (reason === "logged_out" || reason === "token_expired") {
+      self.setUserId(null);
+      self.onReconnect = null;
+    }
+  },
+
   _livedata_error: function (msg) {
     Meteor._debug("Received error from server: ", msg.reason);
     if (msg.offendingMessage)
diff --git a/packages/livedata/livedata_server.js b/packages/livedata/livedata_server.js
index 2942736a22..c4bf1b06cf 100644
--- a/packages/livedata/livedata_server.js
+++ b/packages/livedata/livedata_server.js
@@ -452,6 +452,12 @@ _.extend(Session.prototype, {
     self.send(msg);
   },
 
+  // Send a DDP disconnected message.
+  sendDisconnected: function (reason) {
+    var self = this;
+    self.send({ msg: "disconnected", reason: reason });
+  },
+
   // Process 'msg' as an incoming message. (But as a guard against
   // race conditions during reconnection, ignore the message if
   // 'socket' is not the currently connected socket.)
@@ -599,8 +605,8 @@ _.extend(Session.prototype, {
       };
 
       // Closes all sessions associated with these tokens except this one.
-      var closeAll = function (tokens) {
-        self._closeAllForTokens(tokens, [self.id]);
+      var closeAll = function (tokens, reason) {
+        self._closeAllForTokens(tokens, reason);
       };
 
       var invocation = new MethodInvocation({
@@ -670,9 +676,9 @@ _.extend(Session.prototype, {
     self.server._loginTokenChanged(self, newToken, oldToken);
   },
 
-  _closeAllForTokens: function (tokens) {
+  _closeAllForTokens: function (tokens, reason) {
     var self = this;
-    self.server._closeAllForTokens(tokens, [self.id]);
+    self.server._closeAllForTokens(tokens, reason, [self.id]);
   },
 
   // Sets the current user id in all appropriate contexts and reruns
@@ -1364,21 +1370,37 @@ _.extend(Server.prototype, {
     self.sessionsByLoginToken[newToken].push(session.id);
   },
 
-  // Close all open sessions associated with any of the tokens in `tokens`,
-  // except for sessions with ids in `excludeSessions`.
-  _closeAllForTokens: function (tokens, excludeSessions) {
+  // Close all open sessions associated with any of the tokens in `tokens`. If
+  // `reason` is provided, sends each session a disconnected message before
+  // closing it. `excludeSessions` is an optional array of strings (session ids)
+  // to not close, even if they match a token in `tokens`.
+  _closeAllForTokens: function (tokens, reason, excludeSessions) {
     var self = this;
+
+    if (! excludeSessions && typeof reason === "object") {
+      excludeSessions = reason;
+      reason = undefined;
+    }
+
+    if (tokens.length)
     _.each(tokens, function (token) {
       if (_.has(self.sessionsByLoginToken, token)) {
         var destroyedIds = [];
         _.each(self.sessionsByLoginToken[token], function (sessionId) {
-          if (_.indexOf(excludeSessions, sessionId) === -1) {
-            self.sessions[sessionId].cleanup();
-            self.sessions[sessionId].destroy();
-            delete self.sessions[sessionId];
-            destroyedIds.push(sessionId);
-          }
+          if (_.indexOf(excludeSessions, sessionId) !== -1)
+            return;
+
+          // Destroy session and remove from self.sessions.
+          var session = self.sessions[sessionId];
+          if (reason)
+            session.sendDisconnected(reason);
+          session.cleanup();
+          session.destroy();
+          delete self.sessions[sessionId];
+          destroyedIds.push(sessionId);
         });
+
+        // Remove destroyed sessions from self.sessionsByLoginToken.
         self.sessionsByLoginToken[token] = _.filter(
           self.sessionsByLoginToken[token],
           function (sessionId) {

From e84f0adb7886d45d68cb4f195d967d4596ffdc75 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Fri, 30 Aug 2013 18:09:02 -0700
Subject: [PATCH 034/335] Add test for Meteor._logoutAllOthers.

Fix bugs to make it work.
---
 packages/accounts-base/accounts_client.js    | 30 +++++++----
 packages/accounts-base/accounts_server.js    | 12 +++--
 packages/accounts-base/localstorage_token.js |  2 +-
 packages/accounts-password/password_tests.js | 52 ++++++++++++++++++--
 4 files changed, 75 insertions(+), 21 deletions(-)

diff --git a/packages/accounts-base/accounts_client.js b/packages/accounts-base/accounts_client.js
index 3c48a6c9a4..1b87252ccc 100644
--- a/packages/accounts-base/accounts_client.js
+++ b/packages/accounts-base/accounts_client.js
@@ -180,16 +180,26 @@ Meteor.logout = function (callback) {
   });
 };
 
-Meteor._logoutAllOthers = function (callback) {
-  Meteor.apply('_logoutAllOthers', [], {wait: true}, function (error, result) {
-    if (error) {
-      callback && callback(error);
-    } else {
-      // The method should return a new valid token that we should start using.
-      makeClientLoggedIn(Meteor.userId(), result.token, result.tokenExpires);
-      callback && callback();
-    }
-  });
+// Set opts._noDelay to close other open connections without any delay, rather
+// than the 10 second default delay. Used by test.
+Meteor._logoutAllOthers = function (opts, callback) {
+  if (! callback && typeof opts === "Function") {
+    callback = opts;
+    opts = {};
+  }
+  Meteor.apply('_logoutAllOthers', [opts], { wait: true },
+               function (error, result) {
+                 console.log("logged out others");
+                 if (error) {
+                   callback && callback(error);
+                 } else {
+                   // The method should return a new valid token that we should
+                   // start using.
+                   makeClientLoggedIn(Meteor.userId(), result.token,
+                                      result.tokenExpires);
+                   callback && callback();
+                 }
+               });
 };
 
 ///
diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index 5d47e83cda..7f07d4bc84 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -95,8 +95,9 @@ Meteor.methods({
   // Nuke everything: delete all the user's tokens and close all open
   // connections logged in as this user, except this connection. Returns a fresh
   // new login token that this client can use.
-  _logoutAllOthers: function () {
+  _logoutAllOthers: function (opts) {
     var self = this;
+    opts = opts || {};
     var user = Meteor.users.findOne(self.userId);
     if (user) {
       var tokens = user.services.resume.loginTokens;
@@ -106,11 +107,12 @@ Meteor.methods({
       // Wait 10 seconds before closing the connections. This is to give other
       // clients using our token a chance to find a new token in localStorage so
       // that when they get disconnected they reconnect with a valid token.
+      var delay = opts._noDelay ? 0 : 10;
       Meteor.setTimeout(function () {
         self._closeAllForTokens(_.map(tokens, function (token) {
           return token.token;
-        }));
-      }, 10*1000);
+        }), "logged_out");
+      }, delay * 1000);
 
       var newToken = Accounts._generateStampedLoginToken();
       Meteor.users.update(self.userId, {
@@ -118,7 +120,7 @@ Meteor.methods({
           "services.resume.loginTokens": newToken
         }
       });
-      self._setLoginToken(newToken);
+      self._setLoginToken(newToken.token);
       return {
         token: newToken.token,
         tokenExpires: Accounts._tokenExpiration(newToken.when)
@@ -202,7 +204,7 @@ var expireTokens = function () {
     }
   }, { multi: true });
 
-  Meteor.server._closeAllForTokens(oldTokens);
+  Meteor.server._closeAllForTokens(oldTokens, "token_expired");
 };
 
 Meteor.users._ensureIndex("services.resume.loginTokens.when", { sparse: true });
diff --git a/packages/accounts-base/localstorage_token.js b/packages/accounts-base/localstorage_token.js
index 023913cbfa..8e1fb21086 100644
--- a/packages/accounts-base/localstorage_token.js
+++ b/packages/accounts-base/localstorage_token.js
@@ -73,7 +73,7 @@ var storedUserId = function() {
 
 var unstoreLoginTokenIfExpiresSoon = function () {
   var tokenExpires = Meteor._localStorage.getItem(loginTokenExpiresKey);
-  if (tokenExpires && Accounts._tokenExpiresSoon(tokenExpires))
+  if (tokenExpires && Accounts._tokenExpiresSoon(new Date(tokenExpires)))
     unstoreLoginToken();
 };
 
diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index 0195ee1b18..3ae24348b5 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -277,24 +277,26 @@ if (Meteor.isClient) (function () {
     },
     logoutStep,
     function(test, expect) {
+      // XXX would be nice to write this test in a way that avoids the
+      // possibly-flaky timing stuff (e.g. have a test hook for expiring tokens
+      // on demand rather than waiting for them to expire)
+
       // Test that login tokens get expired. We should get logged out when a
       // token expires, and not be able to log in again with the same token.
       var expectLoggedOut = expect(function () {
-        test.equal(Meteor.user(), undefined);
+        test.equal(Meteor.user(), null);
       });
       var expectLoginError = expect(function (err) {
         test.isTrue(err);
       });
-      var expectNoError = expect(function (err) {
-        test.equal(err, undefined);
-      });
       var expectToken = expect(function (token) {
         test.isTrue(token);
       });
       var token;
       Meteor.loginWithPassword(username, password2, function (error) {
-        expectNoError(error);
+        test.isFalse(error);
         token = Accounts._storedLoginToken();
+        expectToken(token);
       });
       Meteor.setTimeout(function () {
         expectToken(token);
@@ -302,6 +304,46 @@ if (Meteor.isClient) (function () {
         Meteor.loginWithToken(token, expectLoginError);
       }, 10*1000);
     },
+    logoutStep,
+    function (test, expect) {
+      // Test that Meteor._logoutAllOthers logs out a second authenticated
+      // connection.
+      var expectLoggedIn = expect(function (err, result) {
+        test.isTrue(Meteor.user());
+      });
+      var expectLoginErr = expect(function (err) {
+        test.isTrue(err);
+      });
+
+      var token;
+
+      // copied from livedata/client_convenience.js
+      var ddpUrl = '/';
+      if (typeof __meteor_runtime_config__ !== "undefined") {
+        if (__meteor_runtime_config__.DDP_DEFAULT_CONNECTION_URL)
+          ddpUrl = __meteor_runtime_config__.DDP_DEFAULT_CONNECTION_URL;
+      }
+      var secondConn = DDP.connect(ddpUrl);
+
+      Meteor.loginWithPassword(username, password2, function (err, result) {
+        expectLoggedIn(err, result);
+        token = Accounts._storedLoginToken();
+        secondConn.call("login", {
+          resume: token
+        }, function (err, result) {
+          test.isFalse(err);
+          Meteor._logoutAllOthers({ _noDelay: true }, function () {
+            // secondConn should be logged out and subsequently fail resume
+            // login, but Meteor.connection should stay logged in.
+            Meteor.setTimeout(function () {
+              test.isTrue(Meteor.user());
+              test.isFalse(secondConn.userId());
+              secondConn.call("login", { resume: token }, expectLoginErr);
+            }, 50);
+          });
+        });
+      });
+    },
     logoutStep
   ]);
 

From 21dd57c95dfd61eb9e2539ebdae08e86f393012f Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Mon, 2 Sep 2013 19:04:01 -0700
Subject: [PATCH 035/335] Allow DDP client to register onDisconnect callback.

accounts-base uses this to handle disconnects due to users being intentionally
logged out.
---
 packages/accounts-base/accounts_client.js | 9 ++++++++-
 packages/livedata/livedata_connection.js  | 5 +----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/accounts-base/accounts_client.js b/packages/accounts-base/accounts_client.js
index 1b87252ccc..e60c417bf4 100644
--- a/packages/accounts-base/accounts_client.js
+++ b/packages/accounts-base/accounts_client.js
@@ -112,6 +112,13 @@ Accounts.callLoginMethod = function (options) {
             }});
         }
       };
+
+      Meteor.connection._onDisconnect = function (reason) {
+        var loggedOutReasons = ["logged_out", "token_expired",
+                                "user_deleted", "token_deleted"];
+        if (_.indexOf(loggedOutReasons, reason) !== -1)
+          makeClientLoggedOut();
+      };
     }
   };
 
@@ -162,6 +169,7 @@ makeClientLoggedOut = function() {
   unstoreLoginToken();
   Meteor.connection.setUserId(null);
   Meteor.connection.onReconnect = null;
+  Meteor.connection._onDisconnect = null;
 };
 
 makeClientLoggedIn = function(userId, token, tokenExpires) {
@@ -189,7 +197,6 @@ Meteor._logoutAllOthers = function (opts, callback) {
   }
   Meteor.apply('_logoutAllOthers', [opts], { wait: true },
                function (error, result) {
-                 console.log("logged out others");
                  if (error) {
                    callback && callback(error);
                  } else {
diff --git a/packages/livedata/livedata_connection.js b/packages/livedata/livedata_connection.js
index 68ea20ced0..aac5b8e3d9 100644
--- a/packages/livedata/livedata_connection.js
+++ b/packages/livedata/livedata_connection.js
@@ -1324,10 +1324,7 @@ _.extend(Connection.prototype, {
   _livedata_disconnected: function (msg) {
     var self = this;
     var reason = msg.reason;
-    if (reason === "logged_out" || reason === "token_expired") {
-      self.setUserId(null);
-      self.onReconnect = null;
-    }
+    self._onDisconnect && self._onDisconnect(reason);
   },
 
   _livedata_error: function (msg) {

From 09ba59c50b49e97f7d2d03097ec1277ba3b6d7a9 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Mon, 2 Sep 2013 19:05:00 -0700
Subject: [PATCH 036/335] Close users' connections when they or their tokens
 are deleted.

---
 packages/accounts-base/accounts_server.js | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index 7f07d4bc84..203c0f6373 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -525,3 +525,24 @@ Meteor.users._ensureIndex('username', {unique: 1, sparse: 1});
 Meteor.users._ensureIndex('emails.address', {unique: 1, sparse: 1});
 Meteor.users._ensureIndex('services.resume.loginTokens.token',
                           {unique: 1, sparse: 1});
+
+///
+/// LOGGING OUT DELETED USERS
+///
+
+var closeTokensForUser = function (userTokens, reason) {
+  Meteor.server._closeAllForTokens(_.map(userTokens, function (token) {
+    return token.token;
+  }), reason);
+};
+
+Meteor.users.find().observe({
+  changed: function (newUser, oldUser) {
+    var removedTokens = _.difference(oldUser.services.resume.loginTokens,
+                                     newUser.services.resume.loginTokens);
+    closeTokensForUser(removedTokens, "token_deleted");
+  },
+  removed: function (oldUser) {
+    closeTokensForUser(oldUser.services.resume.loginTokens, "user_deleted");
+  }
+});

From dab6df0eb919d279617f047787e90ed729845a84 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Tue, 3 Sep 2013 20:41:55 -0700
Subject: [PATCH 037/335] Remove DDP disconnected message.

Instead, using a friendlier error message for bad login tokens, and preferring
localStorage tokens to the result of login method in onReconnect (since
onReconnect doesn't get cleared because we don't have a disconnected message to
know when to clean it). Also tried to make tests a little cleaner.
---
 packages/accounts-base/accounts_client.js    |  56 ++++++-----
 packages/accounts-base/accounts_common.js    |   2 +-
 packages/accounts-base/accounts_server.js    |  75 ++++++++------
 packages/accounts-base/localstorage_token.js |   6 +-
 packages/accounts-password/password_tests.js | 100 ++++++++++++-------
 packages/livedata/DDP.md                     |  12 ---
 packages/livedata/livedata_common.js         |   3 -
 packages/livedata/livedata_connection.js     |   6 --
 packages/livedata/livedata_server.js         |  39 ++------
 9 files changed, 149 insertions(+), 150 deletions(-)

diff --git a/packages/accounts-base/accounts_client.js b/packages/accounts-base/accounts_client.js
index e60c417bf4..f61cf24e5e 100644
--- a/packages/accounts-base/accounts_client.js
+++ b/packages/accounts-base/accounts_client.js
@@ -91,13 +91,21 @@ Accounts.callLoginMethod = function (options) {
     if (err || !result || !result.token) {
       Meteor.connection.onReconnect = null;
     } else {
-      Meteor.connection.onReconnect = function() {
+      Meteor.connection.onReconnect = function () {
         reconnected = true;
-        // XXX A DDP disconnect message would be helpful here, to know if our
-        // connection got closed because of an expired token.
+        // If our token was updated in storage, use the latest one.
+        var storedToken = storedLoginToken();
+        if (storedToken) {
+          result = {
+            token: storedToken,
+            tokenExpires: storedLoginTokenExpires()
+          };
+        }
         if (! result.tokenExpires)
           result.tokenExpires = Accounts._tokenExpiration(new Date());
-        if (! Accounts._tokenExpiresSoon(result.tokenExpires)) {
+        if (Accounts._tokenExpiresSoon(result.tokenExpires)) {
+          makeClientLoggedOut();
+        } else {
           Accounts.callLoginMethod({
             methodArguments: [{resume: result.token}],
             // Reconnect quiescence ensures that the user doesn't see an
@@ -112,13 +120,6 @@ Accounts.callLoginMethod = function (options) {
             }});
         }
       };
-
-      Meteor.connection._onDisconnect = function (reason) {
-        var loggedOutReasons = ["logged_out", "token_expired",
-                                "user_deleted", "token_deleted"];
-        if (_.indexOf(loggedOutReasons, reason) !== -1)
-          makeClientLoggedOut();
-      };
     }
   };
 
@@ -169,7 +170,6 @@ makeClientLoggedOut = function() {
   unstoreLoginToken();
   Meteor.connection.setUserId(null);
   Meteor.connection.onReconnect = null;
-  Meteor.connection._onDisconnect = null;
 };
 
 makeClientLoggedIn = function(userId, token, tokenExpires) {
@@ -188,24 +188,26 @@ Meteor.logout = function (callback) {
   });
 };
 
-// Set opts._noDelay to close other open connections without any delay, rather
-// than the 10 second default delay. Used by test.
-Meteor._logoutAllOthers = function (opts, callback) {
-  if (! callback && typeof opts === "Function") {
-    callback = opts;
-    opts = {};
-  }
-  Meteor.apply('_logoutAllOthers', [opts], { wait: true },
+Meteor._logoutAllOthers = function (callback) {
+  // Our connection is going to be closed, but we don't want to call the
+  // onReconnect handler until the result comes back for this method, because
+  // the token will have been deleted on the server. Instead, wait until we get
+  // a new token and call the reconnect handler with that.
+  // XXX this is messy.
+  // XXX what if login gets called before the callback runs?
+  var origOnReconnect = Meteor.connection.onReconnect;
+  var userId = Meteor.userId();
+  Meteor.connection.onReconnect = null;
+  Meteor.apply('_logoutAllOthers', [], { wait: true },
                function (error, result) {
                  if (error) {
-                   callback && callback(error);
-                 } else {
-                   // The method should return a new valid token that we should
-                   // start using.
-                   makeClientLoggedIn(Meteor.userId(), result.token,
-                                      result.tokenExpires);
-                   callback && callback();
+                   if (! Meteor.user())
+                     makeClientLoggedOut();
                  }
+                 Meteor.connection.onReconnect = origOnReconnect;
+                 storeLoginToken(userId, result.token, result.tokenExpires);
+                 Meteor.connection.onReconnect();
+                 callback && callback(error);
                });
 };
 
diff --git a/packages/accounts-base/accounts_common.js b/packages/accounts-base/accounts_common.js
index ffbd10ad57..4b2cc95d70 100644
--- a/packages/accounts-base/accounts_common.js
+++ b/packages/accounts-base/accounts_common.js
@@ -31,7 +31,7 @@ Accounts.config = function(options) {
   // validate option keys
   var VALID_KEYS = ["sendVerificationEmail", "forbidClientAccountCreation",
                     "_tokenLifetime", "_tokenExpirationInterval",
-                    "_minTokenLifetime"];
+                    "_minTokenLifetime", "_connectionCloseDelay"];
   _.each(_.keys(options), function (key) {
     if (!_.contains(VALID_KEYS, key)) {
       throw new Error("Accounts.config: Invalid key: " + key);
diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index 203c0f6373..4374ad2589 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -95,36 +95,27 @@ Meteor.methods({
   // Nuke everything: delete all the user's tokens and close all open
   // connections logged in as this user, except this connection. Returns a fresh
   // new login token that this client can use.
-  _logoutAllOthers: function (opts) {
+  _logoutAllOthers: function () {
     var self = this;
-    opts = opts || {};
     var user = Meteor.users.findOne(self.userId);
     if (user) {
       var tokens = user.services.resume.loginTokens;
-      Meteor.users.update(self.userId, {
-        $set: { "services.resume.loginTokens": [] }
-      });
-      // Wait 10 seconds before closing the connections. This is to give other
-      // clients using our token a chance to find a new token in localStorage so
-      // that when they get disconnected they reconnect with a valid token.
-      var delay = opts._noDelay ? 0 : 10;
-      Meteor.setTimeout(function () {
-        self._closeAllForTokens(_.map(tokens, function (token) {
-          return token.token;
-        }), "logged_out");
-      }, delay * 1000);
-
       var newToken = Accounts._generateStampedLoginToken();
       Meteor.users.update(self.userId, {
-        $push: {
-          "services.resume.loginTokens": newToken
+        $set: {
+          "services.resume.loginTokens": [newToken]
         }
       });
-      self._setLoginToken(newToken.token);
+      // We do not set the login token on this connection, to force the client
+      // to close this connection and open a new one with the new token.
+      // The observe on Meteor.users() will take care of closing connections
+      // with the right delay.
       return {
         token: newToken.token,
         tokenExpires: Accounts._tokenExpiration(newToken.when)
       };
+    } else {
+      throw new Error("You are not logged in.");
     }
   }
 });
@@ -147,8 +138,10 @@ Accounts.registerLoginHandler(function(options) {
     "services.resume.loginTokens.token": ""+options.resume
   });
 
-  if (!user)
-    throw new Meteor.Error(403, "Couldn't find login token");
+  if (!user) {
+    throw new Meteor.Error(403, "You've been logged out by the server. " +
+    "Please login again.");
+  }
 
   var token = _.find(user.services.resume.loginTokens, function (token) {
     return token.token === options.resume;
@@ -176,10 +169,11 @@ var removeLoginToken = function (userId, loginToken) {
 };
 
 // Deletes expired tokens from the database and closes all open connections
-// associated with these tokens.
-var expireTokens = function () {
+// associated with these tokens. Exported for tests.
+var expireTokens = Accounts._expireTokens = function (oldestValidDate) {
   var tokenLifetime = Accounts._options._tokenLifetime || DEFAULT_TOKEN_LIFETIME;
-  var oldestValidDate = new Date(new Date() - tokenLifetime * 1000);
+  oldestValidDate = oldestValidDate ||
+    (new Date(new Date() - tokenLifetime * 1000));
   var usersWithExpiredTokens = Meteor.users.find({
     "services.resume.loginTokens.when": { $lt: oldestValidDate }
   });
@@ -203,8 +197,8 @@ var expireTokens = function () {
       }
     }
   }, { multi: true });
-
-  Meteor.server._closeAllForTokens(oldTokens, "token_expired");
+  // The observe on Meteor.users will take care of closing connections for
+  // expired tokens.
 };
 
 Meteor.users._ensureIndex("services.resume.loginTokens.when", { sparse: true });
@@ -530,19 +524,34 @@ Meteor.users._ensureIndex('services.resume.loginTokens.token',
 /// LOGGING OUT DELETED USERS
 ///
 
-var closeTokensForUser = function (userTokens, reason) {
-  Meteor.server._closeAllForTokens(_.map(userTokens, function (token) {
-    return token.token;
-  }), reason);
+// By default, connections are closed with a 10 second delay, to give other
+// clients a chance to find a new token in localStorage before
+// reconnecting. Delay can be configured with Accounts.config.
+var closeTokensForUser = function (userTokens) {
+  var delay = 10;
+  if (_.has(Accounts._options, "_connectionCloseDelay"))
+    delay = Accounts._options._connectionCloseDelay;
+  Meteor.setTimeout(function () {
+    Meteor.server._closeAllForTokens(_.map(userTokens, function (token) {
+      return token.token;
+    }));
+  }, delay * 1000);
 };
 
 Meteor.users.find().observe({
   changed: function (newUser, oldUser) {
-    var removedTokens = _.difference(oldUser.services.resume.loginTokens,
-                                     newUser.services.resume.loginTokens);
-    closeTokensForUser(removedTokens, "token_deleted");
+    var removedTokens = [];
+    if (newUser.services && newUser.services.resume &&
+        oldUser.services && oldUser.services.resume) {
+      removedTokens = _.difference(oldUser.services.resume.loginTokens || [],
+                                   newUser.services.resume.loginTokens || []);
+    } else if (oldUser.services && oldUser.services.resume) {
+      removedTokens = oldUser.services.resume.loginTokens || [];
+    }
+    closeTokensForUser(removedTokens);
   },
   removed: function (oldUser) {
-    closeTokensForUser(oldUser.services.resume.loginTokens, "user_deleted");
+    if (oldUser.services && oldUser.services.resume)
+      closeTokensForUser(oldUser.services.resume.loginTokens || []);
   }
 });
diff --git a/packages/accounts-base/localstorage_token.js b/packages/accounts-base/localstorage_token.js
index 8e1fb21086..24c6e25318 100644
--- a/packages/accounts-base/localstorage_token.js
+++ b/packages/accounts-base/localstorage_token.js
@@ -63,10 +63,14 @@ unstoreLoginToken = function() {
 // This is private, but it is exported for now because it is used by a
 // test in accounts-password.
 //
-var storedLoginToken = Accounts._storedLoginToken = function() {
+storedLoginToken = Accounts._storedLoginToken = function() {
   return Meteor._localStorage.getItem(loginTokenKey);
 };
 
+storedLoginTokenExpires = function () {
+  return Meteor._localStorage.getItem(loginTokenExpiresKey);
+};
+
 var storedUserId = function() {
   return Meteor._localStorage.getItem(userIdKey);
 };
diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index 3ae24348b5..91d9141d36 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -1,7 +1,5 @@
 Accounts.config({
-  _tokenLifetime: 5,
-  _tokenExpirationInterval: 5,
-  _minTokenLifetime: 1
+  _connectionCloseDelay: 0
 });
 
 if (Meteor.isClient) (function () {
@@ -277,10 +275,6 @@ if (Meteor.isClient) (function () {
     },
     logoutStep,
     function(test, expect) {
-      // XXX would be nice to write this test in a way that avoids the
-      // possibly-flaky timing stuff (e.g. have a test hook for expiring tokens
-      // on demand rather than waiting for them to expire)
-
       // Test that login tokens get expired. We should get logged out when a
       // token expires, and not be able to log in again with the same token.
       var expectLoggedOut = expect(function () {
@@ -289,29 +283,43 @@ if (Meteor.isClient) (function () {
       var expectLoginError = expect(function (err) {
         test.isTrue(err);
       });
-      var expectToken = expect(function (token) {
-        test.isTrue(token);
+      var expectNoError = expect(function (err) {
+        test.isFalse(err);
       });
       var token;
+      var firstLoginCallback = true;
       Meteor.loginWithPassword(username, password2, function (error) {
-        test.isFalse(error);
-        token = Accounts._storedLoginToken();
-        expectToken(token);
+        // callback will be called again on reconnect after our token gets
+        // expired.
+        if (firstLoginCallback) {
+          token = Accounts._storedLoginToken();
+          test.isTrue(token);
+          test.isFalse(error);
+          Meteor.call("expireTokens", new Date(), function (error, result) {
+            expectNoError(error);
+          });
+        } else {
+          expectLoggedOut();
+          Meteor.loginWithToken(token, function (err) {
+            test.isFalse(Meteor.userId());
+            expectLoginError(err);
+          });
+        }
+        firstLoginCallback = false;
       });
-      Meteor.setTimeout(function () {
-        expectToken(token);
-        expectLoggedOut();
-        Meteor.loginWithToken(token, expectLoginError);
-      }, 10*1000);
     },
     logoutStep,
     function (test, expect) {
       // Test that Meteor._logoutAllOthers logs out a second authenticated
       // connection.
-      var expectLoggedIn = expect(function (err, result) {
-        test.isTrue(Meteor.user());
+
+      var expectNoError = expect(function (err) {
+        test.isFalse(err);
       });
-      var expectLoginErr = expect(function (err) {
+      var expectSecondConnLoggedOut = expect(function () {
+        test.isFalse(secondConn.userId());
+      });
+      var expectLoginError = expect(function (err) {
         test.isTrue(err);
       });
 
@@ -325,23 +333,37 @@ if (Meteor.isClient) (function () {
       }
       var secondConn = DDP.connect(ddpUrl);
 
-      Meteor.loginWithPassword(username, password2, function (err, result) {
-        expectLoggedIn(err, result);
-        token = Accounts._storedLoginToken();
-        secondConn.call("login", {
-          resume: token
-        }, function (err, result) {
-          test.isFalse(err);
-          Meteor._logoutAllOthers({ _noDelay: true }, function () {
-            // secondConn should be logged out and subsequently fail resume
-            // login, but Meteor.connection should stay logged in.
-            Meteor.setTimeout(function () {
-              test.isTrue(Meteor.user());
-              test.isFalse(secondConn.userId());
-              secondConn.call("login", { resume: token }, expectLoginErr);
-            }, 50);
-          });
+      var firstLoginCallback = true;
+
+      secondConn.onReconnect = function () {
+        expectSecondConnLoggedOut();
+        secondConn.call("login", { resume: token }, function (err, result) {
+          test.isFalse(secondConn.userId());
+          expectLoginError(err);
         });
+      };
+
+      Meteor.loginWithPassword(username, password2, function (err, result) {
+        test.isFalse(err);
+        if (firstLoginCallback) {
+          test.isTrue(Meteor.user());
+          token = Accounts._storedLoginToken();
+          secondConn.call("login", {
+            resume: token
+          }, function (err, result) {
+            test.isFalse(err);
+            Meteor._logoutAllOthers(function (err) {
+              expectNoError(err);
+            });
+          });
+        } else {
+          // Callback fires again after reconnect. We should still be logged in,
+          // but secondConn should be logged out and subsequently fail resume
+          // login.
+          test.isFalse(err);
+          test.isTrue(Meteor.user());
+        }
+        firstLoginCallback = false;
       });
     },
     logoutStep
@@ -352,6 +374,12 @@ if (Meteor.isClient) (function () {
 
 if (Meteor.isServer) (function () {
 
+  Meteor.methods({
+    expireTokens: function (oldestValidDate) {
+      Accounts._expireTokens(oldestValidDate);
+    }
+  });
+
   Tinytest.add(
     'passwords - setup more than one onCreateUserHook',
     function (test) {
diff --git a/packages/livedata/DDP.md b/packages/livedata/DDP.md
index 2ef93578e3..dc59ece7c9 100644
--- a/packages/livedata/DDP.md
+++ b/packages/livedata/DDP.md
@@ -222,18 +222,6 @@ The error message contains the following fields:
  * `offendingMessage`: if the original message parsed properly, it is included
    here
 
-## Disconnection
-
-### Messages:
-
- * `disconnected` (server->client)
-   - `reason`: string ("logged_out" or "token_expired")
-
-### Procedure:
-
- * Before the server disconnects a client, it can optionally send a disconnected
-   message to indicate the cause of the disconnect.
-
 ## Appendix: EJSON
 
 EJSON is a way of embedding more than the built-in JSON types in JSON.  It
diff --git a/packages/livedata/livedata_common.js b/packages/livedata/livedata_common.js
index dc2510c353..8c45863c85 100644
--- a/packages/livedata/livedata_common.js
+++ b/packages/livedata/livedata_common.js
@@ -33,9 +33,6 @@ MethodInvocation = function (options) {
   // deleted, etc.
   this._setLoginToken = options._setLoginToken || function () {};
 
-  // Closes all open connections associated with the given tokens.
-  this._closeAllForTokens = options._closeAllForTokens || function () {};
-
   // Scratch data scoped to this connection (livedata_connection on the
   // client, livedata_session on the server). This is only used
   // internally, but we should have real and documented API for this
diff --git a/packages/livedata/livedata_connection.js b/packages/livedata/livedata_connection.js
index aac5b8e3d9..ef70ecb6ea 100644
--- a/packages/livedata/livedata_connection.js
+++ b/packages/livedata/livedata_connection.js
@@ -1321,12 +1321,6 @@ _.extend(Connection.prototype, {
     });
   },
 
-  _livedata_disconnected: function (msg) {
-    var self = this;
-    var reason = msg.reason;
-    self._onDisconnect && self._onDisconnect(reason);
-  },
-
   _livedata_error: function (msg) {
     Meteor._debug("Received error from server: ", msg.reason);
     if (msg.offendingMessage)
diff --git a/packages/livedata/livedata_server.js b/packages/livedata/livedata_server.js
index c4bf1b06cf..aeee0f0204 100644
--- a/packages/livedata/livedata_server.js
+++ b/packages/livedata/livedata_server.js
@@ -452,12 +452,6 @@ _.extend(Session.prototype, {
     self.send(msg);
   },
 
-  // Send a DDP disconnected message.
-  sendDisconnected: function (reason) {
-    var self = this;
-    self.send({ msg: "disconnected", reason: reason });
-  },
-
   // Process 'msg' as an incoming message. (But as a guard against
   // race conditions during reconnection, ignore the message if
   // 'socket' is not the currently connected socket.)
@@ -604,17 +598,11 @@ _.extend(Session.prototype, {
         self._setLoginToken(newToken);
       };
 
-      // Closes all sessions associated with these tokens except this one.
-      var closeAll = function (tokens, reason) {
-        self._closeAllForTokens(tokens, reason);
-      };
-
       var invocation = new MethodInvocation({
         isSimulation: false,
         userId: self.userId,
         setUserId: setUserId,
         _setLoginToken: setLoginToken,
-        _closeAllForTokens: closeAll,
         unblock: unblock,
         sessionData: self.sessionData
       });
@@ -676,11 +664,6 @@ _.extend(Session.prototype, {
     self.server._loginTokenChanged(self, newToken, oldToken);
   },
 
-  _closeAllForTokens: function (tokens, reason) {
-    var self = this;
-    self.server._closeAllForTokens(tokens, reason, [self.id]);
-  },
-
   // Sets the current user id in all appropriate contexts and reruns
   // all subscriptions
   _setUserId: function(userId) {
@@ -1370,18 +1353,12 @@ _.extend(Server.prototype, {
     self.sessionsByLoginToken[newToken].push(session.id);
   },
 
-  // Close all open sessions associated with any of the tokens in `tokens`. If
-  // `reason` is provided, sends each session a disconnected message before
-  // closing it. `excludeSessions` is an optional array of strings (session ids)
+  // Close all open sessions associated with any of the tokens in
+  // `tokens`. `excludeSessions` is an optional array of strings (session ids)
   // to not close, even if they match a token in `tokens`.
-  _closeAllForTokens: function (tokens, reason, excludeSessions) {
+  _closeAllForTokens: function (tokens, excludeSessions) {
     var self = this;
 
-    if (! excludeSessions && typeof reason === "object") {
-      excludeSessions = reason;
-      reason = undefined;
-    }
-
     if (tokens.length)
     _.each(tokens, function (token) {
       if (_.has(self.sessionsByLoginToken, token)) {
@@ -1392,11 +1369,11 @@ _.extend(Server.prototype, {
 
           // Destroy session and remove from self.sessions.
           var session = self.sessions[sessionId];
-          if (reason)
-            session.sendDisconnected(reason);
-          session.cleanup();
-          session.destroy();
-          delete self.sessions[sessionId];
+          if (session) {
+            session.cleanup();
+            session.destroy();
+            delete self.sessions[sessionId];
+          }
           destroyedIds.push(sessionId);
         });
 

From 4ebdbd9f77f5870441a72bb7c2c0b57f8897712c Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Wed, 4 Sep 2013 10:43:47 -0700
Subject: [PATCH 038/335] On logout, disassociate connection from token before
 deleting token.

---
 packages/accounts-base/accounts_server.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index 4374ad2589..66ba568f0b 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -85,11 +85,10 @@ Meteor.methods({
 
   logout: function() {
     var token = this._getLoginToken();
+    this._setLoginToken(null);
     if (token && this.userId)
       removeLoginToken(this.userId, token);
     this.setUserId(null);
-    this._setLoginToken(null);
-    // XXX should close all connections open with this token?
   },
 
   // Nuke everything: delete all the user's tokens and close all open
@@ -160,6 +159,8 @@ Accounts._generateStampedLoginToken = function () {
   return {token: Random.id(), when: (new Date)};
 };
 
+// Deletes the given loginToken from the database. This will cause all
+// connections associated with the token to be closed.
 var removeLoginToken = function (userId, loginToken) {
   Meteor.users.update(userId, {
     $pull: {

From d9093d6cf8933f26c47260968cb2846af78fe646 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Wed, 4 Sep 2013 10:53:46 -0700
Subject: [PATCH 039/335] Test for logging out a user's connections when
 deleted.

Tests are flaky, not sure why yet.
---
 packages/accounts-password/password_tests.js | 21 +++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index 91d9141d36..56f1650bb1 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -366,7 +366,23 @@ if (Meteor.isClient) (function () {
         firstLoginCallback = false;
       });
     },
-    logoutStep
+    logoutStep,
+    function (test, expect) {
+      // Test that deleting a user logs out that user's connections.
+      var expectLoginError = expect(function (err) {
+        test.isTrue(err);
+      });
+      var firstLoginCallback = true;
+      Meteor.loginWithPassword(username, password2, function (err) {
+        if (firstLoginCallback) {
+          test.isFalse(err);
+          Meteor.call("removeUser", username);
+        } else {
+          expectLoginError(err);
+        }
+        firstLoginCallback = false;
+      });
+    }
   ]);
 
 }) ();
@@ -377,6 +393,9 @@ if (Meteor.isServer) (function () {
   Meteor.methods({
     expireTokens: function (oldestValidDate) {
       Accounts._expireTokens(oldestValidDate);
+    },
+    removeUser: function (username) {
+      Meteor.users.remove({ "username": username });
     }
   });
 

From 0bc4bc9c26299085b0b5521dd1a1b7b1d67cad51 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Thu, 5 Sep 2013 17:11:27 -0700
Subject: [PATCH 040/335] Clean up token deletion and tests.

---
 packages/accounts-base/accounts_client.js    |  7 +-
 packages/accounts-base/accounts_common.js    | 30 +++---
 packages/accounts-base/accounts_server.js    | 69 +++++++-------
 packages/accounts-password/password_tests.js | 97 ++++++++------------
 packages/livedata/livedata_common.js         |  4 +-
 packages/livedata/livedata_connection.js     |  2 -
 packages/livedata/livedata_server.js         | 11 +--
 7 files changed, 98 insertions(+), 122 deletions(-)

diff --git a/packages/accounts-base/accounts_client.js b/packages/accounts-base/accounts_client.js
index f61cf24e5e..9aef4bdc97 100644
--- a/packages/accounts-base/accounts_client.js
+++ b/packages/accounts-base/accounts_client.js
@@ -200,12 +200,9 @@ Meteor._logoutAllOthers = function (callback) {
   Meteor.connection.onReconnect = null;
   Meteor.apply('_logoutAllOthers', [], { wait: true },
                function (error, result) {
-                 if (error) {
-                   if (! Meteor.user())
-                     makeClientLoggedOut();
-                 }
                  Meteor.connection.onReconnect = origOnReconnect;
-                 storeLoginToken(userId, result.token, result.tokenExpires);
+                 if (! error)
+                   storeLoginToken(userId, result.token, result.tokenExpires);
                  Meteor.connection.onReconnect();
                  callback && callback(error);
                });
diff --git a/packages/accounts-base/accounts_common.js b/packages/accounts-base/accounts_common.js
index 4b2cc95d70..1de58f1b2d 100644
--- a/packages/accounts-base/accounts_common.js
+++ b/packages/accounts-base/accounts_common.js
@@ -19,19 +19,23 @@ Accounts._options = {};
 //     client signups.
 // - forbidClientAccountCreation {Boolean}
 //     Do not allow clients to create accounts directly.
-// - _tokenLifetime {Number}
+// - _tokenLifetimeSecs {Number}
 //     Seconds until a login token expires.
-// - _tokenExpirationInterval {Number}
+// - _tokenExpirationIntervalSecs {Number}
 //     How often (in seconds) to check for expired tokens
-// - _minTokenLifetime {Number}
+// - _minTokenLifetimeSecs {Number}
 //     The minimum number of seconds until a token expires in order for the
 //     client to be willing to connect with that token.
+// - _connectionCloseDelaySecs {Number}
+//     The number of seconds to wait before closing connections that when a user
+//     is logged out by the server. Defaults to 10, to allow clients to store a
+//     fresh token in localStorage when calling _logoutAllOthers.
 //
 Accounts.config = function(options) {
   // validate option keys
   var VALID_KEYS = ["sendVerificationEmail", "forbidClientAccountCreation",
-                    "_tokenLifetime", "_tokenExpirationInterval",
-                    "_minTokenLifetime", "_connectionCloseDelay"];
+                    "_tokenLifetimeSecs", "_tokenExpirationIntervalSecs",
+                    "_minTokenLifetimeSecs", "_connectionCloseDelaySecs"];
   _.each(_.keys(options), function (key) {
     if (!_.contains(VALID_KEYS, key)) {
       throw new Error("Accounts.config: Invalid key: " + key);
@@ -78,19 +82,19 @@ Accounts.LoginCancelledError.prototype = new Error();
 Accounts.LoginCancelledError.prototype.name = 'Accounts.LoginCancelledError';
 
 // how long (in seconds) until a login token expires
-DEFAULT_TOKEN_LIFETIME = 604800; // one week
+DEFAULT_TOKEN_LIFETIME_SECS = 604800; // one week
 // We don't try to auto-login with a token that is going to expire within
 // MIN_TOKEN_LIFETIME seconds, to avoid abrupt disconnects from expiring tokens.
-var DEFAULT_MIN_TOKEN_LIFETIME = 3600; // one hour
+var DEFAULT_MIN_TOKEN_LIFETIME_SECS = 3600; // one hour
 
 Accounts._tokenExpiration = function (when) {
-  var tokenLifetime = Accounts._options._tokenLifetime ||
-        DEFAULT_TOKEN_LIFETIME;
-  return new Date(when.getTime() + tokenLifetime * 1000);
+  var tokenLifetimeSecs = Accounts._options._tokenLifetimeSecs ||
+        DEFAULT_TOKEN_LIFETIME_SECS;
+  return new Date(when.getTime() + tokenLifetimeSecs * 1000);
 };
 
 Accounts._tokenExpiresSoon = function (when) {
-  var minLifetime = Accounts._options._minTokenLifetime ||
-        DEFAULT_MIN_TOKEN_LIFETIME;
-  return new Date() > (new Date(when) - minLifetime * 1000);
+  var minLifetimeSecs = Accounts._options._minTokenLifetimeSecs ||
+        DEFAULT_MIN_TOKEN_LIFETIME_SECS;
+  return new Date() > (new Date(when) - minLifetimeSecs * 1000);
 };
diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index 66ba568f0b..c97f0e17ab 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -91,12 +91,16 @@ Meteor.methods({
     this.setUserId(null);
   },
 
-  // Nuke everything: delete all the user's tokens and close all open
-  // connections logged in as this user, except this connection. Returns a fresh
-  // new login token that this client can use.
+  // Nuke everything: delete all the current user's tokens and close all open
+  // connections logged in as this user. Returns a fresh new login token that
+  // this client can use.
   _logoutAllOthers: function () {
     var self = this;
-    var user = Meteor.users.findOne(self.userId);
+    var user = Meteor.users.findOne(self.userId, {
+      fields: {
+        "services.resume.loginTokens": true
+      }
+    });
     if (user) {
       var tokens = user.services.resume.loginTokens;
       var newToken = Accounts._generateStampedLoginToken();
@@ -105,10 +109,9 @@ Meteor.methods({
           "services.resume.loginTokens": [newToken]
         }
       });
-      // We do not set the login token on this connection, to force the client
-      // to close this connection and open a new one with the new token.
-      // The observe on Meteor.users() will take care of closing connections
-      // with the right delay.
+      // We do not set the login token on this connection, but instead the
+      // observe closes the connection and the client will reconnect with the
+      // new token.
       return {
         token: newToken.token,
         tokenExpires: Accounts._tokenExpiration(newToken.when)
@@ -125,7 +128,7 @@ Meteor.methods({
 /// support reconnecting using a meteor login token
 
 // how often (in seconds) we check for expired tokens
-var DEFAULT_EXPIRE_TOKENS_INTERVAL = 600; // 10 minutes
+var DEFAULT_EXPIRE_TOKENS_INTERVAL_SECS = 600; // 10 minutes
 
 // Login handler for resume tokens.
 Accounts.registerLoginHandler(function(options) {
@@ -146,9 +149,13 @@ Accounts.registerLoginHandler(function(options) {
     return token.token === options.resume;
   });
 
+  var tokenExpires = Accounts._tokenExpiration(token.when);
+  if (new Date() >= tokenExpires)
+    throw new Meteor.Error(403, "Your session has expired. Please login again.");
+
   return {
     token: options.resume,
-    tokenExpires: Accounts._tokenExpiration(token.when),
+    tokenExpires: tokenExpires,
     id: user._id
   };
 });
@@ -169,25 +176,19 @@ var removeLoginToken = function (userId, loginToken) {
   });
 };
 
+///
+/// TOKEN EXPIRATION
+///
+
+var expireTokenInterval;
+
 // Deletes expired tokens from the database and closes all open connections
 // associated with these tokens. Exported for tests.
 var expireTokens = Accounts._expireTokens = function (oldestValidDate) {
-  var tokenLifetime = Accounts._options._tokenLifetime || DEFAULT_TOKEN_LIFETIME;
+  var tokenLifetimeSecs = Accounts._options._tokenLifetimeSecs ||
+        DEFAULT_TOKEN_LIFETIME_SECS;
   oldestValidDate = oldestValidDate ||
-    (new Date(new Date() - tokenLifetime * 1000));
-  var usersWithExpiredTokens = Meteor.users.find({
-    "services.resume.loginTokens.when": { $lt: oldestValidDate }
-  });
-
-  var oldTokens = [];
-  usersWithExpiredTokens.forEach(function (user) {
-    _.each(user.services.resume.loginTokens, function (token) {
-      if (typeof token.when === "number")
-        token.when = new Date(token.when);
-      if (token.when < oldestValidDate)
-        oldTokens.push(token.token);
-    });
-  });
+    (new Date(new Date() - tokenLifetimeSecs * 1000));
 
   Meteor.users.update({
     "services.resume.loginTokens.when": { $lt: oldestValidDate }
@@ -203,13 +204,13 @@ var expireTokens = Accounts._expireTokens = function (oldestValidDate) {
 };
 
 Meteor.users._ensureIndex("services.resume.loginTokens.when", { sparse: true });
-var expireTokenInterval;
+
 initExpireTokenInterval = function () {
   if (expireTokenInterval)
     Meteor.clearInterval(expireTokenInterval);
-  var expirePeriod = Accounts._options._tokenExpirationInterval ||
-        DEFAULT_EXPIRE_TOKENS_INTERVAL;
-  expireTokenInterval = Meteor.setInterval(expireTokens, expirePeriod * 1000);
+  var expirePeriodSecs = Accounts._options._tokenExpirationIntervalSecs ||
+        DEFAULT_EXPIRE_TOKENS_INTERVAL_SECS;
+  expireTokenInterval = Meteor.setInterval(expireTokens, expirePeriodSecs * 1000);
 };
 initExpireTokenInterval();
 
@@ -525,18 +526,20 @@ Meteor.users._ensureIndex('services.resume.loginTokens.token',
 /// LOGGING OUT DELETED USERS
 ///
 
+var DEFAULT_CONNECTION_CLOSE_DELAY_SECS = 10;
+
 // By default, connections are closed with a 10 second delay, to give other
 // clients a chance to find a new token in localStorage before
 // reconnecting. Delay can be configured with Accounts.config.
 var closeTokensForUser = function (userTokens) {
-  var delay = 10;
-  if (_.has(Accounts._options, "_connectionCloseDelay"))
-    delay = Accounts._options._connectionCloseDelay;
+  var delaySecs = DEFAULT_CONNECTION_CLOSE_DELAY_SECS;
+  if (_.has(Accounts._options, "_connectionCloseDelaySecs"))
+    delaySecs = Accounts._options._connectionCloseDelaySecs;
   Meteor.setTimeout(function () {
     Meteor.server._closeAllForTokens(_.map(userTokens, function (token) {
       return token.token;
     }));
-  }, delay * 1000);
+  }, delaySecs * 1000);
 };
 
 Meteor.users.find().observe({
diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index 56f1650bb1..00b525f966 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -1,5 +1,5 @@
 Accounts.config({
-  _connectionCloseDelay: 0
+  _connectionCloseDelaySecs: 0
 });
 
 if (Meteor.isClient) (function () {
@@ -277,91 +277,68 @@ if (Meteor.isClient) (function () {
     function(test, expect) {
       // Test that login tokens get expired. We should get logged out when a
       // token expires, and not be able to log in again with the same token.
-      var expectLoggedOut = expect(function () {
-        test.equal(Meteor.user(), null);
+      var expectNoError = expect(function (err) {
+        test.isFalse(err);
       });
       var expectLoginError = expect(function (err) {
         test.isTrue(err);
       });
-      var expectNoError = expect(function (err) {
-        test.isFalse(err);
-      });
-      var token;
       var firstLoginCallback = true;
+
       Meteor.loginWithPassword(username, password2, function (error) {
-        // callback will be called again on reconnect after our token gets
-        // expired.
+        var token = Accounts._storedLoginToken();
         if (firstLoginCallback) {
-          token = Accounts._storedLoginToken();
           test.isTrue(token);
-          test.isFalse(error);
-          Meteor.call("expireTokens", new Date(), function (error, result) {
-            expectNoError(error);
-          });
+          expectNoError(error);
+          Meteor.call("expireTokens", new Date());
         } else {
-          expectLoggedOut();
-          Meteor.loginWithToken(token, function (err) {
-            test.isFalse(Meteor.userId());
-            expectLoginError(err);
-          });
+          test.isFalse(token);
+          expectLoginError(error);
         }
         firstLoginCallback = false;
       });
     },
     logoutStep,
     function (test, expect) {
-      // Test that Meteor._logoutAllOthers logs out a second authenticated
-      // connection.
-
-      var expectNoError = expect(function (err) {
-        test.isFalse(err);
-      });
-      var expectSecondConnLoggedOut = expect(function () {
-        test.isFalse(secondConn.userId());
-      });
-      var expectLoginError = expect(function (err) {
-        test.isTrue(err);
-      });
-
-      var token;
-
       // copied from livedata/client_convenience.js
       var ddpUrl = '/';
       if (typeof __meteor_runtime_config__ !== "undefined") {
         if (__meteor_runtime_config__.DDP_DEFAULT_CONNECTION_URL)
           ddpUrl = __meteor_runtime_config__.DDP_DEFAULT_CONNECTION_URL;
       }
+
+      // Test that Meteor._logoutAllOthers logs out a second authenticated
+      // connection while leaving Meteor.connection logged in.
+      var token;
       var secondConn = DDP.connect(ddpUrl);
-
       var firstLoginCallback = true;
+      var userId;
 
-      secondConn.onReconnect = function () {
-        expectSecondConnLoggedOut();
-        secondConn.call("login", { resume: token }, function (err, result) {
-          test.isFalse(secondConn.userId());
-          expectLoginError(err);
-        });
-      };
-
-      Meteor.loginWithPassword(username, password2, function (err, result) {
+      var expectNoError = expect(function (err) {
         test.isFalse(err);
+      });
+      var expectLoginError = expect(function (err) {
+        test.isTrue(err);
+      });
+      var expectLoggedIn = expect(function () {
+        test.equal(userId, Meteor.userId());
+      });
+      var expectSecondConnLoggedIn = expect(function (err, result) {
+        test.equal(result.token, token);
+        test.isFalse(err);
+        secondConn.onReconnect = function () {
+          secondConn.call("login", { resume: token }, expectLoginError);
+        };
+        Meteor.call("_logoutAllOthers", expectLoggedIn);
+      });
+
+      Meteor.loginWithPassword(username, password2, function (err) {
         if (firstLoginCallback) {
-          test.isTrue(Meteor.user());
+          expectNoError(err);
           token = Accounts._storedLoginToken();
-          secondConn.call("login", {
-            resume: token
-          }, function (err, result) {
-            test.isFalse(err);
-            Meteor._logoutAllOthers(function (err) {
-              expectNoError(err);
-            });
-          });
-        } else {
-          // Callback fires again after reconnect. We should still be logged in,
-          // but secondConn should be logged out and subsequently fail resume
-          // login.
-          test.isFalse(err);
-          test.isTrue(Meteor.user());
+          test.isTrue(token);
+          userId = Meteor.userId();
+          secondConn.call("login", { resume: token }, expectSecondConnLoggedIn);
         }
         firstLoginCallback = false;
       });
@@ -377,6 +354,8 @@ if (Meteor.isClient) (function () {
         if (firstLoginCallback) {
           test.isFalse(err);
           Meteor.call("removeUser", username);
+          // When the user is deleted, our connection will be closed, triggering
+          // a reconnect, which will trigger a login attempt.
         } else {
           expectLoginError(err);
         }
diff --git a/packages/livedata/livedata_common.js b/packages/livedata/livedata_common.js
index 8c45863c85..5ce89ed443 100644
--- a/packages/livedata/livedata_common.js
+++ b/packages/livedata/livedata_common.js
@@ -29,8 +29,8 @@ MethodInvocation = function (options) {
   // reruns subscriptions
   this._setUserId = options.setUserId || function () {};
 
-  // saves the login token so we can delete it later when the user logs out, is
-  // deleted, etc.
+  // used for associating the connection with a login token so that the
+  // connection can be closed if the token is no longer valid
   this._setLoginToken = options._setLoginToken || function () {};
 
   // Scratch data scoped to this connection (livedata_connection on the
diff --git a/packages/livedata/livedata_connection.js b/packages/livedata/livedata_connection.js
index ef70ecb6ea..04fb380f90 100644
--- a/packages/livedata/livedata_connection.js
+++ b/packages/livedata/livedata_connection.js
@@ -209,8 +209,6 @@ var Connection = function (url, options) {
       self._livedata_nosub(msg);
     else if (msg.msg === 'result')
       self._livedata_result(msg);
-    else if (msg.msg === 'disconnected')
-      self._livedata_disconnected(msg);
     else if (msg.msg === 'error')
       self._livedata_error(msg);
     else
diff --git a/packages/livedata/livedata_server.js b/packages/livedata/livedata_server.js
index aeee0f0204..fb3a28a0ed 100644
--- a/packages/livedata/livedata_server.js
+++ b/packages/livedata/livedata_server.js
@@ -1294,6 +1294,7 @@ _.extend(Server.prototype, {
         throw new Error("Can't call setUserId on a server initiated method call");
       };
       var setLoginToken = function () {
+        // XXX is this correct?
         throw new Error("Can't call _setLoginToken on a server " +
                         "initiated method call");
       };
@@ -1354,19 +1355,13 @@ _.extend(Server.prototype, {
   },
 
   // Close all open sessions associated with any of the tokens in
-  // `tokens`. `excludeSessions` is an optional array of strings (session ids)
-  // to not close, even if they match a token in `tokens`.
-  _closeAllForTokens: function (tokens, excludeSessions) {
+  // `tokens`.
+  _closeAllForTokens: function (tokens) {
     var self = this;
-
-    if (tokens.length)
     _.each(tokens, function (token) {
       if (_.has(self.sessionsByLoginToken, token)) {
         var destroyedIds = [];
         _.each(self.sessionsByLoginToken[token], function (sessionId) {
-          if (_.indexOf(excludeSessions, sessionId) !== -1)
-            return;
-
           // Destroy session and remove from self.sessions.
           var session = self.sessions[sessionId];
           if (session) {

From 00a70b78998958e84def6fcc3fbbc11ec85225d6 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Wed, 11 Sep 2013 13:48:05 -0700
Subject: [PATCH 041/335] Update History.md for token deletion

---
 History.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/History.md b/History.md
index 05ebf690ee..cda692dbd5 100644
--- a/History.md
+++ b/History.md
@@ -3,6 +3,10 @@
 * Write dates to Mongo as ISODate rather than Integer; existing data can be
   converted by passing it through `new Date()`. #1228
 
+* Login token deletion: Expire login tokens periodically. Add
+  Meteor._logoutAllOthers() for logging out other connections logged in as the
+  current user. Log out and close connections for deleted users and tokens.
+
 
 ## v0.6.5.1
 

From 4714f892f56b71af1368faf95ff23f6c33bff729 Mon Sep 17 00:00:00 2001
From: Andrew Wilcox <andrew.wilcox@gmail.com>
Date: Thu, 5 Sep 2013 17:29:19 -0400
Subject: [PATCH 042/335] Check that the argument to EJSON.parse is a string.

Some Android browser versions of JSON.parse can crash when passed null
(https://code.google.com/p/android/issues/detail?id=11973), so it's
better not to pass on a non-string argument to JSON.parse.

Thanks to @raix for raising the issue in #1401.
---
 packages/ejson/ejson.js      | 2 ++
 packages/ejson/ejson_test.js | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/packages/ejson/ejson.js b/packages/ejson/ejson.js
index 3bce3f802f..222a289e50 100644
--- a/packages/ejson/ejson.js
+++ b/packages/ejson/ejson.js
@@ -211,6 +211,8 @@ EJSON.stringify = function (item) {
 };
 
 EJSON.parse = function (item) {
+  if (typeof item !== 'string')
+    throw new Error("EJSON.parse argument should be a string");
   return EJSON.fromJSONValue(JSON.parse(item));
 };
 
diff --git a/packages/ejson/ejson_test.js b/packages/ejson/ejson_test.js
index bd3e5d6310..27c39d6085 100644
--- a/packages/ejson/ejson_test.js
+++ b/packages/ejson/ejson_test.js
@@ -72,3 +72,11 @@ Tinytest.add("ejson - clone", function (test) {
   };
   testCloneArgs(1, 2, "foo", [4]);
 });
+
+Tinytest.add("ejson - parse", function (test) {
+  test.equal(EJSON.parse("[1,2,3]"), [1,2,3]);
+  test.throws(
+    function () { EJSON.parse(null) },
+    /argument should be a string/
+  );
+});

From a174b549b95f1712a5f7809c0dd5f524884cf338 Mon Sep 17 00:00:00 2001
From: David Winterbottom <david.winterbottom@gmail.com>
Date: Mon, 9 Sep 2013 09:47:44 +0100
Subject: [PATCH 043/335] Correct typo in install script error message

---
 scripts/admin/install-engine.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/admin/install-engine.sh b/scripts/admin/install-engine.sh
index f2a2ccf330..1199b8724a 100644
--- a/scripts/admin/install-engine.sh
+++ b/scripts/admin/install-engine.sh
@@ -46,7 +46,7 @@ elif [ "$UNAME" = "Linux" ] ; then
   ### Linux ###
   ARCH=$(uname -m)
   if [ "$ARCH" != "i686" -a "$ARCH" != "x86_64" ] ; then
-    echo "Unable architecture: $ARCH"
+    echo "Unusable architecture: $ARCH"
     echo "Meteor only supports i686 and x86_64 for now."
     exit 1
   fi

From 3665b31a82f8ded87656d2e79317cf243c40cccb Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Thu, 12 Sep 2013 13:55:15 -0700
Subject: [PATCH 044/335] Remove backwards-compatibility implementation of
 pre-0.6.5 Package.register_extension API.

It didn't even actually work for producing JavaScript files (eg a
coffeescript-like package): see #1410. Package maintainers should have upgraded
to the more powerful 0.6.5 API by now anyway.
---
 History.md                |   4 ++
 docs/client/concepts.html |   3 +-
 tools/packages.js         | 138 +++-----------------------------------
 3 files changed, 13 insertions(+), 132 deletions(-)

diff --git a/History.md b/History.md
index cda692dbd5..5e6cd7fd65 100644
--- a/History.md
+++ b/History.md
@@ -7,6 +7,10 @@
   Meteor._logoutAllOthers() for logging out other connections logged in as the
   current user. Log out and close connections for deleted users and tokens.
 
+* The pre-0.6.5 `Package.register_extension` API has been removed. Use
+  `Package._transitional_registerBuildPlugin` instead, which was introduced in
+  0.6.5. (A bug prevented the 0.6.5 reimplementation of `register_extension`
+  from working properly anyway.)
 
 ## v0.6.5.1
 
diff --git a/docs/client/concepts.html b/docs/client/concepts.html
index f0c59d774f..61d47d7c18 100644
--- a/docs/client/concepts.html
+++ b/docs/client/concepts.html
@@ -913,8 +913,7 @@ quick tips:
   an example. Build plugins are fully-fledged Meteor programs in their
   own right and have their own namespace, package dependencies, source
   files and npm requirements. The old `register_extension` API is
-  deprecated and should not be used as it will prevent your package
-  from being cached, slowing down builds.
+  removed.
 
 * It is possible to create weak dependencies between packages. If
   package A has a weak dependency on package B, it means that
diff --git a/tools/packages.js b/tools/packages.js
index 2fc9b20975..09290ac63d 100644
--- a/tools/packages.js
+++ b/tools/packages.js
@@ -695,10 +695,7 @@ _.extend(Slice.prototype, {
     });
 
     _.each(self._activePluginPackages(), function (otherPkg) {
-      var all = _.extend({}, otherPkg.sourceHandlers);
-      _.extend(all, otherPkg.legacyExtensionHandlers);
-
-      _.each(all, function (handler, ext) {
+      _.each(otherPkg.sourceHandlers, function (handler, ext) {
         if (ext in ret && ret[ext] !== handler) {
           buildmessage.error(
             "conflict: two packages included in " +
@@ -794,10 +791,6 @@ var Package = function (library, packageDirectoryForBuildInfo) {
   // Package metadata. Keys are 'summary' and 'internal'.
   self.metadata = {};
 
-  // File handler extensions defined by this package. Map from file
-  // extension to the handler function.
-  self.legacyExtensionHandlers = {};
-
   // Available editions/subpackages ("slices") of this package. Array
   // of Slice.
   self.slices = [];
@@ -1175,125 +1168,12 @@ _.extend(Package.prototype, {
 
       // XXX COMPAT WITH 0.6.4
       // extension doesn't contain a dot
-      register_extension: function (extension, callback) {
-        if (_.has(self.legacyExtensionHandlers, extension)) {
-          buildmessage.error("duplicate handler for '*." + extension +
-                             "'; only one per package allowed",
-                             { useMyCaller: true });
-          // Recover by ignoring the duplicate
-          return;
-        }
-        self.legacyExtensionHandlers[extension] = function (compileStep) {
-
-          // In the old extension API, there is a 'where' parameter
-          // that conflates architecture and slice name and can be
-          // either "client" or "server".
-          var clientOrServer = archinfo.matches(compileStep.arch, "browser") ?
-            "client" : "server";
-
-          var api = {
-            /**
-             * In the legacy extension API, this is the ultimate low-level
-             * entry point to add data to the bundle.
-             *
-             * type: "js", "css", "head", "body", "static"
-             *
-             * path: the (absolute) path at which the file will be
-             * served. ignored in the case of "head" and "body".
-             *
-             * source_file: the absolute path to read the data from. if
-             * path is set, will default based on that. overridden by
-             * data.
-             *
-             * data: the data to send. overrides source_file if
-             * present. you must still set path (except for "head" and
-             * "body".)
-             */
-            add_resource: function (options) {
-              var sourceFile = options.source_file || options.path;
-
-              var data;
-              if (options.data) {
-                data = options.data;
-                if (!(data instanceof Buffer)) {
-                  if (!(typeof data === "string")) {
-                    buildmessage.error("bad type for 'data'",
-                                       { useMyCaller: true });
-                    // recover by ignoring resource
-                    return;
-                  }
-                  data = new Buffer(data, 'utf8');
-                }
-              } else {
-                if (!sourceFile) {
-                  buildmessage.error("need either 'source_file' or 'data'",
-                                     { useMyCaller: true });
-                  // recover by ignoring resource
-                  return;
-                }
-                data = fs.readFileSync(sourceFile);
-              }
-
-              if (options.where && options.where !== clientOrServer) {
-                buildmessage.error("'where' is deprecated here and if " +
-                                   "provided must be '" + clientOrServer + "'",
-                                   { useMyCaller: true });
-                  // recover by ignoring resource
-                  return;
-              }
-
-              var relPath = path.relative(compileStep.rootOutputPath,
-                                          options.path);
-              if (options.type === "js")
-                compileStep.addJavaScript({ path: relPath,
-                                            data: data.toString('utf8') });
-              else if (options.type === "head" || options.type === "body")
-                compileStep.appendDocument({ section: options.type,
-                                             data: data.toString('utf8') });
-              else if (options.type === "css")
-                compileStep.addStylesheet({ path: relPath,
-                                            data: data.toString('utf8') });
-              else if (options.type === "static")
-                compileStep.addAsset({ path: relPath, data: data });
-            },
-
-            error: function (message) {
-              buildmessage.error(message, { useMyCaller: true });
-              // recover by just continuing
-            }
-          };
-
-          // old-school extension can only take the input as a file on
-          // disk, so write it out to a temporary file for them. take
-          // care to preserve the original extension since some legacy
-          // plugins depend on that (coffeescript.) Also (sigh) put it
-          // in the same directory as the original file so that
-          // relative paths work for include files, for plugins that
-          // care about that.
-          var tmpdir = path.resolve(path.dirname(compileStep._fullInputPath));
-          do {
-            var tempFilePath =
-              path.join(tmpdir, "build" +
-                        Math.floor(Math.random() * 1000000) +
-                        "." + path.basename(compileStep.inputPath));
-          } while (fs.existsSync(tempFilePath));
-          var tempFile = fs.openSync(tempFilePath, "wx");
-          try {
-            var data = compileStep.read();
-            fs.writeSync(tempFile, data, 0, data.length);
-          } finally {
-            fs.closeSync(tempFile);
-          }
-
-          try {
-            callback(api, tempFilePath,
-                     path.join(compileStep.rootOutputPath,
-                               compileStep.inputPath),
-                     clientOrServer);
-          } finally {
-            fs.unlinkSync(tempFilePath);
-          }
-        };
+      register_extension: function () {
+        buildmessage.error(
+          "Package.register_extension() is no longer supported. Use " +
+            "Package._transitional_registerBuildPlugin instead.",
+              { useMyCaller: true });
+            // recover by ignoring
       },
 
       // Define a plugin. A plugin extends the build process for
@@ -1412,7 +1292,6 @@ _.extend(Package.prototype, {
       // principle of least surprise.) Leave the metadata if we have
       // it, though.
       roleHandlers = {use: null, test: null};
-      self.legacyExtensionHandlers = {};
       self.pluginInfo = {};
       npmDependencies = null;
     }
@@ -1649,7 +1528,6 @@ _.extend(Package.prototype, {
           sources = {use: {client: [], server: []},
                      test: {client: [], server: []}};
           roleHandlers = {use: null, test: null};
-          self.legacyExtensionHandlers = {};
           self.pluginInfo = {};
           npmDependencies = null;
         }
@@ -2160,7 +2038,7 @@ _.extend(Package.prototype, {
   // True if this package can be saved as a unipackage
   canBeSavedAsUnipackage: function () {
     var self = this;
-    return _.keys(self.legacyExtensionHandlers || []).length === 0;
+    return true;
   },
 
   // options:

From 8df6553ce2e26ec0a3b29c6186c1f2f6c506f428 Mon Sep 17 00:00:00 2001
From: Maxime Quandalle <maxime.quandalle@gmail.com>
Date: Sun, 8 Sep 2013 22:27:08 +0200
Subject: [PATCH 045/335] Add a literate handler in the coffeescript package
 Add .coffee.md handling tests

---
 packages/coffeescript/coffeescript_tests.js     |  3 ++-
 packages/coffeescript/package.js                |  7 ++++---
 .../coffeescript/plugin/compile-coffeescript.js | 17 +++++++++++++----
 .../coffeescript_strict_tests.coffee            |  0
 .../{ => tests}/coffeescript_tests.coffee       |  0
 .../tests/litcoffeescript_tests.coffee.md       |  6 ++++++
 .../{ => tests}/litcoffeescript_tests.litcoffee |  0
 7 files changed, 25 insertions(+), 8 deletions(-)
 rename packages/coffeescript/{ => tests}/coffeescript_strict_tests.coffee (100%)
 rename packages/coffeescript/{ => tests}/coffeescript_tests.coffee (100%)
 create mode 100644 packages/coffeescript/tests/litcoffeescript_tests.coffee.md
 rename packages/coffeescript/{ => tests}/litcoffeescript_tests.litcoffee (100%)

diff --git a/packages/coffeescript/coffeescript_tests.js b/packages/coffeescript/coffeescript_tests.js
index 6baa3ca189..dad72f95fa 100644
--- a/packages/coffeescript/coffeescript_tests.js
+++ b/packages/coffeescript/coffeescript_tests.js
@@ -3,9 +3,10 @@ Tinytest.add("coffeescript - presence", function(test) {
 });
 Tinytest.add("literate coffeescript - presence", function(test) {
   test.isTrue(Meteor.__LITCOFFEESCRIPT_PRESENT);
+  test.isTrue(Meteor.__COFFEEMDSCRIPT_PRESENT);
 });
 
 Tinytest.add("coffeescript - exported variable", function(test) {
   test.equal(COFFEESCRIPT_EXPORTED, 123);
   test.equal(Package['coffeescript-test-helper'].COFFEESCRIPT_EXPORTED, 123);
-});
+});
\ No newline at end of file
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
index 2a13f962fb..e31e47b9db 100644
--- a/packages/coffeescript/package.js
+++ b/packages/coffeescript/package.js
@@ -16,9 +16,10 @@ Package.on_test(function (api) {
   api.use(['coffeescript-test-helper'], ['client', 'server']);
   api.add_files([
     'coffeescript_test_setup.js',
-    'coffeescript_tests.coffee',
-    'coffeescript_strict_tests.coffee',
-    'litcoffeescript_tests.litcoffee',
+    'tests/coffeescript_tests.coffee',
+    'tests/coffeescript_strict_tests.coffee',
+    'tests/litcoffeescript_tests.litcoffee',
+    'tests/litcoffeescript_tests.coffee.md',
     'coffeescript_tests.js'
   ], ['client', 'server']);
 });
diff --git a/packages/coffeescript/plugin/compile-coffeescript.js b/packages/coffeescript/plugin/compile-coffeescript.js
index 3270a2912e..27b27464ba 100644
--- a/packages/coffeescript/plugin/compile-coffeescript.js
+++ b/packages/coffeescript/plugin/compile-coffeescript.js
@@ -113,13 +113,17 @@ var addSharedHeader = function (source, sourceMap) {
   };
 };
 
-var handler = function (compileStep) {
+var handler = function (compileStep, isLiterate) {
+  if (typeof isLiterate === "undefined")
+    var isLiterate = false;
+  
   var source = compileStep.read().toString('utf8');
   var outputFile = compileStep.inputPath + ".js";
+
   var options = {
     bare: true,
     filename: compileStep.inputPath,
-    literate: path.extname(compileStep.inputPath) === '.litcoffee',
+    literate: isLiterate,
     // Return a source map.
     sourceMap: true,
     // Include the original source in the source map (sourcesContent field).
@@ -152,6 +156,11 @@ var handler = function (compileStep) {
   });
 };
 
-Plugin.registerSourceHandler("coffee", handler);
-Plugin.registerSourceHandler("litcoffee", handler);
+var literateHandler = function (compileStep) {
+  return handler(compileStep, true);
+}
+
+Plugin.registerSourceHandler("coffee", handler);
+Plugin.registerSourceHandler("litcoffee", literateHandler);
+Plugin.registerSourceHandler("coffee.md", literateHandler);
 
diff --git a/packages/coffeescript/coffeescript_strict_tests.coffee b/packages/coffeescript/tests/coffeescript_strict_tests.coffee
similarity index 100%
rename from packages/coffeescript/coffeescript_strict_tests.coffee
rename to packages/coffeescript/tests/coffeescript_strict_tests.coffee
diff --git a/packages/coffeescript/coffeescript_tests.coffee b/packages/coffeescript/tests/coffeescript_tests.coffee
similarity index 100%
rename from packages/coffeescript/coffeescript_tests.coffee
rename to packages/coffeescript/tests/coffeescript_tests.coffee
diff --git a/packages/coffeescript/tests/litcoffeescript_tests.coffee.md b/packages/coffeescript/tests/litcoffeescript_tests.coffee.md
new file mode 100644
index 0000000000..e68b845a96
--- /dev/null
+++ b/packages/coffeescript/tests/litcoffeescript_tests.coffee.md
@@ -0,0 +1,6 @@
+This file is just the same as `coffeescript_tests.coffee`, first we set a 
+property, which we check for in `coffeescript_tests.js`, and then a trivial
+testcase.
+
+    Meteor.__COFFEEMDSCRIPT_PRESENT = true
+    Tinytest.add "markdown coffeescript - compile", (test) -> test.isTrue true
diff --git a/packages/coffeescript/litcoffeescript_tests.litcoffee b/packages/coffeescript/tests/litcoffeescript_tests.litcoffee
similarity index 100%
rename from packages/coffeescript/litcoffeescript_tests.litcoffee
rename to packages/coffeescript/tests/litcoffeescript_tests.litcoffee

From d4186524b85395813a777444229e64d48fefa546 Mon Sep 17 00:00:00 2001
From: Maxime Quandalle <maxime.quandalle@gmail.com>
Date: Sun, 8 Sep 2013 23:05:30 +0200
Subject: [PATCH 046/335] Support multiple extensions in _getSourceHandler

---
 tools/packages.js | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/tools/packages.js b/tools/packages.js
index 09290ac63d..fe60ed384b 100644
--- a/tools/packages.js
+++ b/tools/packages.js
@@ -236,8 +236,8 @@ _.extend(Slice.prototype, {
       var relPath = source.relPath;
       var fileOptions = _.clone(source.fileOptions) || {};
       var absPath = path.resolve(self.pkg.sourceRoot, relPath);
-      var ext = path.extname(relPath).substr(1);
-      var handler = !fileOptions.isAsset && self._getSourceHandler(ext);
+      var filename = path.basename(relPath, '');
+      var handler = !fileOptions.isAsset && self._getSourceHandler(filename);
       var contents = watch.readAndWatchFile(self.watchSet, absPath);
 
       if (contents === null) {
@@ -723,12 +723,17 @@ _.extend(Slice.prototype, {
 
   // Find the function that should be used to handle a source file for
   // this slice, or return null if there isn't one. We'll use handlers
-  // that are defined in this package and in its immediate
-  // dependencies. ('extension' should be the extension of the file
-  // without a leading dot.)
-  _getSourceHandler: function (extension) {
+  // that are defined in this package and in its immediate dependencies.
+  _getSourceHandler: function (filename) {
     var self = this;
-    return (self._allHandlers())[extension] || null;
+    var handlers = self._allHandlers();
+    var parts = filename.split('.');
+    for (var i = 0; i < parts.length; i++) {
+      var extension = parts.slice(i).join('.');
+      if (extension in handlers)
+        return handlers[extension];
+    }
+    return null;
   }
 });
 
@@ -946,7 +951,8 @@ _.extend(Package.prototype, {
       return;
 
     var Plugin = {
-      // 'extension' is a file extension without a dot (eg 'js', 'coffee')
+      // 'extension' is a file extension without the separation dot 
+      // (eg 'js', 'coffee', 'coffee.md')
       //
       // 'handler' is a function that takes a single argument, a
       // CompileStep (#CompileStep)

From c66b8e3db5a541c8388d773261dc6fc5f2e55fee Mon Sep 17 00:00:00 2001
From: Maxime Quandalle <maxime.quandalle@gmail.com>
Date: Thu, 12 Sep 2013 23:05:39 +0200
Subject: [PATCH 047/335] Style tweaks

---
 packages/coffeescript/plugin/compile-coffeescript.js | 5 +----
 tools/packages.js                                    | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/coffeescript/plugin/compile-coffeescript.js b/packages/coffeescript/plugin/compile-coffeescript.js
index 27b27464ba..b0c94ce870 100644
--- a/packages/coffeescript/plugin/compile-coffeescript.js
+++ b/packages/coffeescript/plugin/compile-coffeescript.js
@@ -114,16 +114,13 @@ var addSharedHeader = function (source, sourceMap) {
 };
 
 var handler = function (compileStep, isLiterate) {
-  if (typeof isLiterate === "undefined")
-    var isLiterate = false;
-  
   var source = compileStep.read().toString('utf8');
   var outputFile = compileStep.inputPath + ".js";
 
   var options = {
     bare: true,
     filename: compileStep.inputPath,
-    literate: isLiterate,
+    literate: !!isLiterate,
     // Return a source map.
     sourceMap: true,
     // Include the original source in the source map (sourcesContent field).
diff --git a/tools/packages.js b/tools/packages.js
index fe60ed384b..adedc992e1 100644
--- a/tools/packages.js
+++ b/tools/packages.js
@@ -236,7 +236,7 @@ _.extend(Slice.prototype, {
       var relPath = source.relPath;
       var fileOptions = _.clone(source.fileOptions) || {};
       var absPath = path.resolve(self.pkg.sourceRoot, relPath);
-      var filename = path.basename(relPath, '');
+      var filename = path.basename(relPath);
       var handler = !fileOptions.isAsset && self._getSourceHandler(filename);
       var contents = watch.readAndWatchFile(self.watchSet, absPath);
 
@@ -730,7 +730,7 @@ _.extend(Slice.prototype, {
     var parts = filename.split('.');
     for (var i = 0; i < parts.length; i++) {
       var extension = parts.slice(i).join('.');
-      if (extension in handlers)
+      if (_has(handlers, extension)
         return handlers[extension];
     }
     return null;

From 259fb036c8b083a1387b26a38474094e4ff0c7d9 Mon Sep 17 00:00:00 2001
From: Maxime Quandalle <maxime.quandalle@gmail.com>
Date: Thu, 12 Sep 2013 23:23:31 +0200
Subject: [PATCH 048/335] Fix syntax

---
 tools/packages.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/packages.js b/tools/packages.js
index adedc992e1..41832c04fd 100644
--- a/tools/packages.js
+++ b/tools/packages.js
@@ -730,7 +730,7 @@ _.extend(Slice.prototype, {
     var parts = filename.split('.');
     for (var i = 0; i < parts.length; i++) {
       var extension = parts.slice(i).join('.');
-      if (_has(handlers, extension)
+      if (_.has(handlers, extension))
         return handlers[extension];
     }
     return null;

From 2e10d43041be13eb19269f7341cd74ebfca0f30d Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Mon, 9 Sep 2013 14:48:39 -0400
Subject: [PATCH 049/335] Simple tests for sub-set projections.

---
 packages/minimongo/minimongo_tests.js | 49 +++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/packages/minimongo/minimongo_tests.js b/packages/minimongo/minimongo_tests.js
index 2521576bf5..3c736df182 100644
--- a/packages/minimongo/minimongo_tests.js
+++ b/packages/minimongo/minimongo_tests.js
@@ -1069,6 +1069,55 @@ Tinytest.add("minimongo - fetch with fields", function (test) {
   });
 });
 
+Tinytest.add("minimongo - fetch with projection, subarrays", function (test) {
+  // Apparently projection of type 'foo.bar.x' for
+  // { foo: [ { bar: { x: 42 } }, { bar: { x: 3 } } ] }
+  // should return exactly this object. More precisely, arrays are considered as
+  // sets and are queried separately and then merged back to result set
+  var c = new LocalCollection();
+
+  // Insert a test object with two set fields
+  c.insert({
+    setA: [{
+      fieldA: 42,
+      fieldB: 33
+    }, {
+      fieldA: "the good",
+      fieldB: "the bad",
+      fieldC: "the ugly"
+    }],
+    setB: [{
+      anotherA: { },
+      anotherB: "meh"
+    }, {
+      anotherA: 1234,
+      anotherB: 431
+    }]
+  });
+
+  var equalNonStrict = function (a, b, desc) {
+    test.equal(EJSON.stringify(a), EJSON.stringify(b), desc);
+  };
+
+  var testForProjection = function (projection, expected) {
+    var fetched = c.find({}, { fields: projection }).fetch()[0];
+    equalNonStrict(fetched, expected, "failed sub-set projection: " +
+                                      JSON.stringify(projection));
+  };
+
+  testForProjection({ 'setA.fieldA': 1, 'setB.anotherB': 1, _id: 0 },
+                    {
+                      setA: [{ fieldA: 42 }, { fieldA: "the good" }],
+                      setB: [{ anotherB: "meh" }, { anotherB: 431 }]
+                    });
+
+  testForProjection({ 'setA.fieldA': 0, 'setB.anotherA': 0, _id: 0 },
+                    {
+                      setA: [{fieldB:33}, {fieldB:"the bad",fieldC:"the ugly"}],
+                      setB: [{ anotherB: "meh" }, { anotherB: 431 }]
+                    });
+});
+
 Tinytest.add("minimongo - observe ordered with projection", function (test) {
   // These tests are copy-paste from "minimongo -observe ordered",
   // slightly modified to test projection

From 27fd0d506636687c72e7dd860752cd6ada2bb0bb Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Mon, 9 Sep 2013 18:16:23 -0400
Subject: [PATCH 050/335] Support subsets fields filtering.

Rewrote the returned closure. Still don't support '$' and '$slice' operators.
---
 packages/minimongo/minimongo.js | 111 ++++++++++++--------------------
 1 file changed, 42 insertions(+), 69 deletions(-)

diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index 91cfffb794..bf89da0771 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -623,7 +623,7 @@ LocalCollection.prototype._modifyAndNotify = function (
       // in the output. So it's safe to skip recompute if neither before or
       // after are true.)
       if (before || after)
-	recomputeQids[qid] = true;
+        recomputeQids[qid] = true;
     } else if (before && !after) {
       LocalCollection._removeFromResults(query, doc);
     } else if (!before && after) {
@@ -1069,7 +1069,7 @@ LocalCollection._compileProjection = function (fields) {
   var _idProjection = _.isUndefined(fields._id) ? true : fields._id;
   delete fields._id;
   var including = null; // Unknown
-  var projectionRules = [];
+  var projectionRulesTree = {}; // Tree represented as nested objects
 
   _.each(fields, function (rule, keyPath) {
     rule = !!rule;
@@ -1078,74 +1078,47 @@ LocalCollection._compileProjection = function (fields) {
     if (including !== rule)
       // This error message is copies from MongoDB shell
       throw MinimongoError("You cannot currently mix including and excluding fields.");
-    projectionRules.push(keyPath.split('.'));
+    var treePos = projectionRulesTree;
+    keyPath = keyPath.split('.');
+
+    _.each(keyPath.slice(0, -1), function (key) {
+      if (!_.has(treePos, key))
+        treePos[key] = {};
+      treePos = treePos[key];
+    });
+
+    treePos[_.last(keyPath)] = including;
   });
 
-  // XXX do these functions share too much in common?
-  if (including)
-    return function (doc) {
-      var result = {};
+  // returns transformed doc according to ruleTree
+  var transform = function (doc, ruleTree) {
+    var res = including ? {} : EJSON.clone(doc);
+    _.each(ruleTree, function (rule, key) {
+      if (!_.has(doc, key))
+        return;
+      if (_.isObject(rule)) {
+        if (_.isArray(doc[key]))
+          res[key] = _.map(doc[key], function (subdoc) {
+            return transform(subdoc, rule);
+          });
+        else if (_.isObject(doc[key]))
+          res[key] = transform(doc[key], rule);
+      } else if (including)
+        res[key] = doc[key];
+      else
+        delete res[key];
+    });
+    
+    return res;
+  };
 
-      _.each(projectionRules, function (keyPath) {
-        var target = result;
-        var docTarget = doc;
-        for (var i = 0; i < keyPath.length - 1; i++) {
-          var key = keyPath[i];
-          // This block simulates MongoDB behavior for different edge-cases when
-          // object on certain path wasn't found or array found instead of an
-          // object, or vice-versa.
-          if (!_.has(target, key)) {
-            if (_.isArray(docTarget[key])) {
-              target[key] = [];
-              docTarget = undefined;
-              break;
-            } else if (_.isObject(docTarget[key]))
-              target[key] = {};
-            else {
-              docTarget = undefined;
-              break;
-            }
-          }
-
-          target = target[key];
-          docTarget = docTarget[key];
-        }
-
-        if (keyPath.length > 0 && docTarget && _.has(docTarget, _.last(keyPath)))
-          target[_.last(keyPath)] = docTarget[_.last(keyPath)];
-      });
-
-      if (_idProjection && _.has(doc, '_id'))
-        result._id = doc._id;
-
-      return result;
-    };
-  else
-    return function (doc) {
-      // XXX Deep copy on this level might be a slowing factor,
-      // In fact we need it only in case of nested excluded fields.
-      var result = EJSON.clone(doc);
-
-      _.each(projectionRules, function (keyPath) {
-        var target = result;
-        var docTarget = doc;
-        for (var i = 0; i < keyPath.length - 1; i++) {
-          var key = keyPath[i];
-          if (!_.has(target, key)) {
-            break;
-          }
-
-          target = target[key];
-          docTarget = docTarget[key];
-        }
-
-        if (keyPath.length > 0)
-          delete target[_.last(keyPath)];
-      });
-
-      if (!_idProjection)
-        delete result._id;
-
-      return result;
-    };
+  return function (obj) {
+    var res = transform(obj, projectionRulesTree);
+    
+    if (_idProjection && _.has(obj, '_id'))
+      res._id = obj._id;
+    if (!_idProjection && _.has(res, '_id'))
+      delete res._id;
+    return res;
+  };
 };

From b24066d47785e33f7c4f0567930befbaa4b9cf85 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Mon, 9 Sep 2013 18:33:44 -0400
Subject: [PATCH 051/335] Improve documentation on fields.

- You can mix incl/excl as long as it is `_id`
- Note unsupported `$` and `$slice` operators of minimongo
- Give an advanced example with reference to mongodb docs.
---
 docs/client/api.html | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/docs/client/api.html b/docs/client/api.html
index 94d75eea0d..72775c7da3 100644
--- a/docs/client/api.html
+++ b/docs/client/api.html
@@ -1262,7 +1262,20 @@ the value.  The `_id` field is still included in the result.
 
     // Users.find({}, {fields: {firstname: 1, lastname: 1}})
 
-It is not possible to mix inclusion and exclusion styles.
+It is not possible to mix inclusion and exclusion styles (exception for `_id`).
+Field operators such as `$` and `$slice` are not available on client side yet.
+
+More advanced example:
+
+    Users.insert({ alterEgos: [{ name: "Kira", alliance: "murderer" },
+                               { name: "L", alliance: "police" }],
+                   name: "Yagami Light" });
+
+    Users.findOne({}, { fields: { 'alterEgos.name': 1, _id: 0 } });
+
+    // returns { alterEgos: [{ name: "Kira" }, { name: "L" }] }
+
+Notice the nested field rule and array behavior, learn more in MongoDB docs.
 
 {{/api_box_inline}}
 

From f6e307e644223fa3bf90a1c09699a6997075da85 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Mon, 9 Sep 2013 20:43:46 -0700
Subject: [PATCH 052/335] Whitespace

---
 packages/minimongo/minimongo.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index bf89da0771..49501f04e4 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -1108,13 +1108,13 @@ LocalCollection._compileProjection = function (fields) {
       else
         delete res[key];
     });
-    
+
     return res;
   };
 
   return function (obj) {
     var res = transform(obj, projectionRulesTree);
-    
+
     if (_idProjection && _.has(obj, '_id'))
       res._id = obj._id;
     if (!_idProjection && _.has(res, '_id'))

From 83136f64aad53aa70058ae3f59137f674535f488 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Tue, 10 Sep 2013 02:54:53 -0700
Subject: [PATCH 053/335] Add nested-nested test.

Taken from Glasser's old code-review.
---
 packages/minimongo/minimongo_tests.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/minimongo/minimongo_tests.js b/packages/minimongo/minimongo_tests.js
index 3c736df182..c55dbfa4b6 100644
--- a/packages/minimongo/minimongo_tests.js
+++ b/packages/minimongo/minimongo_tests.js
@@ -1116,6 +1116,12 @@ Tinytest.add("minimongo - fetch with projection, subarrays", function (test) {
                       setA: [{fieldB:33}, {fieldB:"the bad",fieldC:"the ugly"}],
                       setB: [{ anotherB: "meh" }, { anotherB: 431 }]
                     });
+
+  c.remove({});
+  c.insert({a:[[{b:1,c:2},{b:2,c:4}],{b:3,c:5},[{b:4, c:9}]]});
+
+  testForProjection({ 'a.b': 1, _id: 0 },
+                    {"a" : [  [  {  "b" : 1 },  {  "b" : 2 } ],  {  "b" : 3 },  [  {  "b" : 4 } ] ] });
 });
 
 Tinytest.add("minimongo - observe ordered with projection", function (test) {

From 05a3a22a6b94e520dffe3385887204c8e3eb3c61 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Tue, 10 Sep 2013 17:05:20 -0700
Subject: [PATCH 054/335] Fields with subsets passes the test.

---
 packages/minimongo/minimongo.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index 49501f04e4..6f22c5449c 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -1092,17 +1092,19 @@ LocalCollection._compileProjection = function (fields) {
 
   // returns transformed doc according to ruleTree
   var transform = function (doc, ruleTree) {
+    // Special case for "sets"
+    if (_.isArray(doc))
+      return _.map(doc, function (subdoc) { return transform(subdoc, ruleTree); });
+
     var res = including ? {} : EJSON.clone(doc);
     _.each(ruleTree, function (rule, key) {
       if (!_.has(doc, key))
         return;
       if (_.isObject(rule)) {
-        if (_.isArray(doc[key]))
-          res[key] = _.map(doc[key], function (subdoc) {
-            return transform(subdoc, rule);
-          });
-        else if (_.isObject(doc[key]))
+        // For sub-objects/subsets we branch
+        if (_.isObject(doc[key]))
           res[key] = transform(doc[key], rule);
+        // Otherwise we don't even touch this subfield
       } else if (including)
         res[key] = doc[key];
       else

From a6643812a85e0feec9e6a76535cac8d7f69b4d8f Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Tue, 10 Sep 2013 17:12:01 -0700
Subject: [PATCH 055/335] Same test but for blacklisting

---
 packages/minimongo/minimongo_tests.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/minimongo/minimongo_tests.js b/packages/minimongo/minimongo_tests.js
index c55dbfa4b6..cd9868e77e 100644
--- a/packages/minimongo/minimongo_tests.js
+++ b/packages/minimongo/minimongo_tests.js
@@ -1121,7 +1121,9 @@ Tinytest.add("minimongo - fetch with projection, subarrays", function (test) {
   c.insert({a:[[{b:1,c:2},{b:2,c:4}],{b:3,c:5},[{b:4, c:9}]]});
 
   testForProjection({ 'a.b': 1, _id: 0 },
-                    {"a" : [  [  {  "b" : 1 },  {  "b" : 2 } ],  {  "b" : 3 },  [  {  "b" : 4 } ] ] });
+                    {a: [ [ { b: 1 }, { b: 2 } ], { b: 3 }, [ { b: 4 } ] ] });
+  testForProjection({ 'a.b': 0, _id: 0 },
+                    {a: [ [ { c: 2 }, { c: 4 } ], { c: 5 }, [ { c: 9 } ] ] });
 });
 
 Tinytest.add("minimongo - observe ordered with projection", function (test) {

From eb5d426a7c7abab87557ecba4c13614997091e80 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Tue, 10 Sep 2013 17:13:48 -0700
Subject: [PATCH 056/335] Fix docs. $slice is not related to fields projection.

---
 docs/client/api.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/client/api.html b/docs/client/api.html
index 72775c7da3..3aa992a512 100644
--- a/docs/client/api.html
+++ b/docs/client/api.html
@@ -1263,7 +1263,7 @@ the value.  The `_id` field is still included in the result.
     // Users.find({}, {fields: {firstname: 1, lastname: 1}})
 
 It is not possible to mix inclusion and exclusion styles (exception for `_id`).
-Field operators such as `$` and `$slice` are not available on client side yet.
+Field operators such as `$` and `$elemMatch` are not available on client side yet.
 
 More advanced example:
 

From 26422809776068bfa163b56877da5e39eecf2fd7 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Fri, 13 Sep 2013 01:35:05 -0700
Subject: [PATCH 057/335] Put a.b.c and a.b validation into general case.

---
 packages/minimongo/minimongo.js | 56 +++++++++++++++------------------
 1 file changed, 26 insertions(+), 30 deletions(-)

diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index 6f22c5449c..ec307a9507 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -1033,35 +1033,6 @@ LocalCollection._compileProjection = function (fields) {
   if (!_.isObject(fields))
     throw MinimongoError("fields option must be an object");
 
-  // Check passed projection fields' keys:
-  // If you have two rules such as 'foo.bar' and 'foo.bar.baz', then the
-  // result becomes ambiguous. If that happens, there is a probability you are
-  // doing something wrong, framework should notify you about such mistake
-  // earlier on cursor compilation step than later during runtime.
-  // Note, that real mongo doesn't do anything about it and the later rule
-  // appears in projection project, more priority it takes.
-  //
-  // Example, assume following in mongo shell:
-  // > db.coll.insert({ a: { b: 23, c: 44 } })
-  // > db.coll.find({}, { 'a': 1, 'a.b': 1 })
-  // { "_id" : ObjectId("520bfe456024608e8ef24af3"), "a" : { "b" : 23 } }
-  // > db.coll.find({}, { 'a.b': 1, 'a': 1 })
-  // { "_id" : ObjectId("520bfe456024608e8ef24af3"), "a" : { "b" : 23, "c" : 44 } }
-  //
-  // Note, how second time the return set of keys is different.
-  var keyPaths = _.keys(fields);
-  _.each(keyPaths, function (keyPath) {
-    _.each(keyPaths, function (anotherKeyPath) {
-      var idx = keyPath.indexOf(anotherKeyPath);
-      // check if one key is path-prefix of another (like "abra" and
-      // "abra.cadabra", but not "abra" and "abrab.ra")
-      if (keyPath !== anotherKeyPath && !idx && keyPath[anotherKeyPath.length] === '.')
-        throw MinimongoError("both " + keyPath + " and " + anotherKeyPath +
-         " found in fields option, using both of them may trigger " +
-         "unexpected behavior. Did you mean to use only one of them?");
-    });
-  });
-
   if (_.any(_.values(fields), function (x) {
       return _.indexOf([1, 0, true, false], x) === -1; }))
     throw MinimongoError("Projection values should be one of 1, 0, true, or false");
@@ -1081,9 +1052,34 @@ LocalCollection._compileProjection = function (fields) {
     var treePos = projectionRulesTree;
     keyPath = keyPath.split('.');
 
-    _.each(keyPath.slice(0, -1), function (key) {
+    _.each(keyPath.slice(0, -1), function (key, idx) {
       if (!_.has(treePos, key))
         treePos[key] = {};
+      else if (_.isBoolean(treePos[key])) {
+        // Check passed projection fields' keys: If you have two rules such as
+        // 'foo.bar' and 'foo.bar.baz', then the result becomes ambiguous. If
+        // that happens, there is a probability you are doing something wrong,
+        // framework should notify you about such mistake earlier on cursor
+        // compilation step than later during runtime.  Note, that real mongo
+        // doesn't do anything about it and the later rule appears in projection
+        // project, more priority it takes.
+        //
+        // Example, assume following in mongo shell:
+        // > db.coll.insert({ a: { b: 23, c: 44 } })
+        // > db.coll.find({}, { 'a': 1, 'a.b': 1 })
+        // { "_id" : ObjectId("520bfe456024608e8ef24af3"), "a" : { "b" : 23 } }
+        // > db.coll.find({}, { 'a.b': 1, 'a': 1 })
+        // { "_id" : ObjectId("520bfe456024608e8ef24af3"), "a" : { "b" : 23, "c" : 44 } }
+        //
+        // Note, how second time the return set of keys is different.
+
+        var currentPath = keyPath.join('.');
+        var anotherPath = keyPath.slice(0, idx + 1).join('.');
+        throw MinimongoError("both " + currentPath + " and " + anotherPath +
+         " found in fields option, using both of them may trigger " +
+         "unexpected behavior. Did you mean to use only one of them?");
+      }
+
       treePos = treePos[key];
     });
 

From 6c448a213f3b222d41420a1fe331b58f421decb1 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Fri, 13 Sep 2013 15:41:53 -0700
Subject: [PATCH 058/335] Another test

---
 packages/minimongo/minimongo_tests.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/minimongo/minimongo_tests.js b/packages/minimongo/minimongo_tests.js
index cd9868e77e..66e9b51df4 100644
--- a/packages/minimongo/minimongo_tests.js
+++ b/packages/minimongo/minimongo_tests.js
@@ -983,6 +983,11 @@ Tinytest.add("minimongo - projection_compiler", function (test) {
       [ { a: { b: 42 } }, { a: { b: 42 } }, "Can't have ambiguous rules (one is prefix of another)" ]
     ]);
   });
+  test.throws(function () {
+    testProjection({ 'a.b.c': 1, 'a.b': 1, 'a': 1 }, [
+      [ { a: { b: 42 } }, { a: { b: 42 } }, "Can't have ambiguous rules (one is prefix of another)" ]
+    ]);
+  });
 
   test.throws(function () {
     testProjection("some string", [

From 4ed373b2b40179c4784cee3908ad95ab4754e470 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Fri, 13 Sep 2013 15:59:36 -0700
Subject: [PATCH 059/335] Check the equality with _.isEqual

EJSON.stringify doesn't guarantee the order of keys.
---
 packages/minimongo/minimongo_tests.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/minimongo/minimongo_tests.js b/packages/minimongo/minimongo_tests.js
index 66e9b51df4..07475e5c94 100644
--- a/packages/minimongo/minimongo_tests.js
+++ b/packages/minimongo/minimongo_tests.js
@@ -898,7 +898,7 @@ Tinytest.add("minimongo - projection_compiler", function (test) {
   var testProjection = function (projection, tests) {
     var projection_f = LocalCollection._compileProjection(projection);
     var equalNonStrict = function (a, b, desc) {
-      test.equal(EJSON.stringify(a), EJSON.stringify(b), desc);
+      test.isTrue(_.isEqual(a, b), desc);
     };
 
     _.each(tests, function (testCase) {
@@ -1101,7 +1101,7 @@ Tinytest.add("minimongo - fetch with projection, subarrays", function (test) {
   });
 
   var equalNonStrict = function (a, b, desc) {
-    test.equal(EJSON.stringify(a), EJSON.stringify(b), desc);
+    test.isTrue(_.isEqual(a, b), desc);
   };
 
   var testForProjection = function (projection, expected) {

From 4345fdbd4b8179fc52becfb32028d52bae4f3d4b Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Fri, 13 Sep 2013 16:00:08 -0700
Subject: [PATCH 060/335] Always sort keys to simplify some cases.

And don't modify the argument.
---
 packages/minimongo/minimongo.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index ec307a9507..75e5acd639 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -1038,12 +1038,12 @@ LocalCollection._compileProjection = function (fields) {
     throw MinimongoError("Projection values should be one of 1, 0, true, or false");
 
   var _idProjection = _.isUndefined(fields._id) ? true : fields._id;
-  delete fields._id;
+  var fieldsKeys = _.reject(_.keys(fields).sort(), function (key) { return key === '_id'; });
   var including = null; // Unknown
   var projectionRulesTree = {}; // Tree represented as nested objects
 
-  _.each(fields, function (rule, keyPath) {
-    rule = !!rule;
+  _.each(fieldsKeys, function (keyPath) {
+    var rule = !!fields[keyPath];
     if (including === null)
       including = rule;
     if (including !== rule)

From 48eea25d272dd41ccb315d93574b2365aff09230 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Mon, 16 Sep 2013 11:04:08 -0700
Subject: [PATCH 061/335] Comments on keys sorting.

Suggested by Glasser.
---
 packages/minimongo/minimongo.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index 75e5acd639..7fb03f7810 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -1038,6 +1038,9 @@ LocalCollection._compileProjection = function (fields) {
     throw MinimongoError("Projection values should be one of 1, 0, true, or false");
 
   var _idProjection = _.isUndefined(fields._id) ? true : fields._id;
+  // Find the non-_id keys (_id is handled specially because it is included unless
+  // explicitly excluded). Sort the keys, so that our code to detect overlaps
+  // like 'foo' and 'foo.bar' can assume that 'foo' comes first.
   var fieldsKeys = _.reject(_.keys(fields).sort(), function (key) { return key === '_id'; });
   var including = null; // Unknown
   var projectionRulesTree = {}; // Tree represented as nested objects

From d5ce2502f6c67b5e8ce4b724a61553cf240367e8 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Thu, 19 Sep 2013 10:22:36 -0700
Subject: [PATCH 062/335] Improve error messages if unipackage load fails.

This mostly affects Meteor core development (since for now, unipackage.load is
only used inside the meteor tools itself and only to load core packages, which
should be properly compiled in any Meteor release).
---
 tools/unipackage.js | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/tools/unipackage.js b/tools/unipackage.js
index ff4d9e5786..5e49b8753b 100644
--- a/tools/unipackage.js
+++ b/tools/unipackage.js
@@ -1,6 +1,7 @@
 var _ = require('underscore');
 var library = require('./library.js');
 var bundler = require('./bundler.js');
+var buildmessage = require('./buildmessage.js');
 
 // Load unipackages into the currently running node.js process. Use
 // this to use unipackages (such as the DDP client) from command-line
@@ -69,16 +70,27 @@ var load = function (options) {
     __meteor_runtime_config__: { meteorRelease: options.release }
   };
 
-  // Load the code
-  var image = bundler.buildJsImage({
-    name: "load",
-    library: options.library,
-    use: options.packages || []
-  }).image;
-  var ret = image.load(env);
+  var ret;
+  var messages = buildmessage.capture({
+    title: "loading unipackage"
+  }, function () {
+    // Load the code
+    var image = bundler.buildJsImage({
+      name: "load",
+      library: options.library,
+      use: options.packages || []
+    }).image;
+    ret = image.load(env);
 
-  // Run any user startup hooks.
-  _.each(env.__meteor_bootstrap__.startup_hooks, function (x) { x(); });
+    // Run any user startup hooks.
+    _.each(env.__meteor_bootstrap__.startup_hooks, function (x) { x(); });
+  });
+
+  if (messages.hasMessages()) {
+    process.stdout.write("Errors prevented unipackage load:\n");
+    process.stdout.write(messages.formatMessages());
+    process.exit(1);
+  }
 
   // Save to cache
   cache[cacheKey] = ret;

From 8afa4f2c9e70bf812a1f0689212955e3a00c6023 Mon Sep 17 00:00:00 2001
From: Maxhodges <Max@whiterabbitpress.com>
Date: Sat, 14 Sep 2013 02:47:14 +0900
Subject: [PATCH 063/335] typo. "with" repeated twice.

---
 scripts/admin/banner.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/admin/banner.txt b/scripts/admin/banner.txt
index f0422b945e..3f4a24094b 100644
--- a/scripts/admin/banner.txt
+++ b/scripts/admin/banner.txt
@@ -1,5 +1,5 @@
 => Meteor 0.6.5.1: a few bugfixes, including fixes for lines ending with
-   backslashes, filenames with with spaces, and tab characters in d3.
+   backslashes, filenames with spaces, and tab characters in d3.
 
    This is being downloaded in the background. Update your project
    to Meteor 0.6.5.1 by running 'meteor update'.

From 35e8a048349e42883ab3afb8d9a79362f5e9ebd4 Mon Sep 17 00:00:00 2001
From: Naomi Seyfer <naomi@meteor.com>
Date: Mon, 23 Sep 2013 15:53:47 -0700
Subject: [PATCH 064/335] Stop offending the message.  Dont alias in_queue to
 out_queue

---
 packages/livedata/livedata_server.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/livedata/livedata_server.js b/packages/livedata/livedata_server.js
index fb3a28a0ed..1ecea732b4 100644
--- a/packages/livedata/livedata_server.js
+++ b/packages/livedata/livedata_server.js
@@ -428,7 +428,8 @@ _.extend(Session.prototype, {
     self._deactivateAllSubscriptions();
     // Drop the merge box data immediately.
     self.collectionViews = {};
-    self.in_queue = self.out_queue = [];
+    self.in_queue = [];
+    self.out_queue = [];
   },
 
   // Send a message (queueing it if no socket is connected right now.)

From 4f4e5342eb6767f3837d43689f9618b46345e8a1 Mon Sep 17 00:00:00 2001
From: Naomi Seyfer <naomi@meteor.com>
Date: Mon, 23 Sep 2013 17:30:34 -0700
Subject: [PATCH 065/335] Remove code to keep around sessions after they are
 disconnected.

We will deal with reconnects with session resumption someday, but it will not be
using this dead code which has bitrotted in our repository for months on end.
It was never fully implemented, and what we had was a sketch that causes bugs
(and extra cpu usage).
---
 packages/livedata/livedata_server.js | 223 ++++++++-------------------
 1 file changed, 63 insertions(+), 160 deletions(-)

diff --git a/packages/livedata/livedata_server.js b/packages/livedata/livedata_server.js
index 1ecea732b4..11bd6752a5 100644
--- a/packages/livedata/livedata_server.js
+++ b/packages/livedata/livedata_server.js
@@ -212,7 +212,7 @@ _.extend(SessionCollectionView.prototype, {
 /* Session                                                                    */
 /******************************************************************************/
 
-var Session = function (server, version) {
+var Session = function (server, version, socket) {
   var self = this;
   self.id = Random.id();
 
@@ -220,18 +220,11 @@ var Session = function (server, version) {
   self.version = version;
 
   self.initialized = false;
-  self.socket = null;
-  self.last_connect_time = 0;
-  self.last_detach_time = +(new Date);
+  self.socket = socket;
 
-  self.in_queue = [];
+  self.inQueue = [];
   self.blocked = false;
-  self.worker_running = false;
-
-  self.out_queue = [];
-
-  // id of invocation => {result or error, when}
-  self.result_cache = {};
+  self.workerRunning = false;
 
   // Sub objects for active subscriptions
   self._namedSubs = {};
@@ -257,6 +250,13 @@ var Session = function (server, version) {
   // when we are rerunning subscriptions, any ready messages
   // we want to buffer up for when we are done rerunning subscriptions
   self._pendingReady = [];
+
+  socket.send(stringifyDDP({msg: 'connected',
+                            session: self.id}));
+  // On initial connect, spin up all the universal publishers.
+  Fiber(function () {
+    self.startUniversalSubs();
+  }).run();
 };
 
 _.extend(Session.prototype, {
@@ -340,32 +340,7 @@ _.extend(Session.prototype, {
     var view = self.getCollectionView(collectionName);
     view.changed(subscriptionHandle, id, fields);
   },
-  // Connect a new socket to this session, displacing (and closing)
-  // any socket that was previously connected
-  connect: function (socket) {
-    var self = this;
-    if (self.socket) {
-      self.socket.close();
-      self.detach(self.socket);
-    }
 
-    self.socket = socket;
-    self.last_connect_time = +(new Date);
-    _.each(self.out_queue, function (msg) {
-      if (Meteor._printSentDDP)
-        Meteor._debug("Sent DDP", stringifyDDP(msg));
-      self.socket.send(stringifyDDP(msg));
-    });
-    self.out_queue = [];
-
-    // On initial connect, spin up all the universal publishers.
-    if (!self.initialized) {
-      self.initialized = true;
-      Fiber(function () {
-        self.startUniversalSubs();
-      }).run();
-    }
-  },
 
   startUniversalSubs: function () {
     var self = this;
@@ -378,70 +353,33 @@ _.extend(Session.prototype, {
     });
   },
 
-  // If 'socket' is the socket currently connected to this session,
-  // detach it (the session will then have no socket -- it will
-  // continue running and queue up its messages.) If 'socket' isn't
-  // the currently connected socket, just clean up the pointer that
-  // may have led us to believe otherwise.
-  detach: function (socket) {
-    var self = this;
-    if (socket === self.socket) {
-      self.socket = null;
-      self.last_detach_time = +(new Date);
-    }
-    if (socket.meteor_session === self)
-      socket.meteor_session = null;
-  },
-
-  // Should be called periodically to prune the method invocation
-  // replay cache.
-  cleanup: function () {
-    var self = this;
-    // Only prune if we're connected, and we've been connected for at
-    // least five minutes. That seems like enough time for the client
-    // to finish its reconnection. Then, keep five minutes of
-    // history. That seems like enough time for the client to receive
-    // our responses, or else for us to notice that the connection is
-    // gone.
-    var now = +(new Date);
-    if (!(self.socket && (now - self.last_connect_time) > 5 * 60 * 1000))
-      return; // not connected, or not connected long enough
-
-    var kill = [];
-    _.each(self.result_cache, function (info, id) {
-      if (now - info.when > 5 * 60 * 1000)
-        kill.push(id);
-    });
-    _.each(kill, function (id) {
-      delete self.result_cache[id];
-    });
-  },
-
   // Destroy this session. Stop all processing and tear everything
   // down. If a socket was attached, close it.
   destroy: function () {
     var self = this;
     if (self.socket) {
       self.socket.close();
-      self.detach(self.socket);
+      self.socket._meteorSession = null;
     }
-    self._deactivateAllSubscriptions();
+    Meteor.defer(function () {
+      // stop callbacks can yield, so we defer this on destroy.
+      // see also _closeAllForTokens and its desire to destroy things in a loop.
+      self._deactivateAllSubscriptions();
+    });
     // Drop the merge box data immediately.
     self.collectionViews = {};
-    self.in_queue = [];
-    self.out_queue = [];
+    self.inQueue = null;
   },
 
-  // Send a message (queueing it if no socket is connected right now.)
+  // Send a message (doing nothing if no socket is connected right now.)
   // It should be a JSON object (it will be stringified.)
   send: function (msg) {
     var self = this;
-    if (Meteor._printSentDDP)
-      Meteor._debug("Sent DDP", stringifyDDP(msg));
-    if (self.socket)
+    if (self.socket) {
+      if (Meteor._printSentDDP)
+        Meteor._debug("Sent DDP", stringifyDDP(msg));
       self.socket.send(stringifyDDP(msg));
-    else
-      self.out_queue.push(msg);
+    }
   },
 
   // Send a connection error.
@@ -468,20 +406,20 @@ _.extend(Session.prototype, {
   // way, but it's the easiest thing that's correct. (unsub needs to
   // be ordered against sub, methods need to be ordered against each
   // other.)
-  processMessage: function (msg_in, socket) {
+  processMessage: function (msg_in) {
     var self = this;
-    if (socket !== self.socket)
+    if (!self.inQueue) // we have been destroyed.
       return;
 
-    self.in_queue.push(msg_in);
-    if (self.worker_running)
+    self.inQueue.push(msg_in);
+    if (self.workerRunning)
       return;
-    self.worker_running = true;
+    self.workerRunning = true;
 
     var processNext = function () {
-      var msg = self.in_queue.shift();
+      var msg = self.inQueue && self.inQueue.shift();
       if (!msg) {
-        self.worker_running = false;
+        self.workerRunning = false;
         return;
       }
 
@@ -569,18 +507,6 @@ _.extend(Session.prototype, {
           msg: 'updated', methods: [msg.id]});
       });
 
-      // check for a replayed method (this is important during
-      // reconnect)
-      if (_.has(self.result_cache, msg.id)) {
-        // found -- just resend whatever we sent last time
-        var payload = _.clone(self.result_cache[msg.id]);
-        delete payload.when;
-        self.send(
-          _.extend({msg: 'result', id: msg.id}, payload));
-        fence.arm();
-        return;
-      }
-
       // find the handler
       var handler = self.server.method_handlers[msg.method];
       if (!handler) {
@@ -628,7 +554,6 @@ _.extend(Session.prototype, {
       var payload =
         exception ? {error: exception} : (result !== undefined ?
                                           {result: result} : {});
-      self.result_cache[msg.id] = _.extend({when: +(new Date)}, payload);
       self.send(_.extend({msg: 'result', id: msg.id}, payload));
     }
   },
@@ -728,6 +653,7 @@ _.extend(Session.prototype, {
       }
     });
 
+
     // XXX figure out the login token that was just used, and set up an observe
     // on the user doc so that deleting the user or the login token disconnects
     // the session. For now, if you want to make sure that your deleted users
@@ -1050,7 +976,7 @@ Server = function () {
 
   self.stream_server.register(function (socket) {
     // socket implements the SockJSConnection interface
-    socket.meteor_session = null;
+    socket._meteorSession = null;
 
     var sendError = function (reason, offendingMessage) {
       var msg = {msg: 'error', reason: reason};
@@ -1076,7 +1002,7 @@ Server = function () {
         }
 
         if (msg.msg === 'connect') {
-          if (socket.meteor_session) {
+          if (socket._meteorSession) {
             sendError("Already connected", msg);
             return;
           }
@@ -1084,11 +1010,11 @@ Server = function () {
           return;
         }
 
-        if (!socket.meteor_session) {
+        if (!socket._meteorSession) {
           sendError('Must connect first', msg);
           return;
         }
-        socket.meteor_session.processMessage(msg, socket);
+        socket._meteorSession.processMessage(msg);
       } catch (e) {
         // XXX print stack nicely
         Meteor._debug("Internal exception while processing message", msg,
@@ -1097,36 +1023,13 @@ Server = function () {
     });
 
     socket.on('close', function () {
-      if (socket.meteor_session)
-        socket.meteor_session.detach(socket);
-    });
-  });
-
-  // Every minute, clean up sessions that have been abandoned for a
-  // minute. Also run result cache cleanup.
-  // XXX at scale, we'll want to have a separate timer for each
-  //     session, and stagger them
-  // XXX when we get resume working again, we might keep sessions
-  //     open longer (but stop running their diffs!)
-  Meteor.setInterval(function () {
-    var now = +(new Date);
-    var destroyedIds = [];
-    _.each(self.sessions, function (s, id) {
-      s.cleanup();
-      if (!s.socket && (now - s.last_detach_time) > 60 * 1000) {
-        s.destroy();
-        destroyedIds.push(id);
+      if (socket._meteorSession) {
+        Fiber(function () {
+          self._destroySession(socket._meteorSession);
+        }).run();
       }
     });
-    _.each(destroyedIds, function (id) {
-      var session = self.sessions[id];
-      self.sessionsByLoginToken[session.loginToken] = _.without(
-        self.sessionsByLoginToken[session.loginToken],
-        id
-      );
-      delete self.sessions[id];
-    });
-  }, 1 * 60 * 1000);
+  });
 };
 
 _.extend(Server.prototype, {
@@ -1134,19 +1037,13 @@ _.extend(Server.prototype, {
   _handleConnect: function (socket, msg) {
     var self = this;
     // In the future, handle session resumption: something like:
-    //  socket.meteor_session = self.sessions[msg.session]
+    //  socket._meteorSession = self.sessions[msg.session]
     var version = calculateVersion(msg.support, SUPPORTED_DDP_VERSIONS);
 
     if (msg.version === version) {
       // Creating a new session
-      socket.meteor_session = new Session(self, version);
-      self.sessions[socket.meteor_session.id] = socket.meteor_session;
-
-
-      socket.send(stringifyDDP({msg: 'connected',
-                                  session: socket.meteor_session.id}));
-      // will kick off previous connection, if any
-      socket.meteor_session.connect(socket);
+      socket._meteorSession = new Session(self, version, socket);
+      self.sessions[socket._meteorSession.id] = socket._meteorSession;
     } else if (!msg.version) {
       // connect message without a version. This means an old (pre-pre1)
       // client is trying to connect. If we just disconnect the
@@ -1240,6 +1137,21 @@ _.extend(Server.prototype, {
     }
   },
 
+  _destroySession: function (session) {
+    var self = this;
+    delete self.sessions[session.id];
+    if (session.sessionData.loginToken) {
+      self.sessionsByLoginToken[session.sessionData.loginToken] = _.without(
+        self.sessionsByLoginToken[session.sessionData.loginToken],
+        session.id
+      );
+      if (_.isEmpty(self.sessionsByLoginToken[session.sessionData.loginToken])) {
+        delete self.sessionsByLoginToken[session.sessionData.loginToken];
+      }
+    }
+    session.destroy();
+  },
+
   methods: function (methods) {
     var self = this;
     _.each(methods, function (func, name) {
@@ -1349,6 +1261,8 @@ _.extend(Server.prototype, {
         self.sessionsByLoginToken[oldToken],
         session.id
       );
+      if (_.isEmpty(self.sessionsByLoginToken[oldToken]))
+        delete self.sessionsByLoginToken[oldToken];
     }
     if (! _.has(self.sessionsByLoginToken, newToken))
       self.sessionsByLoginToken[newToken] = [];
@@ -1361,25 +1275,14 @@ _.extend(Server.prototype, {
     var self = this;
     _.each(tokens, function (token) {
       if (_.has(self.sessionsByLoginToken, token)) {
-        var destroyedIds = [];
-        _.each(self.sessionsByLoginToken[token], function (sessionId) {
+        // _destroySession modifies sessionsByLoginToken, so we clone it.
+        _.each(EJSON.clone(self.sessionsByLoginToken[token]), function (sessionId) {
           // Destroy session and remove from self.sessions.
           var session = self.sessions[sessionId];
           if (session) {
-            session.cleanup();
-            session.destroy();
-            delete self.sessions[sessionId];
+            self._destroySession(session);
           }
-          destroyedIds.push(sessionId);
         });
-
-        // Remove destroyed sessions from self.sessionsByLoginToken.
-        self.sessionsByLoginToken[token] = _.filter(
-          self.sessionsByLoginToken[token],
-          function (sessionId) {
-            return _.indexOf(destroyedIds, sessionId) === -1;
-          }
-        );
       }
     });
   }

From 7e8c2f9405b4ce06a047878123cb0b0ce70e62c1 Mon Sep 17 00:00:00 2001
From: Avital Oliver <avital@thewe.net>
Date: Mon, 23 Sep 2013 17:49:07 -0700
Subject: [PATCH 066/335] Better error when passing string to {{#each}}

Fixes #722
---
 packages/templating/deftemplate.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/templating/deftemplate.js b/packages/templating/deftemplate.js
index 7aafefcb1b..6ad46037f1 100644
--- a/packages/templating/deftemplate.js
+++ b/packages/templating/deftemplate.js
@@ -15,6 +15,15 @@ var hookHandlebars = function () {
 
   var orig = Handlebars._default_helpers.each;
   Handlebars._default_helpers.each = function (arg, options) {
+    var isArgValid = function () {
+      return !arg // falsey
+        || (arg instanceof Array)
+        || (arg instanceof Object && 'observeChanges' in arg);
+    };
+    if (!isArgValid())
+      throw new Error("{{#each}} only accepts arrays, cursors, or falsey "
+                      + "values. You passed: " + arg);
+
     // if arg isn't an observable (like LocalCollection.Cursor),
     // don't use this reactive implementation of #each.
     if (!(arg && 'observeChanges' in arg))

From ca080b147701bf2171b99336690514cb70d12ae7 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Mon, 23 Sep 2013 20:53:09 -0700
Subject: [PATCH 067/335] bump mongo and dev bundle version.

---
 meteor                         | 2 +-
 scripts/generate-dev-bundle.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meteor b/meteor
index d41941d01f..5584e6c2a4 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-BUNDLE_VERSION=0.3.13
+BUNDLE_VERSION=0.3.15
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.
diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh
index 65268a7e96..0091c5a388 100755
--- a/scripts/generate-dev-bundle.sh
+++ b/scripts/generate-dev-bundle.sh
@@ -161,7 +161,7 @@ make install
 # click 'changelog' under the current version, then 'release notes' in
 # the upper right.
 cd "$DIR/build"
-MONGO_VERSION="2.4.4"
+MONGO_VERSION="2.4.6"
 
 # We use Meteor fork since we added some changes to the building script.
 # Our patches allow us to link most of the libraries statically.

From 6452c8b173123f26c2442bdcc7a08cd44e9ba089 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Mon, 23 Sep 2013 22:50:43 -0700
Subject: [PATCH 068/335] update history.

---
 History.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/History.md b/History.md
index 5e6cd7fd65..ec5978c7b5 100644
--- a/History.md
+++ b/History.md
@@ -12,6 +12,10 @@
   0.6.5. (A bug prevented the 0.6.5 reimplementation of `register_extension`
   from working properly anyway.)
 
+* Build Linux binaries on an older Linux machine. Meteor now supports
+  running on Linux machines with glibc 2.9 or newer (Ubuntu 10.04+, RHEL
+  and CentOS 6+, Fedora 10+, Debian 6+).
+
 ## v0.6.5.1
 
 * Fix syntax errors on lines that end with a backslash. #1326

From bd73b312554563145cfaa240b288e6e99919c2d8 Mon Sep 17 00:00:00 2001
From: Avital Oliver <avital@thewe.net>
Date: Tue, 24 Sep 2013 10:48:55 -0700
Subject: [PATCH 069/335] Update History.md for fixing #722

---
 History.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/History.md b/History.md
index ec5978c7b5..3db302fed6 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,7 @@
 ## vNEXT
 
+* Better error when passing a string to {{#each}}. #722
+
 * Write dates to Mongo as ISODate rather than Integer; existing data can be
   converted by passing it through `new Date()`. #1228
 

From 33153624f69bf85af90c6642075c0e01c904a200 Mon Sep 17 00:00:00 2001
From: Naomi Seyfer <naomi@meteor.com>
Date: Tue, 24 Sep 2013 12:00:15 -0700
Subject: [PATCH 070/335] Fix bug with empty-string _id not giving you any
 results ever

---
 packages/mongo-livedata/collection.js         |  4 +--
 packages/mongo-livedata/mongo_driver.js       |  2 +-
 .../mongo-livedata/mongo_livedata_tests.js    | 33 +++++++++++++++++++
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/packages/mongo-livedata/collection.js b/packages/mongo-livedata/collection.js
index 1cea1d650e..a89b88411f 100644
--- a/packages/mongo-livedata/collection.js
+++ b/packages/mongo-livedata/collection.js
@@ -366,9 +366,9 @@ _.each(["insert", "update", "remove"], function (name) {
       args[0] = _.extend({}, args[0]);
       if ('_id' in args[0]) {
         ret = args[0]._id;
-        if (!(typeof ret === 'string'
+        if (!ret || !(typeof ret === 'string'
               || ret instanceof Meteor.Collection.ObjectID))
-          throw new Error("Meteor requires document _id fields to be strings or ObjectIDs");
+          throw new Error("Meteor requires document _id fields to be non-empty strings or ObjectIDs");
       } else {
         ret = args[0]._id = self._makeNewID();
       }
diff --git a/packages/mongo-livedata/mongo_driver.js b/packages/mongo-livedata/mongo_driver.js
index e3fcf835d9..deda9b9d48 100644
--- a/packages/mongo-livedata/mongo_driver.js
+++ b/packages/mongo-livedata/mongo_driver.js
@@ -538,7 +538,7 @@ _.extend(SynchronousCursor.prototype, {
     var self = this;
     while (true) {
       var doc = self._synchronousNextObject().wait();
-      if (!doc || !doc._id) return null;
+      if (!doc || typeof doc._id === 'undefined') return null;
       doc = replaceTypes(doc, replaceMongoAtomWithMeteor);
 
       if (!self._cursorDescription.options.tailable) {
diff --git a/packages/mongo-livedata/mongo_livedata_tests.js b/packages/mongo-livedata/mongo_livedata_tests.js
index 0cc15c0979..64a23991ee 100644
--- a/packages/mongo-livedata/mongo_livedata_tests.js
+++ b/packages/mongo-livedata/mongo_livedata_tests.js
@@ -968,6 +968,39 @@ testAsyncMulti('mongo-livedata - specified _id', [
   }
 ]);
 
+testAsyncMulti('mongo-livedata - empty string _id', [
+  function (test, expect) {
+    var self = this;
+    self.collectionName = Random.id();
+    if (Meteor.isClient) {
+      Meteor.call('createInsecureCollection', self.collectionName);
+      Meteor.subscribe('c-' + self.collectionName);
+    }
+    self.coll = new Meteor.Collection(self.collectionName);
+    try {
+      self.coll.insert({_id: "", f: "foo"});
+      test.fail("Insert with an empty _id should fail");
+    } catch (e) {
+      // ok
+    }
+    self.coll.insert({_id: "realid", f: "bar"}, expect(function (err, res) {
+      test.equal(res, "realid");
+    }));
+  },
+  function (test, expect) {
+    var self = this;
+    var docs = self.coll.find().fetch();
+    test.equal(docs, [{_id: "realid", f: "bar"}]);
+  },
+  function (test, expect) {
+    var self = this;
+    if (Meteor.isServer) {
+      self.coll._collection.insert({_id: "", f: "baz"});
+      test.equal(self.coll.find().fetch().length, 2);
+    }
+  }
+]);
+
 
 if (Meteor.isServer) {
 

From 63589300fedfec044c80d19f0da07ad88c54d772 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Mon, 23 Sep 2013 17:47:29 -0700
Subject: [PATCH 071/335] On MongoDB failures print 20 lines of stderr and
 print a special error if mongod failed to start due to incompatible version
 of glibc.

Catch stderr before 'exit' signal

Try to give a good error message on outdated glibc/libstdc++.

Simplify error reporting to two lines.

Print only last 20 lines of stderr.

Slightly better error message.
---
 tools/mongo_runner.js | 11 ++++++++++-
 tools/run.js          | 13 +++++++++++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/tools/mongo_runner.js b/tools/mongo_runner.js
index f40a438433..c39e2e64cf 100644
--- a/tools/mongo_runner.js
+++ b/tools/mongo_runner.js
@@ -172,7 +172,16 @@ exports.launch_mongo = function (app_dir, port, launch_callback, on_exit_callbac
       callback && callback(err);
     };
 
-    proc.on('exit', on_exit_callback);
+    var stderrOutput = '';
+
+    proc.stderr.setEncoding('utf8');
+    proc.stderr.on('data', function (data) {
+      stderrOutput += data;
+    });
+
+    proc.on('exit', function (code, signal) {
+      on_exit_callback(code, signal, stderrOutput);
+    });
 
     proc.stdout.setEncoding('utf8');
     proc.stdout.on('data', function (data) {
diff --git a/tools/run.js b/tools/run.js
index 8ddc3dc2ed..542485a32a 100644
--- a/tools/run.js
+++ b/tools/run.js
@@ -628,11 +628,15 @@ exports.run = function (context, options) {
         }
         restartServer();
       },
-      function (code, signal) { // On Mongo dead
+      function (code, signal, stderr) { // On Mongo dead
         if (Status.shuttingDown) {
           return;
         }
-        console.log("Unexpected mongo exit code " + code + ". Restarting.");
+
+        // Print only last 20 lines of stderr.
+        stderr = stderr.split('\n').slice(-20).join('\n');
+
+        console.log(stderr + "Unexpected mongo exit code " + code + ". Restarting.\n");
 
         // if mongo dies 3 times with less than 5 seconds between each,
         // declare it failed and die.
@@ -645,6 +649,11 @@ exports.run = function (context, options) {
           if (explanation === mongoExitCodes.EXIT_NET_ERROR)
             console.log("\nCheck for other processes listening on port " + mongoPort +
                         "\nor other meteors running in the same project.");
+          if (!explanation && /GLIBC/i.test(stderr))
+            console.log("\nLooks like you are trying to run Meteor on old Linux " +
+                        "distribution. Meteor only supports Linux with glibc " +
+                        "version 2.9 and above. Try upgrading your distribution " +
+                        "to the latest version.");
           process.exit(1);
         }
         if (mongoErrorTimer)

From 9368852bdcb783e4663fb9c1875c2d7dd5c3b938 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Tue, 24 Sep 2013 16:31:44 -0700
Subject: [PATCH 072/335] Improve error message

Glasser's comments
---
 tools/run.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/run.js b/tools/run.js
index 542485a32a..e2348459e0 100644
--- a/tools/run.js
+++ b/tools/run.js
@@ -650,8 +650,8 @@ exports.run = function (context, options) {
             console.log("\nCheck for other processes listening on port " + mongoPort +
                         "\nor other meteors running in the same project.");
           if (!explanation && /GLIBC/i.test(stderr))
-            console.log("\nLooks like you are trying to run Meteor on old Linux " +
-                        "distribution. Meteor only supports Linux with glibc " +
+            console.log("\nLooks like you are trying to run Meteor on an old Linux " +
+                        "distribution. Meteor on Linux only supports Linux with glibc " +
                         "version 2.9 and above. Try upgrading your distribution " +
                         "to the latest version.");
           process.exit(1);

From 99b9ec2da5a75c954fa5b6b73361b0176869d29e Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Tue, 24 Sep 2013 17:10:29 -0700
Subject: [PATCH 073/335] Return values of server update/remove queries to
 user.

Thanks to @jacott. Minimongo implementations to come.
---
 packages/mongo-livedata/collection.js         | 19 ++++++++---
 packages/mongo-livedata/mongo_driver.js       | 14 ++++++--
 .../mongo-livedata/mongo_livedata_tests.js    | 33 +++++++++++++++++++
 3 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/packages/mongo-livedata/collection.js b/packages/mongo-livedata/collection.js
index a89b88411f..01f7401cfb 100644
--- a/packages/mongo-livedata/collection.js
+++ b/packages/mongo-livedata/collection.js
@@ -378,9 +378,15 @@ _.each(["insert", "update", "remove"], function (name) {
 
     var wrappedCallback;
     if (callback) {
-      wrappedCallback = function (error, result) {
-        callback(error, !error && ret);
-      };
+      if (name === "insert") {
+        // On inserts, always return the id that we generated.
+        wrappedCallback = function (error, result) {
+          callback(error, !error && ret);
+        };
+      } else {
+        // For updates and removes, return whatever the collection returned.
+        wrappedCallback = callback;
+      }
     }
 
     if (self._connection && self._connection !== Meteor.server) {
@@ -403,7 +409,12 @@ _.each(["insert", "update", "remove"], function (name) {
       // and propagate any exception.
       args.push(wrappedCallback);
       try {
-        self._collection[name].apply(self._collection, args);
+        var queryRet = self._collection[name].apply(self._collection, args);
+        // On updates and removes, return whatever the collection returned; on
+        // inserts, always return the id that we generated. If the user provided
+        // a callback, then we expect queryRet to be undefined.
+        if (name !== "insert")
+          ret = queryRet;
       } catch (e) {
         if (callback) {
           callback(e);
diff --git a/packages/mongo-livedata/mongo_driver.js b/packages/mongo-livedata/mongo_driver.js
index deda9b9d48..bfaf7e4d2c 100644
--- a/packages/mongo-livedata/mongo_driver.js
+++ b/packages/mongo-livedata/mongo_driver.js
@@ -257,6 +257,16 @@ MongoConnection.prototype._refresh = function (collectionName, selector) {
   }
 };
 
+var numberAffectedCallback = function (callback) {
+  return Meteor.bindEnvironment(function (err, numberAffected) {
+    callback && callback(err, ! err && {
+      numberAffected: numberAffected
+    });
+  }, function (err) {
+    Meteor._debug("Error in Mongo write:", err.stack);
+  });
+};
+
 MongoConnection.prototype._remove = function (collection_name, selector,
                                               callback) {
   var self = this;
@@ -279,7 +289,7 @@ MongoConnection.prototype._remove = function (collection_name, selector,
   try {
     var collection = self._getCollection(collection_name);
     collection.remove(replaceTypes(selector, replaceMeteorAtomWithMongo),
-                      {safe: true}, callback);
+                      {safe: true}, numberAffectedCallback(callback));
   } catch (e) {
     write.committed();
     throw e;
@@ -327,7 +337,7 @@ MongoConnection.prototype._update = function (collection_name, selector, mod,
     if (options.multi) mongoOpts.multi = true;
     collection.update(replaceTypes(selector, replaceMeteorAtomWithMongo),
                       replaceTypes(mod, replaceMeteorAtomWithMongo),
-                      mongoOpts, callback);
+                      mongoOpts, numberAffectedCallback(callback));
   } catch (e) {
     write.committed();
     throw e;
diff --git a/packages/mongo-livedata/mongo_livedata_tests.js b/packages/mongo-livedata/mongo_livedata_tests.js
index 64a23991ee..9e96ed8f71 100644
--- a/packages/mongo-livedata/mongo_livedata_tests.js
+++ b/packages/mongo-livedata/mongo_livedata_tests.js
@@ -801,6 +801,39 @@ testAsyncMulti('mongo-livedata - document with a custom type, ' + idGeneration,
 ]);
 
 if (Meteor.isServer) {
+  Tinytest.addAsync("mongo-livedata - update return values, " + idGeneration, function (test, onComplete) {
+    var run = test.runId();
+    var coll = new Meteor.Collection("livedata_update_result_"+run, collectionOptions);
+
+    coll.insert({ foo: "bar" });
+    coll.insert({ foo: "baz" });
+    test.equal(coll.update({}, { $set: { foo: "qux" } }, { multi: true }), {
+      numberAffected: 2
+    });
+    coll.update({}, { $set: { foo: "quux" } }, { multi: true }, function (err, result) {
+      test.isFalse(err);
+      test.equal(result, { numberAffected: 2 });
+      onComplete();
+    });
+  });
+
+  Tinytest.addAsync("mongo-livedata - remove return values, " + idGeneration, function (test, onComplete) {
+    var run = test.runId();
+    var coll = new Meteor.Collection("livedata_update_result_"+run, collectionOptions);
+
+    coll.insert({ foo: "bar" });
+    coll.insert({ foo: "baz" });
+    test.equal(coll.remove({}), { numberAffected: 2 });
+    coll.insert({ foo: "bar" });
+    coll.insert({ foo: "baz" });
+    coll.remove({}, function (err, result) {
+      test.isFalse(err);
+      test.equal(result, { numberAffected: 2 });
+      onComplete();
+    });
+  });
+
+
   Tinytest.addAsync("mongo-livedata - id-based invalidation, " + idGeneration, function (test, onComplete) {
     var run = test.runId();
     var coll = new Meteor.Collection("livedata_invalidation_collection_"+run, collectionOptions);

From 411c6cf8f4868d1b7e1762a67213b0974a3e8818 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Mon, 23 Sep 2013 14:58:21 -0700
Subject: [PATCH 074/335] Update to Node 0.10.18, bumping dev bundle version.
 Use caronte.

---
 docs/client/concepts.html      | 4 ++--
 meteor                         | 2 +-
 scripts/generate-dev-bundle.sh | 8 ++++++--
 tools/bundler.js               | 4 ++--
 tools/meteor.js                | 2 +-
 tools/server/boot.js           | 2 +-
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/docs/client/concepts.html b/docs/client/concepts.html
index 61d47d7c18..f0fc8f13e5 100644
--- a/docs/client/concepts.html
+++ b/docs/client/concepts.html
@@ -824,9 +824,9 @@ To get started, run
     $ meteor bundle myapp.tgz
 
 This command will generate a fully-contained Node.js application in the form of
-a tarball.  To run this application, you need to provide Node.js 0.8 and a
+a tarball.  To run this application, you need to provide Node.js 0.10 and a
 MongoDB server.  (The current release of Meteor has been tested with Node
-0.8.24.) You can then run the application by invoking node, specifying the HTTP
+0.10.18.) You can then run the application by invoking node, specifying the HTTP
 port for the application to listen on, and the MongoDB endpoint.  If you don't
 already have a MongoDB server, we can recommend our friends at
 [MongoHQ](http://mongohq.com).
diff --git a/meteor b/meteor
index 5584e6c2a4..58177c2493 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-BUNDLE_VERSION=0.3.15
+BUNDLE_VERSION=0.3.16
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.
diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh
index 0091c5a388..ee29664782 100755
--- a/scripts/generate-dev-bundle.sh
+++ b/scripts/generate-dev-bundle.sh
@@ -76,7 +76,7 @@ cd node
 # When upgrading node versions, also update the values of MIN_NODE_VERSION at
 # the top of tools/meteor.js and tools/server/server.js, and the text in
 # docs/client/concepts.html and the README in tools/bundler.js.
-git checkout v0.8.24
+git checkout v0.10.18
 
 ./configure --prefix="$DIR"
 make -j4
@@ -102,7 +102,6 @@ npm install semver@1.1.0
 npm install handlebars@1.0.7
 npm install request@2.12.0
 npm install keypress@0.1.0
-npm install http-proxy@0.10.1  # not 0.10.2, which contains a sketchy websocket change
 npm install underscore@1.5.1
 npm install fstream@0.1.21
 npm install tar@0.1.14
@@ -111,6 +110,11 @@ npm install shell-quote@0.0.1   # now at 1.3.3, which adds plenty of options to
 npm install byline@2.0.3  # v3 requires node 0.10
 npm install source-map@0.1.26
 
+# Using the unreleased "caronte" rewrite of http-proxy (which is even called
+# 'caronte', though this may change when this eventually hopefully becomes
+# http-proxy 1.0).
+npm install https://github.com/nodejitsu/node-http-proxy/tarball/94ec6fa5ce6826ca1e8974f7e99b31541aaad76a
+
 # Using the unreleased 1.1 branch. We can probably switch to a built NPM version
 # when it gets released.
 npm install https://github.com/ariya/esprima/tarball/5044b87f94fb802d9609f1426c838874ec2007b3
diff --git a/tools/bundler.js b/tools/bundler.js
index 3216ef8c2b..e64be55208 100644
--- a/tools/bundler.js
+++ b/tools/bundler.js
@@ -1442,8 +1442,8 @@ var writeSiteArchive = function (targets, outputPath, options) {
 
       builder.write('README', { data: new Buffer(
 "This is a Meteor application bundle. It has only one dependency:\n" +
-"Node.js 0.8 (with the 'fibers' package). The current release of Meteor\n" +
-"has been tested with Node 0.8.24. To run the application:\n" +
+"Node.js 0.10 (with the 'fibers' package). The current release of Meteor\n" +
+"has been tested with Node 0.10.18. To run the application:\n" +
 "\n" +
 "  $ npm install fibers@1.0.1\n" +
 "  $ export MONGO_URL='mongodb://user:password@host:port/databasename'\n" +
diff --git a/tools/meteor.js b/tools/meteor.js
index 290729f6b7..f5b1ad2e68 100644
--- a/tools/meteor.js
+++ b/tools/meteor.js
@@ -24,7 +24,7 @@ Fiber(function () {
 
   var Future = require('fibers/future');
   // This code is duplicated in app/server/server.js.
-  var MIN_NODE_VERSION = 'v0.8.24';
+  var MIN_NODE_VERSION = 'v0.10.18';
   if (require('semver').lt(process.version, MIN_NODE_VERSION)) {
     process.stderr.write(
       'Meteor requires Node ' + MIN_NODE_VERSION + ' or later.\n');
diff --git a/tools/server/boot.js b/tools/server/boot.js
index 0a2fa308a2..c8931b0730 100644
--- a/tools/server/boot.js
+++ b/tools/server/boot.js
@@ -6,7 +6,7 @@ var _ = require('underscore');
 var sourcemap_support = require('source-map-support');
 
 // This code is duplicated in tools/server/server.js.
-var MIN_NODE_VERSION = 'v0.8.24';
+var MIN_NODE_VERSION = 'v0.10.18';
 if (require('semver').lt(process.version, MIN_NODE_VERSION)) {
   process.stderr.write(
     'Meteor requires Node ' + MIN_NODE_VERSION + ' or later.\n');

From fa4509f81b34cec8cbc5975491e0961800de7e1a Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Mon, 15 Apr 2013 14:59:03 -0700
Subject: [PATCH 075/335] Use npm install --force to get around NPM cache
 corruption bug.

(This caused test_bundler_npm to fail sporadically with Node 0.8.)
---
 tools/meteor_npm.js             | 16 +++++++++++++---
 tools/tests/test_bundler_npm.js |  4 ++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/tools/meteor_npm.js b/tools/meteor_npm.js
index cf07689d95..d89d3e1005 100644
--- a/tools/meteor_npm.js
+++ b/tools/meteor_npm.js
@@ -407,9 +407,18 @@ _.extend(exports, {
     // We don't use npm.commands.install since we couldn't
     // figure out how to silence all output (specifically the
     // installed tree which is printed out with `console.log`)
+    //
+    // We use --force, because the NPM cache is broken! See
+    // https://github.com/isaacs/npm/issues/3265 Basically, switching back and
+    // forth between a tarball fork of version X and the real version X can
+    // confuse NPM. But the main reason to use tarball URLs is to get a fork of
+    // the latest version with some fix, so it's easy to trigger this! So
+    // instead, always use --force. (Even with --force, we still WRITE to the
+    // cache, so we can corrupt the cache for other invocations of npm... ah
+    // well.)
     var result =
       this._execFileSync(path.join(files.get_dev_bundle(), "bin", "npm"),
-                         ["install", installArg],
+                         ["install", "--force", installArg],
                          {cwd: dir});
 
     if (! result.success) {
@@ -436,10 +445,11 @@ _.extend(exports, {
 
     this._ensureConnected();
 
-    // `npm install`, which reads npm-shrinkwrap.json
+    // `npm install`, which reads npm-shrinkwrap.json.  See above for why
+    // --force.
     var result =
       this._execFileSync(path.join(files.get_dev_bundle(), "bin", "npm"),
-                         ["install"], {cwd: dir});
+                         ["install", "--force"], {cwd: dir});
 
 
     if (! result.success) {
diff --git a/tools/tests/test_bundler_npm.js b/tools/tests/test_bundler_npm.js
index 82fe94c1dc..e4e1509bc0 100644
--- a/tools/tests/test_bundler_npm.js
+++ b/tools/tests/test_bundler_npm.js
@@ -172,12 +172,12 @@ assert.doesNotThrow(function () {
 
   // while bundling, verify that we don't call `npm install
   // name@version unnecessarily` -- calling `npm install` is enough,
-  // and installing each package separately coul unintentionally bump
+  // and installing each package separately could unintentionally bump
   // subdependency versions. (to intentionally bump subdependencies,
   // just remove all of the .npm directory)
   var bareExecFileSync = meteorNpm._execFileSync;
   meteorNpm._execFileSync = function(file, args, opts) {
-    if (args[0] === 'install' && args[1])
+    if (args.length > 2 && args[0] === 'install' && args[1] === '--force')
       assert.fail("shouldn't be installing specific npm packages: " + args[1]);
     return bareExecFileSync(file, args, opts);
   };

From d1cf1bd2e389e0ab8db80de5f9e48331241fb719 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Mon, 23 Sep 2013 19:30:32 -0700
Subject: [PATCH 076/335] Make sure all packages rebuild.

This isn't quite enough to rebuild NPM packages but it's a start.
---
 tools/packages.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/packages.js b/tools/packages.js
index 41832c04fd..677cb40d00 100644
--- a/tools/packages.js
+++ b/tools/packages.js
@@ -26,7 +26,7 @@ var sourcemap = require('source-map');
 // end up as watched dependencies. (At least for now, packages only used in
 // target creation (eg minifiers and dev-bundle-fetcher) don't require you to
 // update BUILT_BY, though you will need to quit and rerun "meteor run".)
-exports.BUILT_BY = 'meteor/8';
+exports.BUILT_BY = 'meteor/9';
 
 // Like Perl's quotemeta: quotes all regexp metacharacters. See
 //   https://github.com/substack/quotemeta/blob/master/index.js

From 5f146a9d72392809488f1b04ba42f35c66a9bc63 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Mon, 23 Sep 2013 23:29:34 -0700
Subject: [PATCH 077/335] Update run.js to use caronte API.

---
 tools/run.js | 99 +++++++++++++++++++++-------------------------------
 1 file changed, 39 insertions(+), 60 deletions(-)

diff --git a/tools/run.js b/tools/run.js
index e2348459e0..292007d943 100644
--- a/tools/run.js
+++ b/tools/run.js
@@ -108,8 +108,16 @@ var requestQueue = [];
 var startProxy = function (outerPort, innerPort, callback) {
   callback = callback || function () {};
 
-  var httpProxy = require('http-proxy');
-  var p = httpProxy.createServer(function (req, res, proxy) {
+  var http = require('http');
+  // caronte is the code name for http-proxy 1.0 while it's under
+  // development. Once it's released, we may need to adjust the APIs slightly.
+  // (eg, the name of the event on proxy.ev will probably no longer say
+  // "caronte")
+  var caronte = require('caronte');
+
+  var proxy = caronte.createProxyServer({});
+
+  var server = http.createServer(function (req, res) {
     if (Status.crashing) {
       // sad face. send error logs.
       // XXX formatting! text/plain is bad
@@ -126,43 +134,35 @@ var startProxy = function (outerPort, innerPort, callback) {
       });
 
       res.end();
-    } else if (Status.listening) {
-      // server is listening. things are hunky dory!
-      proxy.proxyRequest(req, res, {
-        host: '127.0.0.1', port: innerPort
-      });
-    } else {
-      // Not listening yet. Queue up request.
-      var buffer = httpProxy.buffer(req);
-      requestQueue.push(function () {
-        proxy.proxyRequest(req, res, {
-          host: '127.0.0.1', port: innerPort,
-          buffer: buffer
-        });
-      });
+      return;
     }
-  });
-
-  // Proxy websocket requests using same buffering logic as for regular HTTP requests
-  p.on('upgrade', function(req, socket, head) {
+    var proxyIt = function () {
+      proxy.web(req, res, {target: 'http://127.0.0.1:' + innerPort});
+    };
     if (Status.listening) {
       // server is listening. things are hunky dory!
-      p.proxy.proxyWebSocketRequest(req, socket, head, {
-        host: '127.0.0.1', port: innerPort
-      });
+      proxyIt();
     } else {
-      // Not listening yet. Queue up request.
-      var buffer = httpProxy.buffer(req);
-      requestQueue.push(function () {
-        p.proxy.proxyWebSocketRequest(req, socket, head, {
-          host: '127.0.0.1', port: innerPort,
-          buffer: buffer
-        });
-      });
+      requestQueue.push(proxyIt);
     }
   });
 
-  p.on('error', function (err) {
+  // Proxy websocket requests using same buffering logic as for regular HTTP
+  // requests
+  server.on('upgrade', function(req, socket, head) {
+    var proxyIt = function () {
+      proxy.ws(req, socket, head, { target: 'http://127.0.0.1:' + innerPort});
+    };
+    if (Status.listening) {
+      // server is listening. things are hunky dory!
+      proxyIt();
+    } else {
+      // Not listening yet. Queue up request.
+      requestQueue.push(proxyIt);
+    }
+  });
+
+  server.on('error', function (err) {
     if (err.code == 'EADDRINUSE') {
       process.stderr.write("Can't listen on port " + outerPort
                            + ". Perhaps another Meteor is running?\n");
@@ -177,17 +177,19 @@ var startProxy = function (outerPort, innerPort, callback) {
     process.exit(1);
   });
 
-  // don't spin forever if the app doesn't respond. instead return an
-  // error immediately. This shouldn't happen much since we try to not
-  // send requests if the app is down.
-  p.proxy.on('proxyError', function (err, req, res) {
+  // don't crash if the app doesn't respond. instead return an error
+  // immediately. This shouldn't happen much since we try to not send requests
+  // if the app is down.
+  // XXX should we also handle caronte:outgoing:ws:error, for a failed
+  // websocket?
+  proxy.ee.on('caronte:outgoing:web:error', function (err, req, res) {
     res.writeHead(503, {
       'Content-Type': 'text/plain'
     });
     res.end('Unexpected error.');
   });
 
-  p.listen(outerPort, callback);
+  server.listen(outerPort, callback);
 };
 
 var saveLog = function (msg) {
@@ -402,29 +404,6 @@ exports.run = function (context, options) {
         ("mongodb://127.0.0.1:" + mongoPort + "/meteor");
   var firstRun = true;
 
-  // node-http-proxy doesn't properly handle errors if it has a problem writing
-  // to the proxy target. While we try to not proxy requests when we don't think
-  // the target is listening, there are race conditions here, and in any case
-  // those attempts don't take effect for pre-existing websocket connections.
-  // Error handling in node-http-proxy is really convoluted and will change with
-  // their ongoing Node 0.10.x compatible rewrite, so rather than trying to
-  // debug and send pull request now, we'll wait for them to finish their
-  // rewrite. In the meantime, ignore two common exceptions that we sometimes
-  // see instead of crashing.
-  //
-  // See https://github.com/meteor/meteor/issues/513
-  //
-  // That bug is about "meteor deploy"s use of http-proxy, but it also affects
-  // our use here; see
-  // https://groups.google.com/d/msg/meteor-core/JgbnfKEa5lA/FJHZtJftfSsJ
-  //
-  // XXX remove this once we've upgraded and fixed http-proxy
-  process.on('uncaughtException', function (e) {
-    if (e && (e.errno === 'EPIPE' || e.message === "This socket is closed."))
-      return;
-    throw e;
-  });
-
   var serverHandle;
   var watcher;
 

From dd7172ab7fc7141b68b766cf5c600efb0dde2739 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Tue, 24 Sep 2013 00:35:15 -0700
Subject: [PATCH 078/335] Use an http agent (this was default in old http-proxy
 but not in caronte).

---
 tools/run.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/run.js b/tools/run.js
index 292007d943..311bcbbb40 100644
--- a/tools/run.js
+++ b/tools/run.js
@@ -115,7 +115,11 @@ var startProxy = function (outerPort, innerPort, callback) {
   // "caronte")
   var caronte = require('caronte');
 
-  var proxy = caronte.createProxyServer({});
+  var proxy = caronte.createProxyServer({
+    // agent is required to handle keep-alive, and caronte is a little buggy
+    // without it: https://github.com/nodejitsu/node-http-proxy/pull/488
+    agent: new http.Agent({maxSockets: 100})
+  });
 
   var server = http.createServer(function (req, res) {
     if (Status.crashing) {

From ca1fb6788abbc03cf5f3f5265c71a716c5a248c0 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Tue, 24 Sep 2013 17:12:39 -0700
Subject: [PATCH 079/335] Track the node version used when installing NPM
 modules.

This way, when the dev bundle version changes the Node version they will get
reinstalled. (You still need to bump BUILT_BY to get the modules into
unipackages too.)
---
 tools/meteor_npm.js | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/tools/meteor_npm.js b/tools/meteor_npm.js
index d89d3e1005..780958fd28 100644
--- a/tools/meteor_npm.js
+++ b/tools/meteor_npm.js
@@ -186,6 +186,26 @@ _.extend(exports, {
       throw new Error(
         "Corrupted .npm directory -- can't find npm-shrinkwrap.json in " + packageNpmDir);
 
+    // We need to rebuild all node modules when the Node version changes, in
+    // case there are some binary ones. Technically this is racey, but it
+    // shouldn't fail very often.
+    if (fs.existsSync(path.join(packageNpmDir, 'node_modules'))) {
+      var oldNodeVersion;
+      try {
+        oldNodeVersion = fs.readFileSync(
+          path.join(packageNpmDir, 'node_modules', '.node_version'));
+      } catch (e) {
+        if (e.code !== 'ENOENT')
+          throw e;
+        // Use the Node version from the last release where we didn't drop this
+        // file.
+        oldNodeVersion = 'v0.8.24';
+      }
+
+      if (oldNodeVersion !== process.version)
+        files.rm_recursive(path.join(packageNpmDir, 'node_modules'));
+    }
+
     var installedDependencies = self._installedDependencies(packageNpmDir);
 
     // If we already have the right things installed, life is good.
@@ -276,6 +296,7 @@ _.extend(exports, {
     fs.unlinkSync(path.join(newPackageNpmDir, 'package.json'));
 
     self._createReadme(newPackageNpmDir);
+    self._createNodeVersion(newPackageNpmDir);
     files.renameDirAlmostAtomically(newPackageNpmDir, packageNpmDir);
   },
 
@@ -292,6 +313,12 @@ _.extend(exports, {
     );
   },
 
+  _createNodeVersion: function(newPackageNpmDir) {
+    fs.writeFileSync(
+      path.join(newPackageNpmDir, 'node_modules', '.node_version'),
+      process.version);
+  },
+
   // Returns object with keys 'stdout', 'stderr', and 'success' (true
   // for clean exit with exit code 0, else false)
   _execFileSync: function(file, args, opts) {

From 41247305db798cab408f85b57e88a1efd254fefa Mon Sep 17 00:00:00 2001
From: David Greenspan <dgreenspan@alum.mit.edu>
Date: Tue, 24 Sep 2013 17:59:59 -0700
Subject: [PATCH 080/335] version 0 of optimistic upsert simulation

---
 packages/mongo-livedata/collection.js         | 14 ++++
 packages/mongo-livedata/mongo_driver.js       | 80 ++++++++++++++++++-
 .../mongo-livedata/mongo_livedata_tests.js    | 36 ++++++++-
 3 files changed, 126 insertions(+), 4 deletions(-)

diff --git a/packages/mongo-livedata/collection.js b/packages/mongo-livedata/collection.js
index 01f7401cfb..ffb33545d3 100644
--- a/packages/mongo-livedata/collection.js
+++ b/packages/mongo-livedata/collection.js
@@ -374,6 +374,20 @@ _.each(["insert", "update", "remove"], function (name) {
       }
     } else {
       args[0] = Meteor.Collection._rewriteSelector(args[0]);
+
+      if (name === "update") {
+        var options = args[2];
+        if (options && options.upsert) {
+          // set `insertedId` if absent.  `insertedId` is a Meteor extension.
+          if (options.insertedId) {
+            if (!(typeof options.insertedId === 'string'
+                  || options.insertedId instanceof Meteor.Collection.ObjectID))
+              throw new Error("insertedId must be string or ObjectID");
+          } else {
+            options.insertedId = self._makeNewID();
+          }
+        }
+      }
     }
 
     var wrappedCallback;
diff --git a/packages/mongo-livedata/mongo_driver.js b/packages/mongo-livedata/mongo_driver.js
index bfaf7e4d2c..0e2a5ce9d6 100644
--- a/packages/mongo-livedata/mongo_driver.js
+++ b/packages/mongo-livedata/mongo_driver.js
@@ -335,15 +335,89 @@ MongoConnection.prototype._update = function (collection_name, selector, mod,
     // explictly enumerate options that minimongo supports
     if (options.upsert) mongoOpts.upsert = true;
     if (options.multi) mongoOpts.multi = true;
-    collection.update(replaceTypes(selector, replaceMeteorAtomWithMongo),
-                      replaceTypes(mod, replaceMeteorAtomWithMongo),
-                      mongoOpts, numberAffectedCallback(callback));
+
+    var mongoSelector = replaceTypes(selector, replaceMeteorAtomWithMongo);
+    var mongoMod = replaceTypes(mod, replaceMeteorAtomWithMongo);
+
+    var isModify = isModificationMod(mongoMod);
+
+    if (options.upsert &&
+        (isModify ? (! mongoSelector._id) : (! mongoMod._id)) &&
+        options.insertedId) {
+      mongoOpts.insertedId = options.insertedId;
+      simulateUpsertWithInsertedId(collection, mongoSelector, mongoMod,
+                                   isModify, mongoOpts, callback);
+    } else {
+      collection.update(mongoSelector, mongoMod, mongoOpts,
+                        numberAffectedCallback(callback));
+    }
   } catch (e) {
     write.committed();
     throw e;
   }
 };
 
+var isModificationMod = function (mod) {
+  for (var k in mod)
+    if (k.substr(0, 1) === '$')
+      return true;
+  return false;
+};
+
+var simulateUpsertWithInsertedId = function (collection, selector, mod,
+                                             isModify, options, callback) {
+  var insertedId = options.insertedId; // must exist
+
+  var mongoOpts = _.extend({}, options);
+  delete mongoOpts.insertedId;
+  delete mongoOpts.upsert;
+
+  var doUpdate = function () {
+    mongoOpts.upsert = false;
+    collection.update(selector, mod, mongoOpts,
+                      numberAffectedCallback(function (err, result) {
+                        if (err) {
+                          callback(err);
+                        } else if (result.numberAffected) {
+                          callback(null, result);
+                        } else {
+                          doConditionalInsert();
+                        }
+                      }));
+  };
+
+  var doConditionalInsert = function () {
+    mongoOpts.upsert = true;
+    var replacementWithId = _.extend(
+      replaceTypes({_id: insertedId}, replaceMeteorAtomWithMongo),
+      mod);
+    collection.update(selector, replacementWithId, mongoOpts,
+                      numberAffectedCallback(function (err, result) {
+                        if (err) {
+                          // XXX figure out if this is a
+                          // "cannot change _id of document" error, and
+                          // if so, try doUpdate() again, up to 3 times.
+                          // Otherwise, pass err to callback.
+                          Meteor._debug(err);
+                        } else {
+                          callback(null, _.extend(result,
+                                                  { insertedId: insertedId }));
+                        }
+                      }));
+  };
+
+  if (isModify) {
+    // XXX TODO
+  } else {
+    doUpdate();
+  }
+};
+
+var modifyDocument = function (doc, mod) {
+  // XXX use LocalCollection._modify
+  return mod;
+};
+
 _.each(["insert", "update", "remove"], function (method) {
   MongoConnection.prototype[method] = function (/* arguments */) {
     var self = this;
diff --git a/packages/mongo-livedata/mongo_livedata_tests.js b/packages/mongo-livedata/mongo_livedata_tests.js
index 9e96ed8f71..06c4a9439e 100644
--- a/packages/mongo-livedata/mongo_livedata_tests.js
+++ b/packages/mongo-livedata/mongo_livedata_tests.js
@@ -901,8 +901,42 @@ if (Meteor.isServer) {
     _.each(handlesToStop, function (h) {h.stop();});
     onComplete();
   });
-}
 
+  Tinytest.addAsync("mongo-livedata - upsert, " + idGeneration, function (test, onComplete) {
+    var run = test.runId();
+    var coll = new Meteor.Collection("livedata_upsert_collection_"+run, collectionOptions);
+
+    var result1 = coll.update({foo: 'bar'}, {foo: 'bar'}, {upsert: true});
+    test.equal(result1.numberAffected, 1);
+    test.isTrue(result1.insertedId);
+    test.equal(coll.find().fetch(), [{foo: 'bar', _id: result1.insertedId}]);
+
+    var result2 = coll.update({foo: 'bar'}, {foo: 'baz'}, {upsert: true});
+    test.equal(result2.numberAffected, 1);
+    test.isFalse(result2.insertedId);
+    test.equal(coll.find().fetch(), [{foo: 'baz', _id: result1.insertedId}]);
+
+    coll.remove({});
+
+    // Test values that require transformation to go into Mongo:
+
+    var t1 = new Meteor.Collection.ObjectID();
+    var t2 = new Meteor.Collection.ObjectID();
+    var result3 = coll.update({foo: t1}, {foo: t1}, {upsert: true});
+    test.equal(result3.numberAffected, 1);
+    test.isTrue(result3.insertedId);
+    test.equal(coll.find().fetch(), [{foo: t1, _id: result3.insertedId}]);
+
+    var result4 = coll.update({foo: t1}, {foo: t2}, {upsert: true});
+    test.equal(result2.numberAffected, 1);
+    test.isFalse(result2.insertedId);
+    test.equal(coll.find().fetch(), [{foo: t2, _id: result3.insertedId}]);
+
+
+    onComplete();
+  });
+
+} // end Meteor.isServer
 
 });  // end idGeneration parametrization
 

From 220676600e904507910bde0c2cd9ddc286b74450 Mon Sep 17 00:00:00 2001
From: David Greenspan <dgreenspan@alum.mit.edu>
Date: Tue, 24 Sep 2013 19:05:32 -0700
Subject: [PATCH 081/335] upsert supports modify and multi

doesn't actually retry 3 times yet (needs to determine when to)
---
 packages/minimongo/modify.js                  |  4 +-
 packages/mongo-livedata/mongo_driver.js       | 77 ++++++++++++-------
 .../mongo-livedata/mongo_livedata_tests.js    | 45 +++++++++++
 3 files changed, 97 insertions(+), 29 deletions(-)

diff --git a/packages/minimongo/modify.js b/packages/minimongo/modify.js
index e699a262ff..8413899eb1 100644
--- a/packages/minimongo/modify.js
+++ b/packages/minimongo/modify.js
@@ -5,7 +5,7 @@
 //
 // XXX atomicity: if one modification fails, do we roll back the whole
 // change?
-LocalCollection._modify = function (doc, mod) {
+LocalCollection._modify = function (doc, mod, onInsert) {
   var is_modifier = false;
   for (var k in mod) {
     // IE7 doesn't support indexing into strings (eg, k[0]), so use substr.
@@ -35,6 +35,8 @@ LocalCollection._modify = function (doc, mod) {
 
     for (var op in mod) {
       var mod_func = LocalCollection._modifiers[op];
+      if (onInsert && op === '$setOnInsert')
+        mod_func = LocalCollection._modifiers['$set'];
       if (!mod_func)
         throw Error("Invalid modifier specified " + op);
       for (var keypath in mod[op]) {
diff --git a/packages/mongo-livedata/mongo_driver.js b/packages/mongo-livedata/mongo_driver.js
index 0e2a5ce9d6..3b91586d15 100644
--- a/packages/mongo-livedata/mongo_driver.js
+++ b/packages/mongo-livedata/mongo_driver.js
@@ -364,41 +364,71 @@ var isModificationMod = function (mod) {
   return false;
 };
 
+var NUM_OPTIMISTIC_TRIES = 3;
+
 var simulateUpsertWithInsertedId = function (collection, selector, mod,
                                              isModify, options, callback) {
   var insertedId = options.insertedId; // must exist
 
-  var mongoOpts = _.extend({}, options);
-  delete mongoOpts.insertedId;
-  delete mongoOpts.upsert;
+  var mongoOptsForUpdate = _.extend({}, options);
+  delete mongoOptsForUpdate.insertedId;
+  delete mongoOptsForUpdate.upsert;
+
+  var tries = NUM_OPTIMISTIC_TRIES;
 
   var doUpdate = function () {
-    mongoOpts.upsert = false;
-    collection.update(selector, mod, mongoOpts,
-                      numberAffectedCallback(function (err, result) {
-                        if (err) {
-                          callback(err);
-                        } else if (result.numberAffected) {
-                          callback(null, result);
-                        } else {
-                          doConditionalInsert();
-                        }
-                      }));
+    tries--;
+    if (! tries) {
+      callback(new Error("Upsert failed after " + NUM_OPTIMISTIC_TRIES + " tries."));
+    } else {
+      collection.update(selector, mod, mongoOptsForUpdate,
+                        numberAffectedCallback(function (err, result) {
+                          if (err) {
+                            callback(err);
+                          } else if (result.numberAffected) {
+                            callback(null, result);
+                          } else {
+                            doConditionalInsert();
+                          }
+                        }));
+    }
   };
 
+  var newDoc;
+  // Run this code up front so that it fails fast if someone uses
+  // a Mongo update operator we don't support.
+  if (isModify) {
+    var selectorDoc = {};
+    for (var k in selector)
+      if (k.substr(0, 1) !== '$')
+        selectorDoc[k] = selector[k];
+    // We've already run replaceTypes/replaceMeteorAtomWithMongo on
+    // selector and mod.  We assume it doesn't matter, as far as
+    // the behavior of modifiers is concerned, whether `_modify`
+    // is run on EJSON or on mongo-converted EJSON.
+    LocalCollection._modify(selectorDoc, mod, true);
+    newDoc = selectorDoc;
+  } else {
+    newDoc = mod;
+  }
+
+  var mongoOptsForInsert = _.extend({}, options);
+  delete mongoOptsForUpdate.insertedId;
+  mongoOptsForInsert.upsert = true;
+  delete mongoOptsForInsert.multi;
+
   var doConditionalInsert = function () {
-    mongoOpts.upsert = true;
     var replacementWithId = _.extend(
       replaceTypes({_id: insertedId}, replaceMeteorAtomWithMongo),
-      mod);
-    collection.update(selector, replacementWithId, mongoOpts,
+      newDoc);
+    collection.update(selector, replacementWithId, mongoOptsForInsert,
                       numberAffectedCallback(function (err, result) {
                         if (err) {
                           // XXX figure out if this is a
                           // "cannot change _id of document" error, and
                           // if so, try doUpdate() again, up to 3 times.
-                          // Otherwise, pass err to callback.
                           Meteor._debug(err);
+                          callback(err);
                         } else {
                           callback(null, _.extend(result,
                                                   { insertedId: insertedId }));
@@ -406,16 +436,7 @@ var simulateUpsertWithInsertedId = function (collection, selector, mod,
                       }));
   };
 
-  if (isModify) {
-    // XXX TODO
-  } else {
-    doUpdate();
-  }
-};
-
-var modifyDocument = function (doc, mod) {
-  // XXX use LocalCollection._modify
-  return mod;
+  doUpdate();
 };
 
 _.each(["insert", "update", "remove"], function (method) {
diff --git a/packages/mongo-livedata/mongo_livedata_tests.js b/packages/mongo-livedata/mongo_livedata_tests.js
index 06c4a9439e..61c4d2516c 100644
--- a/packages/mongo-livedata/mongo_livedata_tests.js
+++ b/packages/mongo-livedata/mongo_livedata_tests.js
@@ -932,6 +932,51 @@ if (Meteor.isServer) {
     test.isFalse(result2.insertedId);
     test.equal(coll.find().fetch(), [{foo: t2, _id: result3.insertedId}]);
 
+    coll.remove({});
+
+    // Test modification
+
+    var result5 = coll.update({name: 'David'}, {$set: {foo: 1}}, {upsert: true});
+    test.equal(result5.numberAffected, 1);
+    test.isTrue(result5.insertedId);
+    var davidId = result5.insertedId;
+    test.equal(coll.find().fetch(), [{name: 'David', foo: 1, _id: davidId}]);
+
+    test.throws(function () {
+      // test that bad modifier fails fast
+      coll.update({name: 'David'}, {$blah: {foo: 2}}, {upsert: true});
+    });
+
+
+    var result6 = coll.update({name: 'David'}, {$set: {foo: 2}}, {upsert: true});
+    test.equal(result6.numberAffected, 1);
+    test.isFalse(result6.insertedId);
+    test.equal(coll.find().fetch(), [{name: 'David', foo: 2,
+                                      _id: result5.insertedId}]);
+
+    var emilyId = coll.insert({name: 'Emily', foo: 2});
+    test.equal(coll.find().fetch(), [{name: 'David', foo: 2, _id: davidId},
+                                     {name: 'Emily', foo: 2, _id: emilyId}]);
+
+    // multi update by upsert
+    var result7 = coll.update({foo: 2},
+                              {$set: {bar: 7}, $setOnInsert: {name: 'Fred', foo: 2}},
+                              {upsert: true, multi: true});
+    test.equal(result7.numberAffected, 2);
+    test.isFalse(result7.insertedId);
+    test.equal(coll.find().fetch(), [{name: 'David', foo: 2, bar: 7, _id: davidId},
+                                     {name: 'Emily', foo: 2, bar: 7, _id: emilyId}]);
+
+    // insert by multi upsert
+    var result8 = coll.update({foo: 3},
+                              {$set: {bar: 7}, $setOnInsert: {name: 'Fred', foo: 2}},
+                              {upsert: true, multi: true});
+    test.equal(result8.numberAffected, 1);
+    test.isTrue(result8.insertedId);
+    var fredId = result8.insertedId;
+    test.equal(coll.find().fetch(), [{name: 'David', foo: 2, bar: 7, _id: davidId},
+                                     {name: 'Emily', foo: 2, bar: 7, _id: emilyId},
+                                     {name: 'Fred', foo: 2, bar: 7, _id: fredId}]);
 
     onComplete();
   });

From 0e988fcf5a1acebcdbdca347cd721e5a4a542743 Mon Sep 17 00:00:00 2001
From: David Greenspan <dgreenspan@alum.mit.edu>
Date: Tue, 24 Sep 2013 19:13:01 -0700
Subject: [PATCH 082/335] strategy comment

---
 packages/mongo-livedata/mongo_driver.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/mongo-livedata/mongo_driver.js b/packages/mongo-livedata/mongo_driver.js
index 3b91586d15..8171ae0d17 100644
--- a/packages/mongo-livedata/mongo_driver.js
+++ b/packages/mongo-livedata/mongo_driver.js
@@ -376,6 +376,20 @@ var simulateUpsertWithInsertedId = function (collection, selector, mod,
 
   var tries = NUM_OPTIMISTIC_TRIES;
 
+  // STRATEGY:  First try doing a plain update.  If it affected 0 documents,
+  // then without affecting the database, we know we should probably do an
+  // insert.  We then do a *conditional* insert that will fail in the case
+  // of a race condition.  This conditional insert is actually an
+  // upsert-replace with an _id, which will never successfully update an
+  // existing document.  If this upsert fails with an error saying it
+  // couldn't change an existing _id, then we know an intervening write has
+  // caused the query to match something.  We go back to step one and repeat.
+  // Like all "optimistic write" schemes, we rely on the fact that it's
+  // unlikely our writes will continue to be interfered with under normal
+  // circumstances (though sufficiently heavy contention with writers
+  // disagreeing on the existence of an object will cause writes to fail
+  // in theory).
+
   var doUpdate = function () {
     tries--;
     if (! tries) {

From 6c1f92e89156e529b2da3555d65eb9094ff4e9d9 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Tue, 24 Sep 2013 23:31:47 -0700
Subject: [PATCH 083/335] Might as well use the version that just got released
 (0.10.19).

---
 docs/client/concepts.html      | 2 +-
 scripts/generate-dev-bundle.sh | 4 ++--
 tools/bundler.js               | 2 +-
 tools/meteor.js                | 2 +-
 tools/server/boot.js           | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/client/concepts.html b/docs/client/concepts.html
index f0fc8f13e5..67e13a9852 100644
--- a/docs/client/concepts.html
+++ b/docs/client/concepts.html
@@ -826,7 +826,7 @@ To get started, run
 This command will generate a fully-contained Node.js application in the form of
 a tarball.  To run this application, you need to provide Node.js 0.10 and a
 MongoDB server.  (The current release of Meteor has been tested with Node
-0.10.18.) You can then run the application by invoking node, specifying the HTTP
+0.10.19.) You can then run the application by invoking node, specifying the HTTP
 port for the application to listen on, and the MongoDB endpoint.  If you don't
 already have a MongoDB server, we can recommend our friends at
 [MongoHQ](http://mongohq.com).
diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh
index ee29664782..86bea06977 100755
--- a/scripts/generate-dev-bundle.sh
+++ b/scripts/generate-dev-bundle.sh
@@ -74,9 +74,9 @@ cd build
 git clone git://github.com/joyent/node.git
 cd node
 # When upgrading node versions, also update the values of MIN_NODE_VERSION at
-# the top of tools/meteor.js and tools/server/server.js, and the text in
+# the top of tools/meteor.js and tools/server/boot.js, and the text in
 # docs/client/concepts.html and the README in tools/bundler.js.
-git checkout v0.10.18
+git checkout v0.10.19
 
 ./configure --prefix="$DIR"
 make -j4
diff --git a/tools/bundler.js b/tools/bundler.js
index e64be55208..22527a7cca 100644
--- a/tools/bundler.js
+++ b/tools/bundler.js
@@ -1443,7 +1443,7 @@ var writeSiteArchive = function (targets, outputPath, options) {
       builder.write('README', { data: new Buffer(
 "This is a Meteor application bundle. It has only one dependency:\n" +
 "Node.js 0.10 (with the 'fibers' package). The current release of Meteor\n" +
-"has been tested with Node 0.10.18. To run the application:\n" +
+"has been tested with Node 0.10.19. To run the application:\n" +
 "\n" +
 "  $ npm install fibers@1.0.1\n" +
 "  $ export MONGO_URL='mongodb://user:password@host:port/databasename'\n" +
diff --git a/tools/meteor.js b/tools/meteor.js
index f5b1ad2e68..db2d770aa7 100644
--- a/tools/meteor.js
+++ b/tools/meteor.js
@@ -24,7 +24,7 @@ Fiber(function () {
 
   var Future = require('fibers/future');
   // This code is duplicated in app/server/server.js.
-  var MIN_NODE_VERSION = 'v0.10.18';
+  var MIN_NODE_VERSION = 'v0.10.19';
   if (require('semver').lt(process.version, MIN_NODE_VERSION)) {
     process.stderr.write(
       'Meteor requires Node ' + MIN_NODE_VERSION + ' or later.\n');
diff --git a/tools/server/boot.js b/tools/server/boot.js
index c8931b0730..091aee0ff1 100644
--- a/tools/server/boot.js
+++ b/tools/server/boot.js
@@ -6,7 +6,7 @@ var _ = require('underscore');
 var sourcemap_support = require('source-map-support');
 
 // This code is duplicated in tools/server/server.js.
-var MIN_NODE_VERSION = 'v0.10.18';
+var MIN_NODE_VERSION = 'v0.10.19';
 if (require('semver').lt(process.version, MIN_NODE_VERSION)) {
   process.stderr.write(
     'Meteor requires Node ' + MIN_NODE_VERSION + ' or later.\n');

From 25aae35422c668e14bb02faf069cf52f3b0f500e Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Wed, 25 Sep 2013 01:57:50 -0700
Subject: [PATCH 084/335] Fix .node_version check.  run-tools-tests passes.

---
 tools/meteor_npm.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/meteor_npm.js b/tools/meteor_npm.js
index 780958fd28..67fb840d33 100644
--- a/tools/meteor_npm.js
+++ b/tools/meteor_npm.js
@@ -193,7 +193,7 @@ _.extend(exports, {
       var oldNodeVersion;
       try {
         oldNodeVersion = fs.readFileSync(
-          path.join(packageNpmDir, 'node_modules', '.node_version'));
+          path.join(packageNpmDir, 'node_modules', '.node_version'), 'utf8');
       } catch (e) {
         if (e.code !== 'ENOENT')
           throw e;

From ad705d5ee08c1a72f4b23b90b1dcf638504a0229 Mon Sep 17 00:00:00 2001
From: Andrew Mao <mizzao@gmail.com>
Date: Tue, 24 Sep 2013 22:15:25 -0400
Subject: [PATCH 085/335] Update dependencies for madewith package; fixes #1448

---
 packages/madewith/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/madewith/package.js b/packages/madewith/package.js
index b67b92bf80..79cb20411a 100644
--- a/packages/madewith/package.js
+++ b/packages/madewith/package.js
@@ -3,7 +3,7 @@ Package.describe({
 });
 
 Package.on_use(function (api) {
-  api.use(['livedata', 'underscore', 'spark', 'templating'], 'client');
+  api.use(['livedata', 'mongo-livedata', 'underscore', 'spark', 'templating'], 'client');
 
   api.add_files([
     'madewith.css',

From a3d539ed0bab7b8fa0f72cb7daf6467ba0aec17c Mon Sep 17 00:00:00 2001
From: Matt DeBergalis <matt@meteor.com>
Date: Wed, 25 Sep 2013 11:39:24 -0700
Subject: [PATCH 086/335] Disallow words added after game clock expires.

Fixes #541.
---
 examples/wordplay/model.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/examples/wordplay/model.js b/examples/wordplay/model.js
index 3851c2639f..5c609e4376 100644
--- a/examples/wordplay/model.js
+++ b/examples/wordplay/model.js
@@ -102,9 +102,11 @@ Meteor.methods({
     var word = Words.findOne(word_id);
     var game = Games.findOne(word.game_id);
 
-    // client and server can both check: must be at least three chars
-    // long, not already used, and possible to make on the board.
-    if (word.length < 3
+    // client and server can both check that the game has time remaining, and
+    // that the word is at least three chars, isn't already used, and is
+    // possible to make on the board.
+    if (game.clock === 0
+        || word.length < 3
         || Words.find({game_id: word.game_id, word: word.word}).count() > 1
         || paths_for_word(game.board, word.word).length === 0) {
       Words.update(word._id, {$set: {score: 0, state: 'bad'}});

From 569e92201a939ff838255a7fb09c16d0dabae861 Mon Sep 17 00:00:00 2001
From: Avital Oliver <avital@thewe.net>
Date: Wed, 25 Sep 2013 11:57:49 -0700
Subject: [PATCH 087/335] Add XXX to reload package informed by #657

---
 packages/reload/reload.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/reload/reload.js b/packages/reload/reload.js
index 2c2f412e7e..6aae7f191b 100644
--- a/packages/reload/reload.js
+++ b/packages/reload/reload.js
@@ -26,6 +26,11 @@
  * the client's session to render properly.
  */
 
+// XXX when making this API public, also expose a flag for the app
+// developer to know whether a hot code push is happening. This is
+// useful for apps using `window.onbeforeunload`. See
+// https://github.com/meteor/meteor/pull/657
+
 var KEY_NAME = 'Meteor_Reload';
 // after how long should we consider this no longer an automatic
 // reload, but a fresh restart. This only happens if a reload is

From 5889adea901ab017748ea6a0bfdb7437e0db0a7a Mon Sep 17 00:00:00 2001
From: Matt DeBergalis <matt@meteor.com>
Date: Wed, 25 Sep 2013 12:13:03 -0700
Subject: [PATCH 088/335] Various wordplay fixes:

 * Don't add blank lines to the dictionary.
 * Fix broken word length check in `score_word`.
 * Prevent event handler from submitting blank words.
---
 examples/wordplay/client/wordplay.js | 5 ++---
 examples/wordplay/model.js           | 7 ++++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/wordplay/client/wordplay.js b/examples/wordplay/client/wordplay.js
index f49212923b..acff55aaeb 100644
--- a/examples/wordplay/client/wordplay.js
+++ b/examples/wordplay/client/wordplay.js
@@ -132,9 +132,8 @@ Template.scratchpad.events({
   'click button, keyup input': function (evt) {
     var textbox = $('#scratchpad input');
     // if we clicked the button or hit enter
-    if (evt.type === "click" ||
-        (evt.type === "keyup" && evt.which === 13)) {
-
+    if ((evt.type === "click" || (evt.type === "keyup" && evt.which === 13))
+        && textbox.val()) {
       var word_id = Words.insert({player_id: Session.get('player_id'),
                                   game_id: game() && game()._id,
                                   word: textbox.val().toUpperCase(),
diff --git a/examples/wordplay/model.js b/examples/wordplay/model.js
index 5c609e4376..416c4db122 100644
--- a/examples/wordplay/model.js
+++ b/examples/wordplay/model.js
@@ -106,7 +106,8 @@ Meteor.methods({
     // that the word is at least three chars, isn't already used, and is
     // possible to make on the board.
     if (game.clock === 0
-        || word.length < 3
+        || !word.word
+        || word.word.length < 3
         || Words.find({game_id: word.game_id, word: word.word}).count() > 1
         || paths_for_word(game.board, word.word).length === 0) {
       Words.update(word._id, {$set: {score: 0, state: 'bad'}});
@@ -129,8 +130,8 @@ Meteor.methods({
 if (Meteor.isServer) {
   DICTIONARY = {};
   _.each(Assets.getText("enable2k.txt").split("\n"), function (line) {
-    // Skip comment lines
-    if (line.indexOf("//") !== 0) {
+    // Skip blanks and comment lines
+    if (line && line.indexOf("//") !== 0) {
       DICTIONARY[line] = true;
     }
   });

From 18050d9471236d10d48e60c767297c55fa6aeb84 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Wed, 25 Sep 2013 15:44:12 -0700
Subject: [PATCH 089/335] Return { numberAffected: x } from updates and
 removes.

---
 packages/minimongo/minimongo.js                 | 10 ++++++----
 packages/minimongo/minimongo_tests.js           |  8 ++++----
 packages/mongo-livedata/mongo_livedata_tests.js |  8 ++++----
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index 1ec5ed6789..1735dd646c 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -536,11 +536,12 @@ LocalCollection.prototype.remove = function (selector, callback) {
       LocalCollection._recomputeResults(query);
   });
   self._observeQueue.drain();
+  var result = { numberAffected: remove.length };
   if (callback)
     Meteor.defer(function () {
-      callback(null, remove.length);
+      callback(null, result);
     });
-  return remove.length;
+  return result;
 };
 
 // XXX atomicity: if multi is true, and one modification fails, do
@@ -591,11 +592,12 @@ LocalCollection.prototype.update = function (selector, mod, options, callback) {
                                         qidToOriginalResults[qid]);
   });
   self._observeQueue.drain();
+  var result = { numberAffected: updateCount };
   if (callback)
     Meteor.defer(function () {
-      callback(null, updateCount);
+      callback(null, result);
     });
-  return updateCount;
+  return result;
 };
 
 LocalCollection.prototype._modifyAndNotify = function (
diff --git a/packages/minimongo/minimongo_tests.js b/packages/minimongo/minimongo_tests.js
index 343e7f198c..a996207b0c 100644
--- a/packages/minimongo/minimongo_tests.js
+++ b/packages/minimongo/minimongo_tests.js
@@ -89,7 +89,7 @@ Tinytest.add("minimongo - basics", function (test) {
   test.length(c.find({type: "cryptographer"}).fetch(), 2);
 
   count = c.update({name: "snookums"}, {$set: {type: "cryptographer"}});
-  test.equal(count, 1);
+  test.equal(count, { numberAffected: 1 });
   test.equal(c.find().count(), 4);
   test.equal(c.find({type: "kitten"}).count(), 1);
   test.equal(c.find({type: "cryptographer"}).count(), 3);
@@ -105,11 +105,11 @@ Tinytest.add("minimongo - basics", function (test) {
   c.remove({_id: false});
   c.remove({_id: undefined});
   count = c.remove();
-  test.equal(count, 0);
+  test.equal(count, { numberAffected: 0 });
   test.equal(c.find().count(), 4);
 
   count = c.remove({});
-  test.equal(count, 4);
+  test.equal(count, { numberAffected: 4 });
   test.equal(c.find().count(), 0);
 
   c.insert({_id: 1, name: "strawberry", tags: ["fruit", "red", "squishy"]});
@@ -2016,7 +2016,7 @@ Tinytest.add("minimongo - saveOriginals", function (test) {
   c.update('bar', {$set: {k: 7}});  // update same doc twice
 
   // Verify returned count is correct
-  test.equal(count, 2);
+  test.equal(count, { numberAffected: 2 });
 
   // Verify the originals.
   var originals = c.retrieveOriginals();
diff --git a/packages/mongo-livedata/mongo_livedata_tests.js b/packages/mongo-livedata/mongo_livedata_tests.js
index fe80f98e99..8f529066cb 100644
--- a/packages/mongo-livedata/mongo_livedata_tests.js
+++ b/packages/mongo-livedata/mongo_livedata_tests.js
@@ -203,12 +203,12 @@ Tinytest.addAsync("mongo-livedata - basics, " + idGeneration, function (test, on
 
   expectObserve('', function () {
     var count = coll.update({run: run, x: -1}, {$inc: {x: 2}}, {multi: true});
-    test.equal(count, 0);
+    test.equal(count, { numberAffected: 0 });
   });
 
   expectObserve('c(3,0,1)c(6,1,4)', function () {
     var count = coll.update({run: run}, {$inc: {x: 2}}, {multi: true});
-    test.equal(count, 2);
+    test.equal(count, { numberAffected: 2 });
     test.equal(_.pluck(coll.find({run: run}, {sort: {x: -1}}).fetch(), "x"),
                [6, 3]);
   });
@@ -222,7 +222,7 @@ Tinytest.addAsync("mongo-livedata - basics, " + idGeneration, function (test, on
 
   expectObserve('r(13,1)', function () {
     var count = coll.remove({run: run, x: {$gt: 10}});
-    test.equal(count, 1);
+    test.equal(count, { numberAffected: 1 });
     test.equal(coll.find({run: run}).count(), 1);
   });
 
@@ -233,7 +233,7 @@ Tinytest.addAsync("mongo-livedata - basics, " + idGeneration, function (test, on
 
   expectObserve('', function () {
     var count = coll.remove({run: run});
-    test.equal(count, 0);
+    test.equal(count, { numberAffected: 0 });
     test.equal(coll.find({run: run}).count(), 0);
   });
 

From 2413a8d3ed5ffb10e7deb20c3e6292b96e4a2a0e Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Tue, 24 Sep 2013 11:35:12 -0700
Subject: [PATCH 090/335] Use cryptographic PRNGs when available.

This means node's crypto.randomBytes on the server, and
window.crypto.getRandomValues on the client. If node's crypto.randomBytes throws
an exception, we fall back to crypto.pseudoRandomBytes. If
window.crypto.getRandomValues isn't supported by the browser, we fall back to
the alea generator that we had been using previously.
---
 docs/client/packages/random.html       |  12 +--
 packages/random/random.js              | 144 ++++++++++++++++---------
 packages/random/random_tests.js        |  14 +++
 packages/spark/spark_tests.js          |   2 +-
 packages/test-helpers/seeded_random.js |   2 +-
 5 files changed, 113 insertions(+), 61 deletions(-)

diff --git a/docs/client/packages/random.html b/docs/client/packages/random.html
index 8f0490613d..72c7ce9f51 100644
--- a/docs/client/packages/random.html
+++ b/docs/client/packages/random.html
@@ -3,8 +3,11 @@
 ## `random`
 
 The `random` package provides several functions for generating random
-numbers. It uses a Meteor-provided random number generator that does not depend
-on the browser's facilities.
+numbers. It uses a cryptographically strong pseudorandom number generator when
+possible, but falls back to a weaker random number generator when
+cryptographically strong randomness is not available (on older browsers or on
+servers that don't have enough entropy to seed the cryptographically strong
+generator).
 
 <dl class="callbacks">
 {{#dtdd "Random.id()"}}
@@ -25,10 +28,5 @@ Returns a random string of `n` hexadecimal digits.
 {{/dtdd}}
 </dl>
 
-{{#note}}
-In the current implementation, random values do not come from a
-cryptographically strong pseudorandom number generator. Future releases will
-improve this, particularly on the server.
-{{/note}}
 {{/better_markdown}}
 </template>
diff --git a/packages/random/random.js b/packages/random/random.js
index 5faddb9d4c..59e94683e8 100644
--- a/packages/random/random.js
+++ b/packages/random/random.js
@@ -1,3 +1,15 @@
+// We use cryptographically strong PRNGs (crypto.getRandomBytes() on the server,
+// window.crypto.getRandomValues() in the browser) when available. If these
+// PRNGs fail, we fall back to the Alea PRNG, which is not cryptographically
+// strong, and we seed it with various sources such as the date, Math.random,
+// and window size on the client.  When using crypto.getRandomValues(), our
+// primitive is hexString(), from which we construct fraction(). When using
+// window.crypto.getRandomValues() or alea, the primitive is fraction and we use
+// that to construct hex string.
+
+if (Meteor.isServer)
+  var nodeCrypto = Npm.require('crypto');
+
 // see http://baagoe.org/en/wiki/Better_random_numbers_for_javascript
 // for a full discussion and Alea implementation.
 var Alea = function () {
@@ -75,52 +87,79 @@ var Alea = function () {
 
 var UNMISTAKABLE_CHARS = "23456789ABCDEFGHJKLMNPQRSTWXYZabcdefghijkmnopqrstuvwxyz";
 
-var create = function (/* arguments */) {
-
-  var random = Alea.apply(null, arguments);
-
-  var self = {};
-
-  var bind = function (fn) {
-    return _.bind(fn, self);
-  };
-
-  return _.extend(self, {
-    _Alea: Alea,
-
-    create: create,
-
-    fraction: random,
-
-    choice: bind(function (arrayOrString) {
-      var index = Math.floor(this.fraction() * arrayOrString.length);
-      if (typeof arrayOrString === "string")
-        return arrayOrString.substr(index, 1);
-      else
-        return arrayOrString[index];
-    }),
-
-    id: bind(function() {
-      var digits = [];
-      // Length of 17 preserves around 96 bits of entropy, which is the
-      // amount of state in our PRNG
-      for (var i = 0; i < 17; i++) {
-        digits[i] = this.choice(UNMISTAKABLE_CHARS);
-      }
-      return digits.join("");
-    }),
-
-    hexString: bind(function (digits) {
-      var hexDigits = [];
-      for (var i = 0; i < digits; ++i) {
-        hexDigits.push(this.choice("0123456789abcdef"));
-      }
-      return hexDigits.join('');
-    })
-  });
+// If seeds are provided, then the alea PRNG will be used, since cryptographic
+// PRNGs (Node crypto and window.crypto.getRandomValues) don't allow us to
+// specify seeds. The caller is responsible for making sure to provide a seed
+// for alea if a csprng is not available.
+var RandomGenerator = function (seedArray) {
+  var self = this;
+  if (seedArray !== undefined)
+    self.alea = Alea.apply(null, seedArray);
+  self._Alea = Alea;
 };
 
-// instantiate RNG.  Heuristically collect entropy from various sources
+RandomGenerator.prototype.fraction = function () {
+  var self = this;
+  if (self.alea) {
+    return self.alea();
+  } else if (nodeCrypto) {
+    var numerator = parseInt(self.hexString(8), 16);
+    return numerator * 2.3283064365386963e-10; // 2^-32
+  } else if (typeof window !== "undefined" && window.crypto &&
+             window.crypto.getRandomValues) {
+    var array = new Uint32Array(1);
+    window.crypto.getRandomValues(array);
+    return array[0] * 2.3283064365386963e-10; // 2^-32
+  }
+};
+
+RandomGenerator.prototype.hexString = function (digits) {
+  var self = this;
+  if (nodeCrypto && ! self.alea) {
+    var numBytes = Math.ceil(digits / 2);
+    var bytes;
+    // Try to get cryptographically strong randomness. Fall back to
+    // non-cryptographically strong if not available.
+    try {
+      bytes = nodeCrypto.randomBytes(numBytes);
+    } catch (e) {
+      // XXX should re-throw any error except insufficient entropy
+      bytes = nodeCrypto.pseudoRandomBytes(numBytes);
+    }
+    var result = bytes.toString("hex");
+    // If the number of digits is odd, we'll have generated an extra 4 bits
+    // of randomness, so we need to trim the last digit.
+    return result.substring(0, digits);
+  } else {
+    var hexDigits = [];
+    for (var i = 0; i < digits; ++i) {
+      hexDigits.push(self.choice("0123456789abcdef"));
+    }
+    return hexDigits.join('');
+  }
+};
+
+RandomGenerator.prototype.id = function () {
+  var digits = [];
+  var self = this;
+  // Length of 17 preserves around 96 bits of entropy, which is the
+  // amount of state in the Alea PRNG.
+  for (var i = 0; i < 17; i++) {
+    digits[i] = self.choice(UNMISTAKABLE_CHARS);
+  }
+  return digits.join("");
+};
+
+RandomGenerator.prototype.choice = function (arrayOrString) {
+  var index = Math.floor(this.fraction() * arrayOrString.length);
+  if (typeof arrayOrString === "string")
+    return arrayOrString.substr(index, 1);
+  else
+    return arrayOrString[index];
+};
+
+// instantiate RNG.  Heuristically collect entropy from various sources when a
+// cryptographic PRNG isn't available.
 
 // client sources
 var height = (typeof window !== 'undefined' && window.innerHeight) ||
@@ -143,12 +182,13 @@ var width = (typeof window !== 'undefined' && window.innerWidth) ||
 
 var agent = (typeof navigator !== 'undefined' && navigator.userAgent) || "";
 
-// server sources
-var pid = (typeof process !== 'undefined' && process.pid) || 1;
+if (nodeCrypto ||
+    (typeof window !== "undefined" &&
+     window.crypto && window.crypto.getRandomValues))
+  Random = new RandomGenerator();
+else
+  Random = new RandomGenerator([new Date(), height, width, agent, Math.random()]);
 
-// XXX On the server, use the crypto module (OpenSSL) instead of this PRNG.
-//     (Make Random.fraction be generated from Random.hexString instead of the
-//     other way around, and generate Random.hexString from crypto.randomBytes.)
-Random = create([
-  new Date(), height, width, agent, pid, Math.random()
-]);
+Random.create = function () {
+  return new RandomGenerator(arguments);
+};
diff --git a/packages/random/random_tests.js b/packages/random/random_tests.js
index 52e5b852e5..940afbb640 100644
--- a/packages/random/random_tests.js
+++ b/packages/random/random_tests.js
@@ -13,3 +13,17 @@ Tinytest.add('random', function (test) {
   test.equal(random.id(), "shxDnjWWmnKPEoLhM");
   test.equal(random.id(), "6QTjB8C5SEqhmz4ni");
 });
+
+// node crypto and window.crypto.getRandomValues() don't let us specify a seed,
+// but at least test that the output is in the right format.
+Tinytest.add('random - format', function (test) {
+  var idLen = 17;
+  test.equal(Random.id().length, idLen);
+  var numDigits = 9;
+  var hexStr = Random.hexString(numDigits);
+  test.equal(hexStr.length, numDigits);
+  parseInt(hexStr, 16); // should not throw
+  var frac = Random.fraction();
+  test.isTrue(frac < 1.0);
+  test.isTrue(frac >= 0.0);
+});
diff --git a/packages/spark/spark_tests.js b/packages/spark/spark_tests.js
index cab0f7ea94..e543ade932 100644
--- a/packages/spark/spark_tests.js
+++ b/packages/spark/spark_tests.js
@@ -1876,7 +1876,7 @@ Tinytest.add("spark - leaderboard, " + idGeneration, function(test) {
   }));
   var idGen;
   if (idGeneration === 'STRING')
-    idGen = Random.id;
+    idGen = _.bind(Random.id, Random);
   else
     idGen = function () { return new LocalCollection._ObjectID(); };
 
diff --git a/packages/test-helpers/seeded_random.js b/packages/test-helpers/seeded_random.js
index 0094a20258..171a970486 100644
--- a/packages/test-helpers/seeded_random.js
+++ b/packages/test-helpers/seeded_random.js
@@ -3,7 +3,7 @@ SeededRandom = function(seed) { // seed may be a string or any type
     return new SeededRandom(seed);
 
   seed = seed || "seed";
-  this.gen = new Random._Alea(seed); // from random.js
+  this.gen = Random.create(seed)._Alea; // from random.js
 };
 SeededRandom.prototype.next = function() {
   return this.gen();

From 399028eb53b41b5d1bb3cd645bc6f292a35a729d Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Wed, 25 Sep 2013 18:13:46 -0700
Subject: [PATCH 091/335] Don't allow clients to call update methods as
 upserts.

Add test for it. This is a way to avoid the complexity of allow/deny rules for
upserts; for now, if you want to do an upsert, do it in a method.
---
 packages/mongo-livedata/allow_tests.js | 13 ++++++++++++-
 packages/mongo-livedata/collection.js  |  6 ++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/packages/mongo-livedata/allow_tests.js b/packages/mongo-livedata/allow_tests.js
index b9c50f97b1..3a085c2ece 100644
--- a/packages/mongo-livedata/allow_tests.js
+++ b/packages/mongo-livedata/allow_tests.js
@@ -431,6 +431,18 @@ if (Meteor.isClient) {
               test.equal(collection.find({updated: true}).count(), 2);
             }));
         },
+        // upsert not allowed, and has nice error.
+        function (test, expect) {
+          collection.update(
+            {_id: id2},
+            {$set: { upserted: true }},
+            { upsert: true },
+            expect(function (err, res) {
+              test.equal(err.error, 403);
+              test.matches(err.reason, /In a restricted/);
+              test.equal(collection.find({ upserted: true }).count(), 0);
+            }));
+        },
         // update with rename operator not allowed, and has nice error.
         function (test, expect) {
           collection.update(
@@ -778,4 +790,3 @@ if (Meteor.isServer) {
       delete Package.insecure;
   });
 }
-
diff --git a/packages/mongo-livedata/collection.js b/packages/mongo-livedata/collection.js
index ffb33545d3..23479ce7bd 100644
--- a/packages/mongo-livedata/collection.js
+++ b/packages/mongo-livedata/collection.js
@@ -699,9 +699,15 @@ Meteor.Collection.prototype._validatedUpdate = function(
     userId, selector, mutator, options) {
   var self = this;
 
+  options = options || {};
+
   if (!LocalCollection._selectorIsIdPerhapsAsObject(selector))
     throw new Error("validated update should be of a single ID");
 
+  if (options.upsert)
+    throw new Meteor.Error(403, "Access denied. In a restricted collection " +
+                           "you cannot do upserts.");
+
   // compute modified fields
   var fields = [];
   _.each(mutator, function (params, op) {

From 86565853b15307d248a964b4bdc85390f0f5d630 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Wed, 25 Sep 2013 18:19:59 -0700
Subject: [PATCH 092/335] Implement upsert in minimongo.

i.e. delete the code where we throw an exception if you try to upsert.
---
 packages/minimongo/minimongo.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index 1735dd646c..2596ee5a3b 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -554,9 +554,6 @@ LocalCollection.prototype.update = function (selector, mod, options, callback) {
   }
   if (!options) options = {};
 
-  if (options.upsert)
-    throw new Error("upsert not yet implemented");
-
   var selector_f = LocalCollection._compileSelector(selector);
 
   // Save the original results of any query that we might need to

From 115164e4af84095e9399f4f04458906801ac8b85 Mon Sep 17 00:00:00 2001
From: Nicklas Ansman Giertz <nicklas@ansman.se>
Date: Sat, 17 Aug 2013 18:35:40 -0700
Subject: [PATCH 093/335] Add the option to use a hosted domain with google's
 oauth

The hd option is used to restrict which email domain that are allowed to
log in to your app.

Starting from this commit you can pass `hostedDomain: 'example.com'` to
only allow emails from the domain `example.com`.
---
 packages/google/google_client.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/google/google_client.js b/packages/google/google_client.js
index 4f8c29c1a3..c99c376b1b 100644
--- a/packages/google/google_client.js
+++ b/packages/google/google_client.js
@@ -44,6 +44,10 @@ Google.requestCredential = function (options, credentialRequestCompleteCallback)
         '&access_type=' + accessType +
         '&approval_prompt=' + approvalPrompt;
 
+  if (options.hostedDomain) {
+    loginUrl += '&hd=' + encodeURIComponent(options.hostedDomain);
+  }
+
   Oauth.initiateLogin(credentialToken,
                       loginUrl,
                       credentialRequestCompleteCallback,

From 79d900cf65900c382bdc13d209e139a6b40e75aa Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Wed, 25 Sep 2013 22:34:56 -0700
Subject: [PATCH 094/335] Remove random from leaderboard and wordplay
 .meteor/packages.

It's part of standard-app-packages (though it wasn't added to it
until relatively late in the linker project).
---
 examples/leaderboard/.meteor/packages | 1 -
 examples/wordplay/.meteor/packages    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/examples/leaderboard/.meteor/packages b/examples/leaderboard/.meteor/packages
index a5eb137152..240f048420 100644
--- a/examples/leaderboard/.meteor/packages
+++ b/examples/leaderboard/.meteor/packages
@@ -7,4 +7,3 @@ standard-app-packages
 autopublish
 insecure
 preserve-inputs
-random
diff --git a/examples/wordplay/.meteor/packages b/examples/wordplay/.meteor/packages
index 1c4346821c..e695b93a6f 100644
--- a/examples/wordplay/.meteor/packages
+++ b/examples/wordplay/.meteor/packages
@@ -7,4 +7,3 @@ standard-app-packages
 insecure
 jquery
 preserve-inputs
-random

From a6db08ce8d14edf65e355c9f307b5b8eb8afad47 Mon Sep 17 00:00:00 2001
From: Matt DeBergalis <matt@meteor.com>
Date: Wed, 25 Sep 2013 23:00:32 -0700
Subject: [PATCH 095/335] Improve the explanation of manual publisher
 functions.

Fixes #1018.
---
 docs/client/api.html | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/docs/client/api.html b/docs/client/api.html
index 3aa992a512..e3f96a1f90 100644
--- a/docs/client/api.html
+++ b/docs/client/api.html
@@ -62,9 +62,9 @@ that Meteor will call each time a client subscribes to the name.
 
 Publish functions can return a
 [`Collection.Cursor`](#meteor_collection_cursor), in which case Meteor
-will publish that cursor's documents. You can also return an array of
-`Collection.Cursor`s, in which case Meteor will publish all of the
-cursors.
+will publish that cursor's documents to each subscribed client. You can
+also return an array of `Collection.Cursor`s, in which case Meteor will
+publish all of the cursors.
 
 {{#warning}}
 If you return multiple cursors in an array, they currently must all be from
@@ -92,16 +92,15 @@ different collections. We hope to lift this restriction in a future release.
       ];
     });
 
-Otherwise, the publish function should call the functions
-[`added`](#publish_added) (when a new document is added to the published record
-set), [`changed`](#publish_changed) (when some fields on a document in the
-record set are changed or cleared), and [`removed`](#publish_removed) (when
-documents are removed from the published record set) to inform subscribers about
-documents.  These methods are provided by `this` in your publish function.
-
-
-
-<!-- TODO discuss ready -->
+Alternatively, a publish function can directly control its published
+record set by calling the functions [`added`](#publish_added) (to add a
+new document to the published record set), [`changed`](#publish_changed)
+(to change or clear some fields on a document already in the published
+record set), and [`removed`](#publish_removed) (to remove documents from
+the published record set).  Publish functions that use these functions
+should also call [`ready`](#publish_ready) once the initial record set
+is complete.  These methods are provided by `this` in your publish
+function.
 
 Example:
 

From fcf6fdaa71803d9beb51d7c9965e356673df04cc Mon Sep 17 00:00:00 2001
From: Matt DeBergalis <matt@meteor.com>
Date: Wed, 25 Sep 2013 23:28:15 -0700
Subject: [PATCH 096/335] Clean up docs for collections managed by remote DDP
 server.

Fixes #875.
---
 docs/client/api.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/client/api.js b/docs/client/api.js
index 1ca9cbce0f..f9f028d024 100644
--- a/docs/client/api.js
+++ b/docs/client/api.js
@@ -482,7 +482,7 @@ Template.api.meteor_collection = {
   options: [
     {name: "connection",
      type: "Object",
-     descr: "The Meteor connection that will manage this collection. Uses the default connection if not specified. Pass `null` to specify no connection. Unmanaged (`name` is null) collections cannot specify a connection."
+     descr: "The server connection that will manage this collection. Uses the default connection if not specified.  Pass the return value of calling [`DDP.connect`](#ddp_connect) to specify a different server. Pass `null` to specify no connection. Unmanaged (`name` is null) collections cannot specify a connection."
     },
     {name: "idGeneration",
      type: "String",

From 0559491e875a64d773a4fdc61857f455e30117a3 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Thu, 26 Sep 2013 13:33:42 -0500
Subject: [PATCH 097/335] Improve Mongo compatibility with $ne/$nin/$not and
 arrays.

Fixes #1451.

We currently handle matches where the key has multiple values due to arrays in
the document in two subtley different ways, depending on whether or not the
array is in the last element of the keypath or not. (This is annoyingly
necessary, at least in the current structure of how we compile selectors, due to
various selectors differing in how they treat arrays.) The negative-style
operators have "must match all values" semantics, but this was only being
enforced when the branching was in the last element of the keypath. This commit
semi-hackily applies those semantics for other branching too.

We are still not 100% Mongo compatible (see XXX comment) but it's closer.
---
 packages/minimongo/minimongo_tests.js |  7 +++++++
 packages/minimongo/selector.js        | 22 +++++++++++++++++++---
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/packages/minimongo/minimongo_tests.js b/packages/minimongo/minimongo_tests.js
index 07475e5c94..5f19e703e0 100644
--- a/packages/minimongo/minimongo_tests.js
+++ b/packages/minimongo/minimongo_tests.js
@@ -427,6 +427,9 @@ Tinytest.add("minimongo - selector_compiler", function (test) {
   nomatch({a: {$ne: 1}}, {a: [1, 2]});
   nomatch({a: {$ne: 2}}, {a: [1, 2]});
   match({a: {$ne: 3}}, {a: [1, 2]});
+  nomatch({'a.b': {$ne: 1}}, {a: [{b: 1}, {b: 2}]});
+  nomatch({'a.b': {$ne: 2}}, {a: [{b: 1}, {b: 2}]});
+  match({'a.b': {$ne: 3}}, {a: [{b: 1}, {b: 2}]});
 
   nomatch({a: {$ne: {x: 1}}}, {a: {x: 1}});
   match({a: {$ne: {x: 1}}}, {a: {x: 2}});
@@ -456,7 +459,9 @@ Tinytest.add("minimongo - selector_compiler", function (test) {
   nomatch({a: {$nin: [1, 2, 3]}}, {a: [2]}); // tested against mongodb
   nomatch({a: {$nin: [{x: 1}, {x: 2}, {x: 3}]}}, {a: [{x: 2}]});
   nomatch({a: {$nin: [1, 2, 3]}}, {a: [4, 2]});
+  nomatch({'a.b': {$nin: [1, 2, 3]}}, {a: [{b:4}, {b:2}]});
   match({a: {$nin: [1, 2, 3]}}, {a: [4]});
+  match({'a.b': {$nin: [1, 2, 3]}}, {a: [{b:4}]});
 
   // $size
   match({a: {$size: 0}}, {a: []});
@@ -564,7 +569,9 @@ Tinytest.add("minimongo - selector_compiler", function (test) {
   match({x: {$not: {$lt: 10, $gt: 7}}}, {x: 6});
 
   match({x: {$not: {$gt: 7}}}, {x: [2, 3, 4]});
+  match({'x.y': {$not: {$gt: 7}}}, {x: [{y:2}, {y:3}, {y:4}]});
   nomatch({x: {$not: {$gt: 7}}}, {x: [2, 3, 4, 10]});
+  nomatch({'x.y': {$not: {$gt: 7}}}, {x: [{y:2}, {y:3}, {y:4}, {y:10}]});
 
   match({x: {$not: /a/}}, {x: "dog"});
   nomatch({x: {$not: /a/}}, {x: "cat"});
diff --git a/packages/minimongo/selector.js b/packages/minimongo/selector.js
index 7cf8fa0a5d..057e0d9195 100644
--- a/packages/minimongo/selector.js
+++ b/packages/minimongo/selector.js
@@ -551,9 +551,25 @@ var compileDocumentSelector = function (docSelector) {
       perKeySelectors.push(function (doc) {
         var branchValues = lookUpByIndex(doc);
         // We apply the selector to each "branched" value and return true if any
-        // match. This isn't 100% consistent with MongoDB; eg, see:
-        // https://jira.mongodb.org/browse/SERVER-8585
-        return _.any(branchValues, valueSelectorFunc);
+        // match. However, for "negative" selectors like $ne or $not we actually
+        // require *all* elements to match.
+        //
+        // This is because {'x.tag': {$ne: "foo"}} applied to {x: [{tag: 'foo'},
+        // {tag: 'bar'}]} should NOT match even though there is a branch that
+        // matches. (This matches the fact that $ne uses a negated
+        // _anyIfArrayPlus, for when the last level of the key is the array,
+        // which deMorgans into an 'all'.)
+        //
+        // XXX This isn't 100% consistent with MongoDB in 'null' cases:
+        //     https://jira.mongodb.org/browse/SERVER-8585
+        // XXX this still isn't right.  consider {a: {$ne: 5, $gt: 6}}. the
+        //     $ne needs to use the "all" logic and the $gt needs the "any"
+        //     logic
+        var combiner = (subSelector &&
+                        (subSelector.$not || subSelector.$ne ||
+                         subSelector.$nin))
+              ? _.all : _.any;
+        return combiner(branchValues, valueSelectorFunc);
       });
     }
   });

From bad4c097c24eaf13d0045898c85b94669fc99003 Mon Sep 17 00:00:00 2001
From: Tim Haines <tmhaines@gmail.com>
Date: Tue, 24 Sep 2013 12:31:21 -0700
Subject: [PATCH 098/335] Add the error message to the Meteor._debug call

---
 packages/livedata/livedata_server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/livedata/livedata_server.js b/packages/livedata/livedata_server.js
index 11bd6752a5..b675dc40d6 100644
--- a/packages/livedata/livedata_server.js
+++ b/packages/livedata/livedata_server.js
@@ -1018,7 +1018,7 @@ Server = function () {
       } catch (e) {
         // XXX print stack nicely
         Meteor._debug("Internal exception while processing message", msg,
-                      e.stack);
+                      e.message, e.stack);
       }
     });
 

From c8308cdf9fcdf49bb91011e0b7ac9071a79f565d Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Thu, 26 Sep 2013 13:48:01 -0700
Subject: [PATCH 099/335] Turn off mongo http interface. This lets you run
 meteor on port 3000 and 4000 at the same time.

---
 tools/mongo_runner.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/mongo_runner.js b/tools/mongo_runner.js
index c39e2e64cf..b2c1b55093 100644
--- a/tools/mongo_runner.js
+++ b/tools/mongo_runner.js
@@ -161,6 +161,7 @@ exports.launch_mongo = function (app_dir, port, launch_callback, on_exit_callbac
     var proc = child_process.spawn(mongod_path, [
       '--bind_ip', '127.0.0.1',
       '--smallfiles',
+      '--nohttpinterface',
       '--port', port,
       '--dbpath', data_path
     ]);

From 0286395700d4e2abcacb1fb34ae89254d4adde48 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Thu, 26 Sep 2013 14:22:23 -0700
Subject: [PATCH 100/335] Actually implement minimongo upsert.

Got a little over-confident there...
---
 packages/minimongo/minimongo.js | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index 2596ee5a3b..86fe4df943 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -473,6 +473,7 @@ LocalCollection.prototype.insert = function (doc, callback) {
       LocalCollection._recomputeResults(self.queries[qid]);
   });
   self._observeQueue.drain();
+
   // Defer because the caller likely doesn't expect the callback to be run
   // immediately.
   if (callback)
@@ -589,7 +590,20 @@ LocalCollection.prototype.update = function (selector, mod, options, callback) {
                                         qidToOriginalResults[qid]);
   });
   self._observeQueue.drain();
-  var result = { numberAffected: updateCount };
+
+  var insertedId;
+  if (updateCount === 0 && options.upsert) {
+    var newDoc = _.clone(selector);
+    LocalCollection._modify(newDoc, mod);
+    insertedId = self.insert(newDoc);
+    updateCount = 1;
+  }
+
+  var result = {
+    numberAffected: updateCount
+  };
+  if (insertedId !== undefined)
+    result.insertedId = insertedId;
   if (callback)
     Meteor.defer(function () {
       callback(null, result);

From 1964d2e88ec52b53561cd7d9ccc82651a42b2336 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Thu, 26 Sep 2013 14:48:13 -0700
Subject: [PATCH 101/335] Support  in minimongo

---
 packages/minimongo/minimongo.js | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index 86fe4df943..c1f2a21771 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -549,12 +549,19 @@ LocalCollection.prototype.remove = function (selector, callback) {
 // we rollback the whole operation, or what?
 LocalCollection.prototype.update = function (selector, mod, options, callback) {
   var self = this;
+  var newMod = _.clone(mod);
   if (! callback && options instanceof Function) {
     callback = options;
     options = null;
   }
   if (!options) options = {};
 
+  var setOnInsert;
+  if (newMod.$setOnInsert) {
+    setOnInsert = _.clone(newMod.$setOnInsert);
+    delete newMod.$setOnInsert;
+  }
+
   var selector_f = LocalCollection._compileSelector(selector);
 
   // Save the original results of any query that we might need to
@@ -576,7 +583,7 @@ LocalCollection.prototype.update = function (selector, mod, options, callback) {
     if (selector_f(doc)) {
       // XXX Should we save the original even if mod ends up being a no-op?
       self._saveOriginal(id, doc);
-      self._modifyAndNotify(doc, mod, recomputeQids);
+      self._modifyAndNotify(doc, newMod, recomputeQids);
       ++updateCount;
       if (!options.multi)
         break;
@@ -591,10 +598,18 @@ LocalCollection.prototype.update = function (selector, mod, options, callback) {
   });
   self._observeQueue.drain();
 
+  if (setOnInsert)
+    newMod.$setOnInsert = setOnInsert;
+
   var insertedId;
   if (updateCount === 0 && options.upsert) {
     var newDoc = _.clone(selector);
-    LocalCollection._modify(newDoc, mod);
+    if (newMod.$setOnInsert) {
+      newMod.$set = _.extend(newMod.$set || {},
+                          _.clone(newMod.$setOnInsert));
+      delete newMod.$setOnInsert;
+    }
+    LocalCollection._modify(newDoc, newMod);
     insertedId = self.insert(newDoc);
     updateCount = 1;
   }

From 58ad24d9328863c79120a4ffd006468f073bd705 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Thu, 26 Sep 2013 14:48:53 -0700
Subject: [PATCH 102/335] Run upsert tests for minimongo collections

---
 .../mongo-livedata/mongo_livedata_tests.js    | 137 +++++++++---------
 1 file changed, 71 insertions(+), 66 deletions(-)

diff --git a/packages/mongo-livedata/mongo_livedata_tests.js b/packages/mongo-livedata/mongo_livedata_tests.js
index 8f529066cb..b48a4a7771 100644
--- a/packages/mongo-livedata/mongo_livedata_tests.js
+++ b/packages/mongo-livedata/mongo_livedata_tests.js
@@ -915,83 +915,88 @@ if (Meteor.isServer) {
     onComplete();
   });
 
-  Tinytest.addAsync("mongo-livedata - upsert, " + idGeneration, function (test, onComplete) {
-    var run = test.runId();
-    var coll = new Meteor.Collection("livedata_upsert_collection_"+run, collectionOptions);
+  _.each([true, false], function (minimongo) {
+    Tinytest.addAsync("mongo-livedata - upsert " + (minimongo ? "minimongo" : "") + ", " + idGeneration, function (test, onComplete) {
+      var run = test.runId();
+      var options = collectionOptions;;
+      if (minimongo)
+        options = _.extend(collectionOptions, { connection: null });
+      var coll = new Meteor.Collection("livedata_upsert_collection_"+run, options);
 
-    var result1 = coll.update({foo: 'bar'}, {foo: 'bar'}, {upsert: true});
-    test.equal(result1.numberAffected, 1);
-    test.isTrue(result1.insertedId);
-    test.equal(coll.find().fetch(), [{foo: 'bar', _id: result1.insertedId}]);
+      var result1 = coll.update({foo: 'bar'}, {foo: 'bar'}, {upsert: true});
+      test.equal(result1.numberAffected, 1);
+      test.isTrue(result1.insertedId);
+      test.equal(coll.find().fetch(), [{foo: 'bar', _id: result1.insertedId}]);
 
-    var result2 = coll.update({foo: 'bar'}, {foo: 'baz'}, {upsert: true});
-    test.equal(result2.numberAffected, 1);
-    test.isFalse(result2.insertedId);
-    test.equal(coll.find().fetch(), [{foo: 'baz', _id: result1.insertedId}]);
+      var result2 = coll.update({foo: 'bar'}, {foo: 'baz'}, {upsert: true});
+      test.equal(result2.numberAffected, 1);
+      test.isFalse(result2.insertedId);
+      test.equal(coll.find().fetch(), [{foo: 'baz', _id: result1.insertedId}]);
 
-    coll.remove({});
+      coll.remove({});
 
-    // Test values that require transformation to go into Mongo:
+      // Test values that require transformation to go into Mongo:
 
-    var t1 = new Meteor.Collection.ObjectID();
-    var t2 = new Meteor.Collection.ObjectID();
-    var result3 = coll.update({foo: t1}, {foo: t1}, {upsert: true});
-    test.equal(result3.numberAffected, 1);
-    test.isTrue(result3.insertedId);
-    test.equal(coll.find().fetch(), [{foo: t1, _id: result3.insertedId}]);
+      var t1 = new Meteor.Collection.ObjectID();
+      var t2 = new Meteor.Collection.ObjectID();
+      var result3 = coll.update({foo: t1}, {foo: t1}, {upsert: true});
+      test.equal(result3.numberAffected, 1);
+      test.isTrue(result3.insertedId);
+      test.equal(coll.find().fetch(), [{foo: t1, _id: result3.insertedId}]);
 
-    var result4 = coll.update({foo: t1}, {foo: t2}, {upsert: true});
-    test.equal(result2.numberAffected, 1);
-    test.isFalse(result2.insertedId);
-    test.equal(coll.find().fetch(), [{foo: t2, _id: result3.insertedId}]);
+      var result4 = coll.update({foo: t1}, {foo: t2}, {upsert: true});
+      test.equal(result2.numberAffected, 1);
+      test.isFalse(result2.insertedId);
+      test.equal(coll.find().fetch(), [{foo: t2, _id: result3.insertedId}]);
 
-    coll.remove({});
+      coll.remove({});
 
-    // Test modification
+      // Test modification
 
-    var result5 = coll.update({name: 'David'}, {$set: {foo: 1}}, {upsert: true});
-    test.equal(result5.numberAffected, 1);
-    test.isTrue(result5.insertedId);
-    var davidId = result5.insertedId;
-    test.equal(coll.find().fetch(), [{name: 'David', foo: 1, _id: davidId}]);
+      var result5 = coll.update({name: 'David'}, {$set: {foo: 1}}, {upsert: true});
+      test.equal(result5.numberAffected, 1);
+      test.isTrue(result5.insertedId);
+      var davidId = result5.insertedId;
+      test.equal(coll.find().fetch(), [{name: 'David', foo: 1, _id: davidId}]);
 
-    test.throws(function () {
-      // test that bad modifier fails fast
-      coll.update({name: 'David'}, {$blah: {foo: 2}}, {upsert: true});
+      test.throws(function () {
+        // test that bad modifier fails fast
+        coll.update({name: 'David'}, {$blah: {foo: 2}}, {upsert: true});
+      });
+
+
+      var result6 = coll.update({name: 'David'}, {$set: {foo: 2}}, {upsert: true});
+      test.equal(result6.numberAffected, 1);
+      test.isFalse(result6.insertedId);
+      test.equal(coll.find().fetch(), [{name: 'David', foo: 2,
+                                        _id: result5.insertedId}]);
+
+      var emilyId = coll.insert({name: 'Emily', foo: 2});
+      test.equal(coll.find().fetch(), [{name: 'David', foo: 2, _id: davidId},
+                                       {name: 'Emily', foo: 2, _id: emilyId}]);
+
+      // multi update by upsert
+      var result7 = coll.update({foo: 2},
+                                {$set: {bar: 7}, $setOnInsert: {name: 'Fred', foo: 2}},
+                                {upsert: true, multi: true});
+      test.equal(result7.numberAffected, 2);
+      test.isFalse(result7.insertedId);
+      test.equal(coll.find().fetch(), [{name: 'David', foo: 2, bar: 7, _id: davidId},
+                                       {name: 'Emily', foo: 2, bar: 7, _id: emilyId}]);
+
+      // insert by multi upsert
+      var result8 = coll.update({foo: 3},
+                                {$set: {bar: 7}, $setOnInsert: {name: 'Fred', foo: 2}},
+                                {upsert: true, multi: true});
+      test.equal(result8.numberAffected, 1);
+      test.isTrue(result8.insertedId);
+      var fredId = result8.insertedId;
+      test.equal(coll.find().fetch(), [{name: 'David', foo: 2, bar: 7, _id: davidId},
+                                       {name: 'Emily', foo: 2, bar: 7, _id: emilyId},
+                                       {name: 'Fred', foo: 2, bar: 7, _id: fredId}]);
+
+      onComplete();
     });
-
-
-    var result6 = coll.update({name: 'David'}, {$set: {foo: 2}}, {upsert: true});
-    test.equal(result6.numberAffected, 1);
-    test.isFalse(result6.insertedId);
-    test.equal(coll.find().fetch(), [{name: 'David', foo: 2,
-                                      _id: result5.insertedId}]);
-
-    var emilyId = coll.insert({name: 'Emily', foo: 2});
-    test.equal(coll.find().fetch(), [{name: 'David', foo: 2, _id: davidId},
-                                     {name: 'Emily', foo: 2, _id: emilyId}]);
-
-    // multi update by upsert
-    var result7 = coll.update({foo: 2},
-                              {$set: {bar: 7}, $setOnInsert: {name: 'Fred', foo: 2}},
-                              {upsert: true, multi: true});
-    test.equal(result7.numberAffected, 2);
-    test.isFalse(result7.insertedId);
-    test.equal(coll.find().fetch(), [{name: 'David', foo: 2, bar: 7, _id: davidId},
-                                     {name: 'Emily', foo: 2, bar: 7, _id: emilyId}]);
-
-    // insert by multi upsert
-    var result8 = coll.update({foo: 3},
-                              {$set: {bar: 7}, $setOnInsert: {name: 'Fred', foo: 2}},
-                              {upsert: true, multi: true});
-    test.equal(result8.numberAffected, 1);
-    test.isTrue(result8.insertedId);
-    var fredId = result8.insertedId;
-    test.equal(coll.find().fetch(), [{name: 'David', foo: 2, bar: 7, _id: davidId},
-                                     {name: 'Emily', foo: 2, bar: 7, _id: emilyId},
-                                     {name: 'Fred', foo: 2, bar: 7, _id: fredId}]);
-
-    onComplete();
   });
 
 } // end Meteor.isServer

From d855e58f9220e8ee772c1b414777282291bff084 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Wed, 25 Sep 2013 20:41:37 -0700
Subject: [PATCH 103/335] Implement Accounts.config({ restrictCreationByEmail:
 'mit.edu' })

- Check email for users created with password or any social account's email
- Throw an error with explanation on bad email domain.
- Set `hd` param for Google Accounts authentication url
- Docs description
- Touch History.md

- Possibly should add it into QA process?
---
 History.md                                |  3 +++
 docs/client/api.js                        |  5 ++++
 packages/accounts-base/accounts_common.js |  5 ++--
 packages/accounts-base/accounts_server.js | 28 +++++++++++++++++++++++
 packages/google/google_client.js          |  4 ++--
 5 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/History.md b/History.md
index 3db302fed6..4154280e35 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,8 @@
 ## vNEXT
 
+* `restrictCreationByEmail` option in `Accounts.config` to restrict new users to
+  emails of specific domain (eg. only users with @meteor.com emails).
+
 * Better error when passing a string to {{#each}}. #722
 
 * Write dates to Mongo as ISODate rather than Integer; existing data can be
diff --git a/docs/client/api.js b/docs/client/api.js
index 1ca9cbce0f..a75a564257 100644
--- a/docs/client/api.js
+++ b/docs/client/api.js
@@ -1100,6 +1100,11 @@ Template.api.accounts_config = {
       name: "forbidClientAccountCreation",
       type: "Boolean",
       descr: "Calls to [`createUser`](#accounts_createuser) from the client will be rejected. In addition, if you are using [accounts-ui](#accountsui), the \"Create account\" link will not be available."
+    },
+    {
+      name: "restrictCreationByEmail",
+      type: "String",
+      descr: "If set, only allow new users with an email in the specified domain. Works with password-based sign-in and external services that expose email addresses (Google, Facebook, GitHub). All existing users still can log in after enabling this option. Example: `Accounts.config({ restrictCreationByEmail: 'school.edu' })`."
     }
   ]
 };
diff --git a/packages/accounts-base/accounts_common.js b/packages/accounts-base/accounts_common.js
index 1de58f1b2d..085591b128 100644
--- a/packages/accounts-base/accounts_common.js
+++ b/packages/accounts-base/accounts_common.js
@@ -34,8 +34,9 @@ Accounts._options = {};
 Accounts.config = function(options) {
   // validate option keys
   var VALID_KEYS = ["sendVerificationEmail", "forbidClientAccountCreation",
-                    "_tokenLifetimeSecs", "_tokenExpirationIntervalSecs",
-                    "_minTokenLifetimeSecs", "_connectionCloseDelaySecs"];
+                    "restrictCreationByEmail", "_tokenLifetimeSecs",
+                    "_tokenExpirationIntervalSecs", "_minTokenLifetimeSecs",
+                    "_connectionCloseDelaySecs"];
   _.each(_.keys(options), function (key) {
     if (!_.contains(VALID_KEYS, key)) {
       throw new Error("Accounts.config: Invalid key: " + key);
diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index c97f0e17ab..c36bc5bf47 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -304,6 +304,34 @@ Accounts.validateNewUser = function (func) {
   validateNewUserHooks.push(func);
 };
 
+// Helper function: returns false if email does not match company domain from
+// the configuration.
+var testEmailDomain = function (email) {
+  var domain = Accounts._options.restrictCreationByEmail;
+  return !domain || (new RegExp('@' + domain + '$', 'i')).test(email);
+};
+
+// Validate new user's email or Google/Facebook/Github account's email
+Accounts.validateNewUser(function (user) {
+  var domain = Accounts._options.restrictCreationByEmail;
+  if (!domain)
+    return true;
+
+  var emailIsGood = true;
+  // User with password can have only one email on creation
+  if (user.emails)
+    emailIsGood &= testEmailDomain(user.emails[0].address);
+
+  // Find any email of any service and check it
+  emailIsGood &= _.any(user.services, function (service) {
+    return service.email && testEmailDomain(service.email);
+  });
+
+  if (!emailIsGood)
+    throw new Meteor.Error(403, "@" + domain + " email required");
+
+  return true;
+});
 
 ///
 /// MANAGING USER OBJECTS
diff --git a/packages/google/google_client.js b/packages/google/google_client.js
index c99c376b1b..fce4e19750 100644
--- a/packages/google/google_client.js
+++ b/packages/google/google_client.js
@@ -44,8 +44,8 @@ Google.requestCredential = function (options, credentialRequestCompleteCallback)
         '&access_type=' + accessType +
         '&approval_prompt=' + approvalPrompt;
 
-  if (options.hostedDomain) {
-    loginUrl += '&hd=' + encodeURIComponent(options.hostedDomain);
+  if (Accounts._options.restrictCreationByEmail) {
+    loginUrl += '&hd=' + encodeURIComponent(Accounts._options.restrictCreationByEmail);
   }
 
   Oauth.initiateLogin(credentialToken,

From 3f6c14aedfb97ac264f4ad738c221467ce0928c9 Mon Sep 17 00:00:00 2001
From: David Greenspan <dgreenspan@alum.mit.edu>
Date: Fri, 27 Sep 2013 12:37:22 -0700
Subject: [PATCH 104/335] fix tests

---
 packages/mongo-livedata/mongo_livedata_tests.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/mongo-livedata/mongo_livedata_tests.js b/packages/mongo-livedata/mongo_livedata_tests.js
index b48a4a7771..1c7d0f3d92 100644
--- a/packages/mongo-livedata/mongo_livedata_tests.js
+++ b/packages/mongo-livedata/mongo_livedata_tests.js
@@ -918,9 +918,9 @@ if (Meteor.isServer) {
   _.each([true, false], function (minimongo) {
     Tinytest.addAsync("mongo-livedata - upsert " + (minimongo ? "minimongo" : "") + ", " + idGeneration, function (test, onComplete) {
       var run = test.runId();
-      var options = collectionOptions;;
+      var options = collectionOptions;
       if (minimongo)
-        options = _.extend(collectionOptions, { connection: null });
+        options = _.extend({}, collectionOptions, { connection: null });
       var coll = new Meteor.Collection("livedata_upsert_collection_"+run, options);
 
       var result1 = coll.update({foo: 'bar'}, {foo: 'bar'}, {upsert: true});

From 1dd83b1d2c5f5d72e009c83aea900536cf5465bf Mon Sep 17 00:00:00 2001
From: David Greenspan <dgreenspan@alum.mit.edu>
Date: Fri, 27 Sep 2013 13:18:09 -0700
Subject: [PATCH 105/335] run minimongo upsert tests on client (has errors)

---
 .../mongo-livedata/mongo_livedata_tests.js    | 168 +++++++++---------
 1 file changed, 84 insertions(+), 84 deletions(-)

diff --git a/packages/mongo-livedata/mongo_livedata_tests.js b/packages/mongo-livedata/mongo_livedata_tests.js
index 1c7d0f3d92..277f26ec0e 100644
--- a/packages/mongo-livedata/mongo_livedata_tests.js
+++ b/packages/mongo-livedata/mongo_livedata_tests.js
@@ -915,92 +915,92 @@ if (Meteor.isServer) {
     onComplete();
   });
 
-  _.each([true, false], function (minimongo) {
-    Tinytest.addAsync("mongo-livedata - upsert " + (minimongo ? "minimongo" : "") + ", " + idGeneration, function (test, onComplete) {
-      var run = test.runId();
-      var options = collectionOptions;
-      if (minimongo)
-        options = _.extend({}, collectionOptions, { connection: null });
-      var coll = new Meteor.Collection("livedata_upsert_collection_"+run, options);
-
-      var result1 = coll.update({foo: 'bar'}, {foo: 'bar'}, {upsert: true});
-      test.equal(result1.numberAffected, 1);
-      test.isTrue(result1.insertedId);
-      test.equal(coll.find().fetch(), [{foo: 'bar', _id: result1.insertedId}]);
-
-      var result2 = coll.update({foo: 'bar'}, {foo: 'baz'}, {upsert: true});
-      test.equal(result2.numberAffected, 1);
-      test.isFalse(result2.insertedId);
-      test.equal(coll.find().fetch(), [{foo: 'baz', _id: result1.insertedId}]);
-
-      coll.remove({});
-
-      // Test values that require transformation to go into Mongo:
-
-      var t1 = new Meteor.Collection.ObjectID();
-      var t2 = new Meteor.Collection.ObjectID();
-      var result3 = coll.update({foo: t1}, {foo: t1}, {upsert: true});
-      test.equal(result3.numberAffected, 1);
-      test.isTrue(result3.insertedId);
-      test.equal(coll.find().fetch(), [{foo: t1, _id: result3.insertedId}]);
-
-      var result4 = coll.update({foo: t1}, {foo: t2}, {upsert: true});
-      test.equal(result2.numberAffected, 1);
-      test.isFalse(result2.insertedId);
-      test.equal(coll.find().fetch(), [{foo: t2, _id: result3.insertedId}]);
-
-      coll.remove({});
-
-      // Test modification
-
-      var result5 = coll.update({name: 'David'}, {$set: {foo: 1}}, {upsert: true});
-      test.equal(result5.numberAffected, 1);
-      test.isTrue(result5.insertedId);
-      var davidId = result5.insertedId;
-      test.equal(coll.find().fetch(), [{name: 'David', foo: 1, _id: davidId}]);
-
-      test.throws(function () {
-        // test that bad modifier fails fast
-        coll.update({name: 'David'}, {$blah: {foo: 2}}, {upsert: true});
-      });
-
-
-      var result6 = coll.update({name: 'David'}, {$set: {foo: 2}}, {upsert: true});
-      test.equal(result6.numberAffected, 1);
-      test.isFalse(result6.insertedId);
-      test.equal(coll.find().fetch(), [{name: 'David', foo: 2,
-                                        _id: result5.insertedId}]);
-
-      var emilyId = coll.insert({name: 'Emily', foo: 2});
-      test.equal(coll.find().fetch(), [{name: 'David', foo: 2, _id: davidId},
-                                       {name: 'Emily', foo: 2, _id: emilyId}]);
-
-      // multi update by upsert
-      var result7 = coll.update({foo: 2},
-                                {$set: {bar: 7}, $setOnInsert: {name: 'Fred', foo: 2}},
-                                {upsert: true, multi: true});
-      test.equal(result7.numberAffected, 2);
-      test.isFalse(result7.insertedId);
-      test.equal(coll.find().fetch(), [{name: 'David', foo: 2, bar: 7, _id: davidId},
-                                       {name: 'Emily', foo: 2, bar: 7, _id: emilyId}]);
-
-      // insert by multi upsert
-      var result8 = coll.update({foo: 3},
-                                {$set: {bar: 7}, $setOnInsert: {name: 'Fred', foo: 2}},
-                                {upsert: true, multi: true});
-      test.equal(result8.numberAffected, 1);
-      test.isTrue(result8.insertedId);
-      var fredId = result8.insertedId;
-      test.equal(coll.find().fetch(), [{name: 'David', foo: 2, bar: 7, _id: davidId},
-                                       {name: 'Emily', foo: 2, bar: 7, _id: emilyId},
-                                       {name: 'Fred', foo: 2, bar: 7, _id: fredId}]);
-
-      onComplete();
-    });
-  });
-
 } // end Meteor.isServer
 
+_.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
+  Tinytest.addAsync("mongo-livedata - upsert " + (minimongo ? "minimongo" : "") + ", " + idGeneration, function (test, onComplete) {
+    var run = test.runId();
+    var options = collectionOptions;
+    if (minimongo)
+      options = _.extend({}, collectionOptions, { connection: null });
+    var coll = new Meteor.Collection("livedata_upsert_collection_"+run, options);
+
+    var result1 = coll.update({foo: 'bar'}, {foo: 'bar'}, {upsert: true});
+    test.equal(result1.numberAffected, 1);
+    test.isTrue(result1.insertedId);
+    test.equal(coll.find().fetch(), [{foo: 'bar', _id: result1.insertedId}]);
+
+    var result2 = coll.update({foo: 'bar'}, {foo: 'baz'}, {upsert: true});
+    test.equal(result2.numberAffected, 1);
+    test.isFalse(result2.insertedId);
+    test.equal(coll.find().fetch(), [{foo: 'baz', _id: result1.insertedId}]);
+
+    coll.remove({});
+
+    // Test values that require transformation to go into Mongo:
+
+    var t1 = new Meteor.Collection.ObjectID();
+    var t2 = new Meteor.Collection.ObjectID();
+    var result3 = coll.update({foo: t1}, {foo: t1}, {upsert: true});
+    test.equal(result3.numberAffected, 1);
+    test.isTrue(result3.insertedId);
+    test.equal(coll.find().fetch(), [{foo: t1, _id: result3.insertedId}]);
+
+    var result4 = coll.update({foo: t1}, {foo: t2}, {upsert: true});
+    test.equal(result2.numberAffected, 1);
+    test.isFalse(result2.insertedId);
+    test.equal(coll.find().fetch(), [{foo: t2, _id: result3.insertedId}]);
+
+    coll.remove({});
+
+    // Test modification
+
+    var result5 = coll.update({name: 'David'}, {$set: {foo: 1}}, {upsert: true});
+    test.equal(result5.numberAffected, 1);
+    test.isTrue(result5.insertedId);
+    var davidId = result5.insertedId;
+    test.equal(coll.find().fetch(), [{name: 'David', foo: 1, _id: davidId}]);
+
+    test.throws(function () {
+      // test that bad modifier fails fast
+      coll.update({name: 'David'}, {$blah: {foo: 2}}, {upsert: true});
+    });
+
+
+    var result6 = coll.update({name: 'David'}, {$set: {foo: 2}}, {upsert: true});
+    test.equal(result6.numberAffected, 1);
+    test.isFalse(result6.insertedId);
+    test.equal(coll.find().fetch(), [{name: 'David', foo: 2,
+                                      _id: result5.insertedId}]);
+
+    var emilyId = coll.insert({name: 'Emily', foo: 2});
+    test.equal(coll.find().fetch(), [{name: 'David', foo: 2, _id: davidId},
+                                     {name: 'Emily', foo: 2, _id: emilyId}]);
+
+    // multi update by upsert
+    var result7 = coll.update({foo: 2},
+                              {$set: {bar: 7}, $setOnInsert: {name: 'Fred', foo: 2}},
+                              {upsert: true, multi: true});
+    test.equal(result7.numberAffected, 2);
+    test.isFalse(result7.insertedId);
+    test.equal(coll.find().fetch(), [{name: 'David', foo: 2, bar: 7, _id: davidId},
+                                     {name: 'Emily', foo: 2, bar: 7, _id: emilyId}]);
+
+    // insert by multi upsert
+    var result8 = coll.update({foo: 3},
+                              {$set: {bar: 7}, $setOnInsert: {name: 'Fred', foo: 2}},
+                              {upsert: true, multi: true});
+    test.equal(result8.numberAffected, 1);
+    test.isTrue(result8.insertedId);
+    var fredId = result8.insertedId;
+    test.equal(coll.find().fetch(), [{name: 'David', foo: 2, bar: 7, _id: davidId},
+                                     {name: 'Emily', foo: 2, bar: 7, _id: emilyId},
+                                     {name: 'Fred', foo: 2, bar: 7, _id: fredId}]);
+
+    onComplete();
+  });
+});
+
 });  // end idGeneration parametrization
 
 Tinytest.add('mongo-livedata - rewrite selector', function (test) {

From e1aa2450e9ad4c0bb4c7ae7f6987af9352b3aa99 Mon Sep 17 00:00:00 2001
From: David Greenspan <dgreenspan@alum.mit.edu>
Date: Fri, 27 Sep 2013 13:38:50 -0700
Subject: [PATCH 106/335] don't swallow exceptions on LocalCollection write

We provide an error-logging callback for async writes without a callback.  However, writes to LocalCollections are not necessarily async, so we shouldn't provide a callback.
---
 packages/mongo-livedata/collection.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/mongo-livedata/collection.js b/packages/mongo-livedata/collection.js
index 23479ce7bd..ee6b36a434 100644
--- a/packages/mongo-livedata/collection.js
+++ b/packages/mongo-livedata/collection.js
@@ -347,18 +347,6 @@ _.each(["insert", "update", "remove"], function (name) {
     if (args.length && args[args.length - 1] instanceof Function)
       callback = args.pop();
 
-    if (Meteor.isClient && !callback) {
-      // Client can't block, so it can't report errors by exception,
-      // only by callback. If they forget the callback, give them a
-      // default one that logs the error, so they aren't totally
-      // baffled if their writes don't work because their database is
-      // down.
-      callback = function (err) {
-        if (err)
-          Meteor._debug(name + " failed: " + (err.reason || err.stack));
-      };
-    }
-
     if (name === "insert") {
       if (!args.length)
         throw new Error("insert requires an argument");
@@ -407,6 +395,18 @@ _.each(["insert", "update", "remove"], function (name) {
       // just remote to another endpoint, propagate return value or
       // exception.
 
+      if (Meteor.isClient && !wrappedCallback) {
+        // Client can't block, so it can't report errors by exception,
+        // only by callback. If they forget the callback, give them a
+        // default one that logs the error, so they aren't totally
+        // baffled if their writes don't work because their database is
+        // down.
+        wrappedCallback = function (err) {
+          if (err)
+            Meteor._debug(name + " failed: " + (err.reason || err.stack));
+        };
+      }
+
       var enclosing = DDP._CurrentInvocation.get();
       var alreadyInSimulation = enclosing && enclosing.isSimulation;
       if (!alreadyInSimulation && name !== "insert") {

From d8d9206f4b630f4956f5a3ad3a66a65282c19d5e Mon Sep 17 00:00:00 2001
From: David Greenspan <dgreenspan@alum.mit.edu>
Date: Fri, 27 Sep 2013 13:53:09 -0700
Subject: [PATCH 107/335] $setOnInsert in minimongo

---
 packages/minimongo/minimongo.js | 19 ++-----------------
 packages/minimongo/modify.js    |  3 +++
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index c1f2a21771..59cd1be837 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -549,19 +549,12 @@ LocalCollection.prototype.remove = function (selector, callback) {
 // we rollback the whole operation, or what?
 LocalCollection.prototype.update = function (selector, mod, options, callback) {
   var self = this;
-  var newMod = _.clone(mod);
   if (! callback && options instanceof Function) {
     callback = options;
     options = null;
   }
   if (!options) options = {};
 
-  var setOnInsert;
-  if (newMod.$setOnInsert) {
-    setOnInsert = _.clone(newMod.$setOnInsert);
-    delete newMod.$setOnInsert;
-  }
-
   var selector_f = LocalCollection._compileSelector(selector);
 
   // Save the original results of any query that we might need to
@@ -583,7 +576,7 @@ LocalCollection.prototype.update = function (selector, mod, options, callback) {
     if (selector_f(doc)) {
       // XXX Should we save the original even if mod ends up being a no-op?
       self._saveOriginal(id, doc);
-      self._modifyAndNotify(doc, newMod, recomputeQids);
+      self._modifyAndNotify(doc, mod, recomputeQids);
       ++updateCount;
       if (!options.multi)
         break;
@@ -598,18 +591,10 @@ LocalCollection.prototype.update = function (selector, mod, options, callback) {
   });
   self._observeQueue.drain();
 
-  if (setOnInsert)
-    newMod.$setOnInsert = setOnInsert;
-
   var insertedId;
   if (updateCount === 0 && options.upsert) {
     var newDoc = _.clone(selector);
-    if (newMod.$setOnInsert) {
-      newMod.$set = _.extend(newMod.$set || {},
-                          _.clone(newMod.$setOnInsert));
-      delete newMod.$setOnInsert;
-    }
-    LocalCollection._modify(newDoc, newMod);
+    LocalCollection._modify(newDoc, mod, true);
     insertedId = self.insert(newDoc);
     updateCount = 1;
   }
diff --git a/packages/minimongo/modify.js b/packages/minimongo/modify.js
index 8413899eb1..0e404914dd 100644
--- a/packages/minimongo/modify.js
+++ b/packages/minimongo/modify.js
@@ -147,6 +147,9 @@ LocalCollection._modifiers = {
 
     target[field] = EJSON.clone(arg);
   },
+  $setOnInsert: function (target, field, arg) {
+    // converted to `$set` in `_modify`
+  },
   $unset: function (target, field, arg) {
     if (target !== undefined) {
       if (target instanceof Array) {

From 7bf11e35a6c1ca5996802a43b3a2b6c61475e031 Mon Sep 17 00:00:00 2001
From: Robert Lowe <robert@iblargz.com>
Date: Fri, 26 Jul 2013 23:43:20 -0400
Subject: [PATCH 108/335] Adds oauth1 improves to support requestTokenSecrets &
 dynamic urls.

Atmosphere package: https://github.com/RobertLowe/meteor-accounts-trello

Fixes #1167
Closes #1227
---
 packages/oauth1/oauth1_binding.js | 28 +++++++++++++++++++---------
 packages/oauth1/oauth1_server.js  | 23 +++++++++++++++++------
 packages/oauth1/oauth1_tests.js   |  4 +++-
 3 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/packages/oauth1/oauth1_binding.js b/packages/oauth1/oauth1_binding.js
index 8047f387c6..59b6fdb5d4 100644
--- a/packages/oauth1/oauth1_binding.js
+++ b/packages/oauth1/oauth1_binding.js
@@ -4,19 +4,18 @@ var querystring = Npm.require("querystring");
 // An OAuth1 wrapper around http calls which helps get tokens and
 // takes care of HTTP headers
 //
-// @param consumerKey {String} As supplied by the OAuth1 provider
-// @param consumerSecret {String} As supplied by the OAuth1 provider
+// @param config {Object} Keys, Secrets, etc
 // @param urls {Object}
 //   - requestToken (String): url
 //   - authorize (String): url
 //   - accessToken (String): url
 //   - authenticate (String): url
-OAuth1Binding = function(consumerKey, consumerSecret, urls) {
-  this._consumerKey = consumerKey;
-  this._secret = consumerSecret;
+OAuth1Binding = function(config, urls) {
+  this._config = config;
   this._urls = urls;
 };
 
+
 OAuth1Binding.prototype.prepareRequestToken = function(callbackUrl) {
   var self = this;
 
@@ -27,15 +26,20 @@ OAuth1Binding.prototype.prepareRequestToken = function(callbackUrl) {
   var response = self._call('POST', self._urls.requestToken, headers);
   var tokens = querystring.parse(response.content);
 
-  // XXX should we also store oauth_token_secret here?
+  // XXX should we also store oauth_token_secret here? Yes, we should.
   if (!tokens.oauth_callback_confirmed)
     throw new Error("oauth_callback_confirmed false when requesting oauth1 token", tokens);
   self.requestToken = tokens.oauth_token;
+  self.requestTokenSecret = tokens.oauth_token_secret;
 };
 
-OAuth1Binding.prototype.prepareAccessToken = function(query) {
+OAuth1Binding.prototype.prepareAccessToken = function(query, requestTokenSecret) {
   var self = this;
 
+  // support implemntations that use request token secrets
+  if (requestTokenSecret)
+    self.accessTokenSecret = requestTokenSecret
+
   var headers = self._buildHeader({
     oauth_token: query.oauth_token
   });
@@ -76,7 +80,7 @@ OAuth1Binding.prototype.post = function(url, params, callback) {
 OAuth1Binding.prototype._buildHeader = function(headers) {
   var self = this;
   return _.extend({
-    oauth_consumer_key: self._consumerKey,
+    oauth_consumer_key: self._config.consumerKey,
     oauth_nonce: Random.id().replace(/\W/g, ''),
     oauth_signature_method: 'HMAC-SHA1',
     oauth_timestamp: (new Date().valueOf()/1000).toFixed().toString(),
@@ -98,7 +102,7 @@ OAuth1Binding.prototype._getSignature = function(method, url, rawHeaders, access
     self._encodeString(parameters)
   ].join('&');
 
-  var signingKey = self._encodeString(self._secret) + '&';
+  var signingKey = self._encodeString(self._config.secret) + '&';
   if (accessTokenSecret)
     signingKey += self._encodeString(accessTokenSecret);
 
@@ -108,6 +112,12 @@ OAuth1Binding.prototype._getSignature = function(method, url, rawHeaders, access
 OAuth1Binding.prototype._call = function(method, url, headers, params, callback) {
   var self = this;
 
+  
+  // callback functions to support parameters/customization
+  if(typeof(url) == "function"){
+    url = url(self);
+  }
+
   // Get the signature
   headers.oauth_signature = self._getSignature(method, url, headers, self.accessTokenSecret, params);
 
diff --git a/packages/oauth1/oauth1_server.js b/packages/oauth1/oauth1_server.js
index 2e2a530020..b4a6ab5f1c 100644
--- a/packages/oauth1/oauth1_server.js
+++ b/packages/oauth1/oauth1_server.js
@@ -1,5 +1,6 @@
 // A place to store request tokens pending verification
 var requestTokens = {};
+var querystring = Npm.require("querystring");
 
 OAuth1Test = {requestTokens: requestTokens};
 
@@ -12,8 +13,7 @@ Oauth._requestHandlers['1'] = function (service, query, res) {
   }
 
   var urls = service.urls;
-  var oauthBinding = new OAuth1Binding(
-    config.consumerKey, config.secret, urls);
+  var oauthBinding = new OAuth1Binding(config, urls);
 
   if (query.requestTokenAndRedirect) {
     // step 1 - get and store a request token
@@ -22,10 +22,20 @@ Oauth._requestHandlers['1'] = function (service, query, res) {
     oauthBinding.prepareRequestToken(query.requestTokenAndRedirect);
 
     // Keep track of request token so we can verify it on the next step
-    requestTokens[query.state] = oauthBinding.requestToken;
+    requestTokens[query.state] = {
+      requestToken: oauthBinding.requestToken, 
+      requestTokenSecret: oauthBinding.requestTokenSecret
+    };
+
+    // support for scope/name parameters
+    var redirectUrl = undefined;
+    if(typeof(urls.authenticate) == "function"){
+      redirectUrl = urls.authenticate(oauthBinding);
+    } else {
+      redirectUrl = urls.authenticate + '?oauth_token=' + oauthBinding.requestToken;
+    }
 
     // redirect to provider login, which will redirect back to "step 2" below
-    var redirectUrl = urls.authenticate + '?oauth_token=' + oauthBinding.requestToken;
     res.writeHead(302, {'Location': redirectUrl});
     res.end();
   } else {
@@ -34,7 +44,8 @@ Oauth._requestHandlers['1'] = function (service, query, res) {
     // token and access token secret and log in as user
 
     // Get the user's request token so we can verify it and clear it
-    var requestToken = requestTokens[query.state];
+    var requestToken       = requestTokens[query.state].requestToken;
+    var requestTokenSecret = requestTokens[query.state].requestTokenSecret;
     delete requestTokens[query.state];
 
     // Verify user authorized access and the oauth_token matches
@@ -45,7 +56,7 @@ Oauth._requestHandlers['1'] = function (service, query, res) {
       // subsequent call to the `login` method will be immediate.
 
       // Get the access token for signing requests
-      oauthBinding.prepareAccessToken(query);
+      oauthBinding.prepareAccessToken(query, requestTokenSecret);
 
       // Run service-specific handler.
       var oauthResult = service.handleOauthRequest(oauthBinding);
diff --git a/packages/oauth1/oauth1_tests.js b/packages/oauth1/oauth1_tests.js
index d7eb0e1979..272e0cb123 100644
--- a/packages/oauth1/oauth1_tests.js
+++ b/packages/oauth1/oauth1_tests.js
@@ -40,7 +40,9 @@ Tinytest.add("oauth1 - loginResultForCredentialToken is stored", function (test)
     });
 
     // simulate logging in using twitterfoo
-    OAuth1Test.requestTokens[credentialToken] = twitterfooAccessToken;
+    OAuth1Test.requestTokens[credentialToken] = {
+      requestToken: twitterfooAccessToken
+    };
 
     var req = {
       method: "POST",

From 9e0897aecd41109e71c8c148364b4f9bd1b4ccb6 Mon Sep 17 00:00:00 2001
From: Robert Lowe <robert@iblargz.com>
Date: Fri, 30 Aug 2013 16:56:53 -0400
Subject: [PATCH 109/335] Adds documentation for `config` arg of
 `OAuth1Binding`'s constructor

Context: https://github.com/meteor/meteor/pull/1253#commitcomment-3980200
---
 packages/oauth1/oauth1_binding.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/oauth1/oauth1_binding.js b/packages/oauth1/oauth1_binding.js
index 59b6fdb5d4..c3af432318 100644
--- a/packages/oauth1/oauth1_binding.js
+++ b/packages/oauth1/oauth1_binding.js
@@ -4,7 +4,9 @@ var querystring = Npm.require("querystring");
 // An OAuth1 wrapper around http calls which helps get tokens and
 // takes care of HTTP headers
 //
-// @param config {Object} Keys, Secrets, etc
+// @param config {Object} 
+//   - consumerKey (String): oauth consumer key
+//   - secret (String): oauth consumer secret
 // @param urls {Object}
 //   - requestToken (String): url
 //   - authorize (String): url
@@ -15,7 +17,6 @@ OAuth1Binding = function(config, urls) {
   this._urls = urls;
 };
 
-
 OAuth1Binding.prototype.prepareRequestToken = function(callbackUrl) {
   var self = this;
 

From 400778a55960f67de4178f0916fe166bd5666c26 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Wed, 25 Sep 2013 20:16:19 -0700
Subject: [PATCH 110/335] Cleanup. Whitespace, comments, style, unused
 variables.

---
 packages/oauth1/oauth1_binding.js | 22 ++++++++++++++--------
 packages/oauth1/oauth1_server.js  | 13 ++++++-------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/packages/oauth1/oauth1_binding.js b/packages/oauth1/oauth1_binding.js
index c3af432318..bf9b88140d 100644
--- a/packages/oauth1/oauth1_binding.js
+++ b/packages/oauth1/oauth1_binding.js
@@ -27,9 +27,10 @@ OAuth1Binding.prototype.prepareRequestToken = function(callbackUrl) {
   var response = self._call('POST', self._urls.requestToken, headers);
   var tokens = querystring.parse(response.content);
 
-  // XXX should we also store oauth_token_secret here? Yes, we should.
   if (!tokens.oauth_callback_confirmed)
-    throw new Error("oauth_callback_confirmed false when requesting oauth1 token", tokens);
+    throw new Error(
+      "oauth_callback_confirmed false when requesting oauth1 token", tokens);
+
   self.requestToken = tokens.oauth_token;
   self.requestTokenSecret = tokens.oauth_token_secret;
 };
@@ -37,9 +38,14 @@ OAuth1Binding.prototype.prepareRequestToken = function(callbackUrl) {
 OAuth1Binding.prototype.prepareAccessToken = function(query, requestTokenSecret) {
   var self = this;
 
-  // support implemntations that use request token secrets
+  // support implementations that use request token secrets. This is
+  // read by self._call.
+  //
+  // XXX make it a param to call, not something stashed on self? It's
+  // kinda confusing right now, everything except this is passed as
+  // arguments, but this is stored.
   if (requestTokenSecret)
-    self.accessTokenSecret = requestTokenSecret
+    self.accessTokenSecret = requestTokenSecret;
 
   var headers = self._buildHeader({
     oauth_token: query.oauth_token
@@ -113,14 +119,14 @@ OAuth1Binding.prototype._getSignature = function(method, url, rawHeaders, access
 OAuth1Binding.prototype._call = function(method, url, headers, params, callback) {
   var self = this;
 
-  
-  // callback functions to support parameters/customization
-  if(typeof(url) == "function"){
+  // all URLs to be functions to support parameters/customization
+  if(typeof url === "function") {
     url = url(self);
   }
 
   // Get the signature
-  headers.oauth_signature = self._getSignature(method, url, headers, self.accessTokenSecret, params);
+  headers.oauth_signature =
+    self._getSignature(method, url, headers, self.accessTokenSecret, params);
 
   // Make a authorization string according to oauth1 spec
   var authString = self._getAuthHeaderString(headers);
diff --git a/packages/oauth1/oauth1_server.js b/packages/oauth1/oauth1_server.js
index b4a6ab5f1c..6a61fbd6c7 100644
--- a/packages/oauth1/oauth1_server.js
+++ b/packages/oauth1/oauth1_server.js
@@ -1,6 +1,5 @@
 // A place to store request tokens pending verification
 var requestTokens = {};
-var querystring = Npm.require("querystring");
 
 OAuth1Test = {requestTokens: requestTokens};
 
@@ -29,7 +28,7 @@ Oauth._requestHandlers['1'] = function (service, query, res) {
 
     // support for scope/name parameters
     var redirectUrl = undefined;
-    if(typeof(urls.authenticate) == "function"){
+    if(typeof urls.authenticate === "function") {
       redirectUrl = urls.authenticate(oauthBinding);
     } else {
       redirectUrl = urls.authenticate + '?oauth_token=' + oauthBinding.requestToken;
@@ -44,7 +43,7 @@ Oauth._requestHandlers['1'] = function (service, query, res) {
     // token and access token secret and log in as user
 
     // Get the user's request token so we can verify it and clear it
-    var requestToken       = requestTokens[query.state].requestToken;
+    var requestToken = requestTokens[query.state].requestToken;
     var requestTokenSecret = requestTokens[query.state].requestTokenSecret;
     delete requestTokens[query.state];
 
@@ -63,10 +62,10 @@ Oauth._requestHandlers['1'] = function (service, query, res) {
 
       // Add the login result to the result map
       Oauth._loginResultForCredentialToken[query.state] = {
-          serviceName: service.serviceName,
-          serviceData: oauthResult.serviceData,
-          options: oauthResult.options
-        };
+        serviceName: service.serviceName,
+        serviceData: oauthResult.serviceData,
+        options: oauthResult.options
+      };
     }
 
     // Either close the window, redirect, or render nothing

From eda50d2d1ed65ff40f0b85f8dc089d2c50ff6dd9 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Fri, 27 Sep 2013 14:38:47 -0700
Subject: [PATCH 111/335] add history.md note

---
 History.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/History.md b/History.md
index 4154280e35..c8c64063d2 100644
--- a/History.md
+++ b/History.md
@@ -21,6 +21,9 @@
   running on Linux machines with glibc 2.9 or newer (Ubuntu 10.04+, RHEL
   and CentOS 6+, Fedora 10+, Debian 6+).
 
+* Support OAuth1 services that require request token secrets as well as
+  authentication token secrets.  #1253
+
 ## v0.6.5.1
 
 * Fix syntax errors on lines that end with a backslash. #1326

From db03f574a3f77ca73c3f74a6b025cc2d8efdd2b6 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Fri, 27 Sep 2013 14:46:10 -0700
Subject: [PATCH 112/335] Implement Collection.upsert().

Basically the same code as Collection.update(... { upsert: true }) except that
it returns an object with numberAffected and insertedId keys. remove() is back
to returning just the number affected, not an object, so that both update() and
remove() match the mongo api.

Untested.
---
 packages/minimongo/minimongo.js         |  2 +-
 packages/mongo-livedata/collection.js   | 26 ++++++++++++++++++++++---
 packages/mongo-livedata/mongo_driver.js |  2 +-
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index 59cd1be837..95941a7fdc 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -537,7 +537,7 @@ LocalCollection.prototype.remove = function (selector, callback) {
       LocalCollection._recomputeResults(query);
   });
   self._observeQueue.drain();
-  var result = { numberAffected: remove.length };
+  var result = remove.length;
   if (callback)
     Meteor.defer(function () {
       callback(null, result);
diff --git a/packages/mongo-livedata/collection.js b/packages/mongo-livedata/collection.js
index ee6b36a434..77ea20637f 100644
--- a/packages/mongo-livedata/collection.js
+++ b/packages/mongo-livedata/collection.js
@@ -337,13 +337,24 @@ var throwIfSelectorIsNotId = function (selector, methodName) {
 // generating their result until the database has acknowledged
 // them. In the future maybe we should provide a flag to turn this
 // off.
-_.each(["insert", "update", "remove"], function (name) {
+_.each(["insert", "update", "remove", "upsert"], function (name) {
   Meteor.Collection.prototype[name] = function (/* arguments */) {
     var self = this;
     var args = _.toArray(arguments);
     var callback;
     var ret;
 
+    // Calling `Collection.upsert()` is just like calling `Collection.update()`
+    // with upsert: true, except that we return the whole object with
+    // `numberAffected` and `idInserted` keys. So we do the same thing as an
+    // update, except that we save `isUpsert` to determine what to return when
+    // we're done.
+    var isUpsert = false;
+    if (name === "upsert") {
+      isUpsert = true;
+      name = "update";
+    }
+
     if (args.length && args[args.length - 1] instanceof Function)
       callback = args.pop();
 
@@ -364,7 +375,9 @@ _.each(["insert", "update", "remove"], function (name) {
       args[0] = Meteor.Collection._rewriteSelector(args[0]);
 
       if (name === "update") {
-        var options = args[2];
+        var options = _.clone(args[2]);
+        if (isUpsert)
+          options.upsert = true;
         if (options && options.upsert) {
           // set `insertedId` if absent.  `insertedId` is a Meteor extension.
           if (options.insertedId) {
@@ -427,8 +440,15 @@ _.each(["insert", "update", "remove"], function (name) {
         // On updates and removes, return whatever the collection returned; on
         // inserts, always return the id that we generated. If the user provided
         // a callback, then we expect queryRet to be undefined.
-        if (name !== "insert")
+        if (name !== "insert") {
           ret = queryRet;
+          // Upsert updates return an object with the number affected and the
+          // inserted id, but for update queries we only return the number
+          // affected to match the mongo api. Meteor.Collection.upsert() can be
+          // used to return the whole object.
+          if (name === "update" && ! isUpsert)
+            ret = ret.numberAffected;
+        }
       } catch (e) {
         if (callback) {
           callback(e);
diff --git a/packages/mongo-livedata/mongo_driver.js b/packages/mongo-livedata/mongo_driver.js
index 8171ae0d17..149a0fc1bc 100644
--- a/packages/mongo-livedata/mongo_driver.js
+++ b/packages/mongo-livedata/mongo_driver.js
@@ -289,7 +289,7 @@ MongoConnection.prototype._remove = function (collection_name, selector,
   try {
     var collection = self._getCollection(collection_name);
     collection.remove(replaceTypes(selector, replaceMeteorAtomWithMongo),
-                      {safe: true}, numberAffectedCallback(callback));
+                      {safe: true}, callback);
   } catch (e) {
     write.committed();
     throw e;

From ff143f94b77125cf5fd2fd743ffc637afa17ed66 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Fri, 27 Sep 2013 14:58:59 -0700
Subject: [PATCH 113/335] Account for undefined options

---
 packages/mongo-livedata/collection.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/mongo-livedata/collection.js b/packages/mongo-livedata/collection.js
index 77ea20637f..75ade797d8 100644
--- a/packages/mongo-livedata/collection.js
+++ b/packages/mongo-livedata/collection.js
@@ -375,7 +375,7 @@ _.each(["insert", "update", "remove", "upsert"], function (name) {
       args[0] = Meteor.Collection._rewriteSelector(args[0]);
 
       if (name === "update") {
-        var options = _.clone(args[2]);
+        var options = _.clone(args[2]) || {};
         if (isUpsert)
           options.upsert = true;
         if (options && options.upsert) {

From 3177d9ad416ae97a98a2b8c4b2b40a9fc03f6b9c Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Thu, 26 Sep 2013 19:42:16 -0700
Subject: [PATCH 114/335] Use http_proxy environment variable so meteor update
 and deploy work behind an http proxy.

---
 History.md             |  5 +++
 tools/deploy-galaxy.js |  7 ++--
 tools/deploy.js        | 23 +++++-----
 tools/files.js         | 53 -----------------------
 tools/http-helpers.js  | 95 ++++++++++++++++++++++++++++++++++++++++++
 tools/meteor_npm.js    |  3 +-
 tools/updater.js       |  3 +-
 tools/warehouse.js     |  9 ++--
 8 files changed, 125 insertions(+), 73 deletions(-)
 create mode 100644 tools/http-helpers.js

diff --git a/History.md b/History.md
index c8c64063d2..6c2d8769ba 100644
--- a/History.md
+++ b/History.md
@@ -17,6 +17,11 @@
   0.6.5. (A bug prevented the 0.6.5 reimplementation of `register_extension`
   from working properly anyway.)
 
+* Support using an HTTP proxy in the `meteor` command line tool. This
+  allows the `update`, `deploy`, `logs`, and `mongo` commands to work
+  behind a proxy. Use the standard `http_proxy` environment variable to
+  specify your proxy endpoint.  #429, #689, #1338
+
 * Build Linux binaries on an older Linux machine. Meteor now supports
   running on Linux machines with glibc 2.9 or newer (Ubuntu 10.04+, RHEL
   and CentOS 6+, Fedora 10+, Debian 6+).
diff --git a/tools/deploy-galaxy.js b/tools/deploy-galaxy.js
index 12efda1bb2..228fd616ec 100644
--- a/tools/deploy-galaxy.js
+++ b/tools/deploy-galaxy.js
@@ -5,7 +5,7 @@ var fs = require('fs');
 var unipackage = require('./unipackage.js');
 var fiberHelpers = require('./fiber-helpers.js');
 var Fiber = require('fibers');
-var request = require('request');
+var httpHelpers = require('./http-helpers.js');
 var _ = require('underscore');
 
 // a bit of a hack
@@ -90,7 +90,7 @@ exports.discoverGalaxy = function (app) {
 
   // At some point we may want to send a version in the request so that galaxy
   // can respond differently to different versions of meteor.
-  request({
+  httpHelpers.request({
     url: url,
     json: true,
     strictSSL: true,
@@ -210,7 +210,8 @@ exports.deploy = function (options) {
   var fileSize = fs.statSync(starball).size;
   var fileStream = fs.createReadStream(starball);
   var future = new Future;
-  var req = request.put({
+  var req = httpHelpers.request({
+    method: "PUT",
     url: info.put,
     headers: { 'content-length': fileSize,
                'content-type': 'application/octet-stream' },
diff --git a/tools/deploy.js b/tools/deploy.js
index 90e00d0811..caf8ccc627 100644
--- a/tools/deploy.js
+++ b/tools/deploy.js
@@ -7,6 +7,7 @@
 var qs = require('querystring');
 var path = require('path');
 var files = require('./files.js');
+var httpHelpers = require('./http-helpers.js');
 var warehouse = require('./warehouse.js');
 var buildmessage = require('./buildmessage.js');
 var _ = require('underscore');
@@ -43,15 +44,16 @@ var meteor_rpc = function (rpc_name, method, site, query_params, callback) {
     url += '?' + qs.stringify(query_params);
   }
 
-  var request = require('request');
-  var r = request({method: method, url: url}, function (error, response, body) {
-    if (error || ((response.statusCode !== 200)
-                  && (response.statusCode !== 201)))
-      // pass some non-falsy error back to callback
-      callback(error || response.statusCode, body);
-    else
-      callback(null, body);
-  });
+  var r = httpHelpers.request(
+    {method: method, url: url},
+    function (error, response, body) {
+      if (error || ((response.statusCode !== 200)
+                    && (response.statusCode !== 201)))
+        // pass some non-falsy error back to callback
+        callback(error || response.statusCode, body);
+      else
+        callback(null, body);
+    });
 
   return r;
 };
@@ -345,8 +347,7 @@ var with_password = function (site, callback) {
   // Future.throw. Basically, what Future.wrap does.
   callback = inFiber(callback);
 
-  var request = require('request');
-  request(check_url, function (error, response, body) {
+  httpHelpers.request(check_url, function (error, response, body) {
     if (error || response.statusCode !== 200) {
       callback();
 
diff --git a/tools/files.js b/tools/files.js
index 935051ad60..e14b9a311c 100644
--- a/tools/files.js
+++ b/tools/files.js
@@ -436,59 +436,6 @@ _.extend(exports, {
     future.wait();
   },
 
-  // A synchronous wrapper around request(...) that returns the response "body"
-  // or throws.
-  getUrl: function (urlOrOptions, callback) {
-    var future = new Future;
-    // can't just use Future.wrap, because we want to return "body", not
-    // "response".
-
-    urlOrOptions = _.clone(urlOrOptions); // we are going to change it
-    var appVersion;
-    try {
-      appVersion = getToolsVersion();
-    } catch(e) {
-      appVersion = 'checkout';
-    }
-
-    // meteorReleaseContext - an option with information about app directory
-    // release versions, etc, is used to get exact Meteor version used.
-    if (urlOrOptions.hasOwnProperty('meteorReleaseContext')) {
-      // Get meteor app release version: if specified in command line args, take
-      // releaseVersion, if not specified, try global meteor version
-      var meteorReleaseContext = urlOrOptions.meteorReleaseContext;
-      appVersion = meteorReleaseContext.releaseVersion;
-
-      if (appVersion === 'none')
-        appVersion = meteorReleaseContext.appReleaseVersion;
-      if (appVersion === 'none')
-        appVersion = 'checkout';
-
-      delete urlOrOptions.meteorReleaseContext;
-    }
-
-    // Get some kind of User Agent: environment information.
-    var ua = util.format('Meteor/%s OS/%s (%s; %s; %s;)',
-              appVersion, os.platform(), os.type(), os.release(), os.arch());
-
-    var headers = {'User-Agent': ua };
-
-    if (_.isObject(urlOrOptions))
-      urlOrOptions.headers = _.extend(headers, urlOrOptions.headers);
-    else
-      urlOrOptions = { url: urlOrOptions, headers: headers };
-
-    var request = require('request');
-    request(urlOrOptions, function (error, response, body) {
-      if (error)
-        future.throw(new files.OfflineError(error));
-      else if (response.statusCode >= 400 && response.statusCode < 600)
-        future.throw(response);
-      else
-        future.return(body);
-    });
-    return future.wait();
-  },
 
   // Use this if you'd like to replace a directory with another directory as
   // close to atomically as possible. It's better than recursively deleting the
diff --git a/tools/http-helpers.js b/tools/http-helpers.js
new file mode 100644
index 0000000000..68e8279a56
--- /dev/null
+++ b/tools/http-helpers.js
@@ -0,0 +1,95 @@
+///
+/// utility functions for dealing with urls and http
+///
+
+var os = require('os');
+var util = require('util');
+
+var _ = require('underscore');
+var request = require('request');
+var Future = require('fibers/future');
+
+var files = require('./files.js');
+
+
+var httpHelpers = exports;
+_.extend(exports, {
+
+  // A wrapper around request that sets http proxy.
+  request: function (urlOrOptions, callback) {
+
+    if (!_.isObject(urlOrOptions))
+      urlOrOptions = { url: urlOrOptions };
+
+    var url = urlOrOptions.url;
+
+    // try to get proxy from environment
+    var proxy = process.env.HTTP_PROXY || process.env.http_proxy || null;
+    // if we're going to an https url, try the https_proxy env variable first.
+    if (/^https/i.test(url)) {
+      proxy = process.env.HTTPS_PROXY || process.env.https_proxy || proxy;
+    }
+    if (proxy && !urlOrOptions.proxy) {
+      urlOrOptions.proxy = proxy;
+    }
+
+    return request(urlOrOptions, callback);
+  },
+
+
+
+  // A synchronous wrapper around request(...) that returns the response "body"
+  // or throws.
+  getUrl: function (urlOrOptions, callback) {
+    var future = new Future;
+    // can't just use Future.wrap, because we want to return "body", not
+    // "response".
+
+    urlOrOptions = _.clone(urlOrOptions); // we are going to change it
+    var appVersion;
+    try {
+      appVersion = files.getToolsVersion();
+    } catch(e) {
+      appVersion = 'checkout';
+    }
+
+    // meteorReleaseContext - an option with information about app directory
+    // release versions, etc, is used to get exact Meteor version used.
+    if (urlOrOptions.hasOwnProperty('meteorReleaseContext')) {
+      // Get meteor app release version: if specified in command line args, take
+      // releaseVersion, if not specified, try global meteor version
+      var meteorReleaseContext = urlOrOptions.meteorReleaseContext;
+      appVersion = meteorReleaseContext.releaseVersion;
+
+      if (appVersion === 'none')
+        appVersion = meteorReleaseContext.appReleaseVersion;
+      if (appVersion === 'none')
+        appVersion = 'checkout';
+
+      delete urlOrOptions.meteorReleaseContext;
+    }
+
+    // Get some kind of User Agent: environment information.
+    var ua = util.format('Meteor/%s OS/%s (%s; %s; %s;)',
+              appVersion, os.platform(), os.type(), os.release(), os.arch());
+
+    var headers = {'User-Agent': ua };
+
+    if (_.isObject(urlOrOptions))
+      urlOrOptions.headers = _.extend(headers, urlOrOptions.headers);
+    else
+      urlOrOptions = { url: urlOrOptions, headers: headers };
+
+    httpHelpers.request(urlOrOptions, function (error, response, body) {
+      if (error)
+        future.throw(new files.OfflineError(error));
+      else if (response.statusCode >= 400 && response.statusCode < 600)
+        future.throw(response);
+      else
+        future.return(body);
+    });
+    return future.wait();
+  }
+
+
+});
diff --git a/tools/meteor_npm.js b/tools/meteor_npm.js
index 67fb840d33..b70a6c3ca2 100644
--- a/tools/meteor_npm.js
+++ b/tools/meteor_npm.js
@@ -10,6 +10,7 @@ var path = require('path');
 var fs = require('fs');
 var cleanup = require(path.join(__dirname, 'cleanup.js'));
 var files = require(path.join(__dirname, 'files.js'));
+var httpHelpers = require('./http-helpers.js');
 var buildmessage = require('./buildmessage.js');
 var _ = require('underscore');
 
@@ -491,7 +492,7 @@ _.extend(exports, {
   // dependencies. `npm install` times out after more than a minute.
   _ensureConnected: function () {
     try {
-      files.getUrl("http://registry.npmjs.org");
+      httpHelpers.getUrl("http://registry.npmjs.org");
     } catch (e) {
       buildmessage.error("Can't install npm dependencies. " +
                          "Are you connected to the internet?");
diff --git a/tools/updater.js b/tools/updater.js
index 0369ba5ee9..368c95452c 100644
--- a/tools/updater.js
+++ b/tools/updater.js
@@ -6,6 +6,7 @@ var testingUpdater = false;
 var inFiber = require('./fiber-helpers.js').inFiber;
 var files = require('./files.js');
 var warehouse = require('./warehouse.js');
+var httpHelpers = require('./http-helpers.js');
 
 var manifestUrl = testingUpdater
       ? 'https://s3.amazonaws.com/com.meteor.static/test/update/manifest.json'
@@ -21,7 +22,7 @@ exports.getManifest = function (context) {
   if (context)
     options.meteorReleaseContext = context;
 
-  return files.getUrl(options);
+  return httpHelpers.getUrl(options);
 };
 
 exports.startUpdateChecks = function (context) {
diff --git a/tools/warehouse.js b/tools/warehouse.js
index 91e47b3311..d2ea01838e 100644
--- a/tools/warehouse.js
+++ b/tools/warehouse.js
@@ -28,6 +28,7 @@ var _ = require("underscore");
 
 var files = require('./files.js');
 var updater = require('./updater.js');
+var httpHelpers = require('./http-helpers.js');
 var fiberHelpers = require('./fiber-helpers.js');
 var logging = require('./logging.js');
 
@@ -235,7 +236,7 @@ _.extend(warehouse, {
     // after we're done writing packages
     if (!releaseAlreadyExists) {
       try {
-        releaseManifestText = files.getUrl(
+        releaseManifestText = httpHelpers.getUrl(
           WAREHOUSE_URLBASE + "/releases/" + releaseVersion + ".release.json");
       } catch (e) {
         // just throw, if we're in the background anyway, or if this is the
@@ -303,7 +304,7 @@ _.extend(warehouse, {
       // try getting the releases's notices. only blessed releases have one, so
       // if we can't find it just proceed.
       try {
-        var notices = files.getUrl(
+        var notices = httpHelpers.getUrl(
           WAREHOUSE_URLBASE + "/releases/" + releaseVersion + ".notices.json");
 
         // Real notices are valid JSON.
@@ -347,7 +348,7 @@ _.extend(warehouse, {
           "meteor-tools-" + toolsVersion + "-" + platform + ".tar.gz";
     var toolsTarballPath = "/tools/" + toolsVersion + "/"
           + toolsTarballFilename;
-    var toolsTarball = files.getUrl({
+    var toolsTarball = httpHelpers.getUrl({
       url: WAREHOUSE_URLBASE + toolsTarballPath,
       encoding: null
     });
@@ -430,7 +431,7 @@ _.extend(warehouse, {
               "/" + version +
               "/" + name + '-' + version + "-" + platform + ".tar.gz";
 
-        var tarball = files.getUrl({url: packageUrl, encoding: null});
+        var tarball = httpHelpers.getUrl({url: packageUrl, encoding: null});
         files.extractTarGz(tarball, packageDir);
         if (!dontWriteFreshFile)
           fs.writeFileSync(warehouse.getPackageFreshFile(name, version), '');

From bc3ea63752a7f7d94efd35c0265f34a9a646639b Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Fri, 27 Sep 2013 15:10:18 -0700
Subject: [PATCH 115/335] Make sure our mutated options object makes into the
 actual collection method

---
 packages/mongo-livedata/collection.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/mongo-livedata/collection.js b/packages/mongo-livedata/collection.js
index 75ade797d8..dd73418b35 100644
--- a/packages/mongo-livedata/collection.js
+++ b/packages/mongo-livedata/collection.js
@@ -375,7 +375,8 @@ _.each(["insert", "update", "remove", "upsert"], function (name) {
       args[0] = Meteor.Collection._rewriteSelector(args[0]);
 
       if (name === "update") {
-        var options = _.clone(args[2]) || {};
+        // Mutate args but copy the original options object.
+        var options = args[2] = _.clone(args[2]) || {};
         if (isUpsert)
           options.upsert = true;
         if (options && options.upsert) {

From 2b082db1a8a1d2d13bca11eec1c9e7c9b17658d6 Mon Sep 17 00:00:00 2001
From: David Greenspan <dgreenspan@alum.mit.edu>
Date: Fri, 27 Sep 2013 14:55:46 -0700
Subject: [PATCH 116/335] adjust tests for API

---
 .../mongo-livedata/mongo_livedata_tests.js    | 189 ++++++++++--------
 1 file changed, 110 insertions(+), 79 deletions(-)

diff --git a/packages/mongo-livedata/mongo_livedata_tests.js b/packages/mongo-livedata/mongo_livedata_tests.js
index 277f26ec0e..ae44683cd4 100644
--- a/packages/mongo-livedata/mongo_livedata_tests.js
+++ b/packages/mongo-livedata/mongo_livedata_tests.js
@@ -203,12 +203,12 @@ Tinytest.addAsync("mongo-livedata - basics, " + idGeneration, function (test, on
 
   expectObserve('', function () {
     var count = coll.update({run: run, x: -1}, {$inc: {x: 2}}, {multi: true});
-    test.equal(count, { numberAffected: 0 });
+    test.equal(count, 0);
   });
 
   expectObserve('c(3,0,1)c(6,1,4)', function () {
     var count = coll.update({run: run}, {$inc: {x: 2}}, {multi: true});
-    test.equal(count, { numberAffected: 2 });
+    test.equal(count, 2);
     test.equal(_.pluck(coll.find({run: run}, {sort: {x: -1}}).fetch(), "x"),
                [6, 3]);
   });
@@ -222,7 +222,7 @@ Tinytest.addAsync("mongo-livedata - basics, " + idGeneration, function (test, on
 
   expectObserve('r(13,1)', function () {
     var count = coll.remove({run: run, x: {$gt: 10}});
-    test.equal(count, { numberAffected: 1 });
+    test.equal(count, 1);
     test.equal(coll.find({run: run}).count(), 1);
   });
 
@@ -233,7 +233,7 @@ Tinytest.addAsync("mongo-livedata - basics, " + idGeneration, function (test, on
 
   expectObserve('', function () {
     var count = coll.remove({run: run});
-    test.equal(count, { numberAffected: 0 });
+    test.equal(count, 0);
     test.equal(coll.find({run: run}).count(), 0);
   });
 
@@ -820,12 +820,11 @@ if (Meteor.isServer) {
 
     coll.insert({ foo: "bar" });
     coll.insert({ foo: "baz" });
-    test.equal(coll.update({}, { $set: { foo: "qux" } }, { multi: true }), {
-      numberAffected: 2
-    });
+    test.equal(coll.update({}, { $set: { foo: "qux" } }, { multi: true }),
+               2);
     coll.update({}, { $set: { foo: "quux" } }, { multi: true }, function (err, result) {
       test.isFalse(err);
-      test.equal(result, { numberAffected: 2 });
+      test.equal(result, 2);
       onComplete();
     });
   });
@@ -836,12 +835,12 @@ if (Meteor.isServer) {
 
     coll.insert({ foo: "bar" });
     coll.insert({ foo: "baz" });
-    test.equal(coll.remove({}), { numberAffected: 2 });
+    test.equal(coll.remove({}), 2);
     coll.insert({ foo: "bar" });
     coll.insert({ foo: "baz" });
     coll.remove({}, function (err, result) {
       test.isFalse(err);
-      test.equal(result, { numberAffected: 2 });
+      test.equal(result, 2);
       onComplete();
     });
   });
@@ -918,86 +917,118 @@ if (Meteor.isServer) {
 } // end Meteor.isServer
 
 _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
-  Tinytest.addAsync("mongo-livedata - upsert " + (minimongo ? "minimongo" : "") + ", " + idGeneration, function (test, onComplete) {
-    var run = test.runId();
-    var options = collectionOptions;
-    if (minimongo)
-      options = _.extend({}, collectionOptions, { connection: null });
-    var coll = new Meteor.Collection("livedata_upsert_collection_"+run, options);
+  _.each([true, false], function (useUpdate) {
+    Tinytest.addAsync("mongo-livedata - " + (useUpdate ? "update " : "") + "upsert " + (minimongo ? "minimongo" : "") + ", " + idGeneration, function (test, onComplete) {
+      var upsert = function (query, mod, options) {
+        if (useUpdate)
+          return { numberAffected:
+                   coll.update(query, mod,
+                                     _.extend({ upsert: true }, options)) };
+        else
+          return coll.upsert(query, mod, options);
+      };
+      var stripId = function (obj) {
+        delete obj._id;
+      };
+      var compareResults = function (actual, expected) {
+        if (useUpdate) {
+          actual = _.map(actual, stripId);
+          expected = _.map(expected, stripId);
+        }
+        test.equal(actual, expected);
+      };
 
-    var result1 = coll.update({foo: 'bar'}, {foo: 'bar'}, {upsert: true});
-    test.equal(result1.numberAffected, 1);
-    test.isTrue(result1.insertedId);
-    test.equal(coll.find().fetch(), [{foo: 'bar', _id: result1.insertedId}]);
+      var run = test.runId();
+      var options = collectionOptions;
+      if (minimongo)
+        options = _.extend({}, collectionOptions, { connection: null });
+      var coll = new Meteor.Collection("livedata_upsert_collection_"+run, options);
 
-    var result2 = coll.update({foo: 'bar'}, {foo: 'baz'}, {upsert: true});
-    test.equal(result2.numberAffected, 1);
-    test.isFalse(result2.insertedId);
-    test.equal(coll.find().fetch(), [{foo: 'baz', _id: result1.insertedId}]);
+      var result1 = upsert({foo: 'bar'}, {foo: 'bar'});
+      test.equal(result1.numberAffected, 1);
+      if (! useUpdate)
+        test.isTrue(result1.insertedId);
+      compareResults(coll.find().fetch(), [{foo: 'bar', _id: result1.insertedId}]);
 
-    coll.remove({});
+      var result2 = upsert({foo: 'bar'}, {foo: 'baz'});
+      test.equal(result2.numberAffected, 1);
+      if (! useUpdate)
+        test.isFalse(result2.insertedId);
+      compareResults(coll.find().fetch(), [{foo: 'baz', _id: result1.insertedId}]);
 
-    // Test values that require transformation to go into Mongo:
+      coll.remove({});
 
-    var t1 = new Meteor.Collection.ObjectID();
-    var t2 = new Meteor.Collection.ObjectID();
-    var result3 = coll.update({foo: t1}, {foo: t1}, {upsert: true});
-    test.equal(result3.numberAffected, 1);
-    test.isTrue(result3.insertedId);
-    test.equal(coll.find().fetch(), [{foo: t1, _id: result3.insertedId}]);
+      // Test values that require transformation to go into Mongo:
 
-    var result4 = coll.update({foo: t1}, {foo: t2}, {upsert: true});
-    test.equal(result2.numberAffected, 1);
-    test.isFalse(result2.insertedId);
-    test.equal(coll.find().fetch(), [{foo: t2, _id: result3.insertedId}]);
+      var t1 = new Meteor.Collection.ObjectID();
+      var t2 = new Meteor.Collection.ObjectID();
+      var result3 = upsert({foo: t1}, {foo: t1});
+      test.equal(result3.numberAffected, 1);
+      if (! useUpdate)
+        test.isTrue(result3.insertedId);
+      compareResults(coll.find().fetch(), [{foo: t1, _id: result3.insertedId}]);
 
-    coll.remove({});
+      var result4 = upsert({foo: t1}, {foo: t2});
+      test.equal(result2.numberAffected, 1);
+      if (! useUpdate)
+        test.isFalse(result2.insertedId);
+      compareResults(coll.find().fetch(), [{foo: t2, _id: result3.insertedId}]);
 
-    // Test modification
+      coll.remove({});
 
-    var result5 = coll.update({name: 'David'}, {$set: {foo: 1}}, {upsert: true});
-    test.equal(result5.numberAffected, 1);
-    test.isTrue(result5.insertedId);
-    var davidId = result5.insertedId;
-    test.equal(coll.find().fetch(), [{name: 'David', foo: 1, _id: davidId}]);
+      // Test modification
 
-    test.throws(function () {
-      // test that bad modifier fails fast
-      coll.update({name: 'David'}, {$blah: {foo: 2}}, {upsert: true});
+      var result5 = upsert({name: 'David'}, {$set: {foo: 1}});
+      test.equal(result5.numberAffected, 1);
+      if (! useUpdate)
+        test.isTrue(result5.insertedId);
+      var davidId = result5.insertedId;
+      compareResults(coll.find().fetch(), [{name: 'David', foo: 1, _id: davidId}]);
+
+      test.throws(function () {
+        // test that bad modifier fails fast
+        upsert({name: 'David'}, {$blah: {foo: 2}});
+      });
+
+
+      var result6 = upsert({name: 'David'}, {$set: {foo: 2}});
+      test.equal(result6.numberAffected, 1);
+      if (! useUpdate)
+        test.isFalse(result6.insertedId);
+      compareResults(coll.find().fetch(), [{name: 'David', foo: 2,
+                                        _id: result5.insertedId}]);
+
+      var emilyId = coll.insert({name: 'Emily', foo: 2});
+      compareResults(coll.find().fetch(), [{name: 'David', foo: 2, _id: davidId},
+                                           {name: 'Emily', foo: 2, _id: emilyId}]);
+
+      // multi update by upsert
+      var result7 = upsert({foo: 2},
+                           {$set: {bar: 7},
+                            $setOnInsert: {name: 'Fred', foo: 2}},
+                           {multi: true});
+      test.equal(result7.numberAffected, 2);
+      if (! useUpdate)
+        test.isFalse(result7.insertedId);
+      compareResults(coll.find().fetch(), [{name: 'David', foo: 2, bar: 7, _id: davidId},
+                                           {name: 'Emily', foo: 2, bar: 7, _id: emilyId}]);
+
+      // insert by multi upsert
+      var result8 = upsert({foo: 3},
+                           {$set: {bar: 7},
+                            $setOnInsert: {name: 'Fred', foo: 2}},
+                           {multi: true});
+      test.equal(result8.numberAffected, 1);
+      if (! useUpdate)
+        test.isTrue(result8.insertedId);
+      var fredId = result8.insertedId;
+      compareResults(coll.find().fetch(),
+                     [{name: 'David', foo: 2, bar: 7, _id: davidId},
+                      {name: 'Emily', foo: 2, bar: 7, _id: emilyId},
+                      {name: 'Fred', foo: 2, bar: 7, _id: fredId}]);
+
+      onComplete();
     });
-
-
-    var result6 = coll.update({name: 'David'}, {$set: {foo: 2}}, {upsert: true});
-    test.equal(result6.numberAffected, 1);
-    test.isFalse(result6.insertedId);
-    test.equal(coll.find().fetch(), [{name: 'David', foo: 2,
-                                      _id: result5.insertedId}]);
-
-    var emilyId = coll.insert({name: 'Emily', foo: 2});
-    test.equal(coll.find().fetch(), [{name: 'David', foo: 2, _id: davidId},
-                                     {name: 'Emily', foo: 2, _id: emilyId}]);
-
-    // multi update by upsert
-    var result7 = coll.update({foo: 2},
-                              {$set: {bar: 7}, $setOnInsert: {name: 'Fred', foo: 2}},
-                              {upsert: true, multi: true});
-    test.equal(result7.numberAffected, 2);
-    test.isFalse(result7.insertedId);
-    test.equal(coll.find().fetch(), [{name: 'David', foo: 2, bar: 7, _id: davidId},
-                                     {name: 'Emily', foo: 2, bar: 7, _id: emilyId}]);
-
-    // insert by multi upsert
-    var result8 = coll.update({foo: 3},
-                              {$set: {bar: 7}, $setOnInsert: {name: 'Fred', foo: 2}},
-                              {upsert: true, multi: true});
-    test.equal(result8.numberAffected, 1);
-    test.isTrue(result8.insertedId);
-    var fredId = result8.insertedId;
-    test.equal(coll.find().fetch(), [{name: 'David', foo: 2, bar: 7, _id: davidId},
-                                     {name: 'Emily', foo: 2, bar: 7, _id: emilyId},
-                                     {name: 'Fred', foo: 2, bar: 7, _id: fredId}]);
-
-    onComplete();
   });
 });
 

From e56428dceba6d51f3ce6aaaef552e1eff8dcef6b Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Fri, 27 Sep 2013 16:06:28 -0700
Subject: [PATCH 117/335] Make sure we provide the right return value for
 callbacks also.

Also, don't mutate `name` to "update" from "upsert"; the function closes over it
so all subsequent calls will start with name "update".
---
 packages/mongo-livedata/collection.js | 62 ++++++++++++++-------------
 1 file changed, 32 insertions(+), 30 deletions(-)

diff --git a/packages/mongo-livedata/collection.js b/packages/mongo-livedata/collection.js
index dd73418b35..32cbca3dd5 100644
--- a/packages/mongo-livedata/collection.js
+++ b/packages/mongo-livedata/collection.js
@@ -343,6 +343,7 @@ _.each(["insert", "update", "remove", "upsert"], function (name) {
     var args = _.toArray(arguments);
     var callback;
     var ret;
+    var methodName = name;
 
     // Calling `Collection.upsert()` is just like calling `Collection.update()`
     // with upsert: true, except that we return the whole object with
@@ -350,15 +351,15 @@ _.each(["insert", "update", "remove", "upsert"], function (name) {
     // update, except that we save `isUpsert` to determine what to return when
     // we're done.
     var isUpsert = false;
-    if (name === "upsert") {
+    if (methodName === "upsert") {
       isUpsert = true;
-      name = "update";
+      methodName = "update";
     }
 
     if (args.length && args[args.length - 1] instanceof Function)
       callback = args.pop();
 
-    if (name === "insert") {
+    if (methodName === "insert") {
       if (!args.length)
         throw new Error("insert requires an argument");
       // shallow-copy the document and generate an ID
@@ -374,7 +375,7 @@ _.each(["insert", "update", "remove", "upsert"], function (name) {
     } else {
       args[0] = Meteor.Collection._rewriteSelector(args[0]);
 
-      if (name === "update") {
+      if (methodName === "update") {
         // Mutate args but copy the original options object.
         var options = args[2] = _.clone(args[2]) || {};
         if (isUpsert)
@@ -392,17 +393,28 @@ _.each(["insert", "update", "remove", "upsert"], function (name) {
       }
     }
 
+    // On inserts, always return the id that we generated. On updates and
+    // removes, return the number of documents we affected. On upsert(), return
+    // the whole object that the collection returns on update (with the number
+    // affected and insertedId).
+    var transformResultFromCollection = function (result) {
+      if (methodName === "insert") {
+        return ret;
+      } else if (methodName === "update" && ! isUpsert) {
+        if (result)
+          return result.numberAffected;
+        else
+          return undefined;
+      } else {
+        return result;
+      }
+    };
+
     var wrappedCallback;
     if (callback) {
-      if (name === "insert") {
-        // On inserts, always return the id that we generated.
-        wrappedCallback = function (error, result) {
-          callback(error, !error && ret);
-        };
-      } else {
-        // For updates and removes, return whatever the collection returned.
-        wrappedCallback = callback;
-      }
+      wrappedCallback = function (error, result) {
+        callback(error, ! error && transformResultFromCollection(result));
+      };
     }
 
     if (self._connection && self._connection !== Meteor.server) {
@@ -417,39 +429,29 @@ _.each(["insert", "update", "remove", "upsert"], function (name) {
         // down.
         wrappedCallback = function (err) {
           if (err)
-            Meteor._debug(name + " failed: " + (err.reason || err.stack));
+            Meteor._debug(methodName + " failed: " + (err.reason || err.stack));
         };
       }
 
       var enclosing = DDP._CurrentInvocation.get();
       var alreadyInSimulation = enclosing && enclosing.isSimulation;
-      if (!alreadyInSimulation && name !== "insert") {
+      if (!alreadyInSimulation && methodName !== "insert") {
         // If we're about to actually send an RPC, we should throw an error if
         // this is a non-ID selector, because the mutation methods only allow
         // single-ID selectors. (If we don't throw here, we'll see flicker.)
-        throwIfSelectorIsNotId(args[0], name);
+        throwIfSelectorIsNotId(args[0], methodName);
       }
 
-      self._connection.apply(self._prefix + name, args, wrappedCallback);
+      self._connection.apply(self._prefix + methodName, args, wrappedCallback);
 
     } else {
       // it's my collection.  descend into the collection object
       // and propagate any exception.
       args.push(wrappedCallback);
       try {
-        var queryRet = self._collection[name].apply(self._collection, args);
-        // On updates and removes, return whatever the collection returned; on
-        // inserts, always return the id that we generated. If the user provided
-        // a callback, then we expect queryRet to be undefined.
-        if (name !== "insert") {
-          ret = queryRet;
-          // Upsert updates return an object with the number affected and the
-          // inserted id, but for update queries we only return the number
-          // affected to match the mongo api. Meteor.Collection.upsert() can be
-          // used to return the whole object.
-          if (name === "update" && ! isUpsert)
-            ret = ret.numberAffected;
-        }
+        // If the user provided a callback, then we expect queryRet to be undefined.
+        var queryRet = self._collection[methodName].apply(self._collection, args);
+        ret = transformResultFromCollection(queryRet);
       } catch (e) {
         if (callback) {
           callback(e);

From 2b4d4974fa1a54afa74886a98b1f832138c3ed64 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Fri, 27 Sep 2013 16:07:55 -0700
Subject: [PATCH 118/335] Update minimongo tests to new api.

All tests pass now, but we've got the unfortunate situation that the
LocalCollection return values don't match the Meteor.Collection return values,
which is problematic because the minimongo tests use LocalCollection
directly. Hmm.
---
 packages/minimongo/minimongo_tests.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/minimongo/minimongo_tests.js b/packages/minimongo/minimongo_tests.js
index a996207b0c..8df21830bf 100644
--- a/packages/minimongo/minimongo_tests.js
+++ b/packages/minimongo/minimongo_tests.js
@@ -105,11 +105,11 @@ Tinytest.add("minimongo - basics", function (test) {
   c.remove({_id: false});
   c.remove({_id: undefined});
   count = c.remove();
-  test.equal(count, { numberAffected: 0 });
+  test.equal(count, 0);
   test.equal(c.find().count(), 4);
 
   count = c.remove({});
-  test.equal(count, { numberAffected: 4 });
+  test.equal(count, 4);
   test.equal(c.find().count(), 0);
 
   c.insert({_id: 1, name: "strawberry", tags: ["fruit", "red", "squishy"]});

From d4d7ebb78318ff74a45d5c08662ca08091654560 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Mon, 23 Sep 2013 16:35:37 -0700
Subject: [PATCH 119/335] Implements ES5-style callbacks for cursor forEach and
 map.

Fixes #63.

Based on iwoj's PR.

Needs tests and docs.
---
 packages/minimongo/minimongo.js         | 14 +++---
 packages/mongo-livedata/mongo_driver.js | 60 ++++++++++++++-----------
 2 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index 7fb03f7810..7a00b71e2d 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -140,9 +140,8 @@ LocalCollection.prototype.findOne = function (selector, options) {
   return this.find(selector, options).fetch()[0];
 };
 
-LocalCollection.Cursor.prototype.forEach = function (callback) {
+LocalCollection.Cursor.prototype.forEach = function (callback, thisArg) {
   var self = this;
-  var doc;
 
   if (self.db_objects === null)
     self.db_objects = self._getRawObjects(true);
@@ -155,12 +154,13 @@ LocalCollection.Cursor.prototype.forEach = function (callback) {
       movedBefore: true});
 
   while (self.cursor_pos < self.db_objects.length) {
-    var elt = EJSON.clone(self.db_objects[self.cursor_pos++]);
+    var elt = EJSON.clone(self.db_objects[self.cursor_pos]);
     if (self.projection_f)
       elt = self.projection_f(elt);
     if (self._transform)
       elt = self._transform(elt);
-    callback(elt);
+    callback.call(thisArg, elt, self.cursor_pos, self);
+    ++self.cursor_pos;
   }
 };
 
@@ -169,11 +169,11 @@ LocalCollection.Cursor.prototype.getTransform = function () {
   return self._transform;
 };
 
-LocalCollection.Cursor.prototype.map = function (callback) {
+LocalCollection.Cursor.prototype.map = function (callback, thisArg) {
   var self = this;
   var res = [];
-  self.forEach(function (doc) {
-    res.push(callback(doc));
+  self.forEach(function (doc, index) {
+    res.push(callback.call(thisArg, doc, index, self));
   });
   return res;
 };
diff --git a/packages/mongo-livedata/mongo_driver.js b/packages/mongo-livedata/mongo_driver.js
index deda9b9d48..aaf9d3022f 100644
--- a/packages/mongo-livedata/mongo_driver.js
+++ b/packages/mongo-livedata/mongo_driver.js
@@ -437,9 +437,15 @@ _.each(['forEach', 'map', 'rewind', 'fetch', 'count'], function (method) {
     if (self._cursorDescription.options.tailable)
       throw new Error("Cannot call " + method + " on a tailable cursor");
 
-    if (!self._synchronousCursor)
+    if (!self._synchronousCursor) {
       self._synchronousCursor = self._mongo._createSynchronousCursor(
-        self._cursorDescription, true);
+        self._cursorDescription, {
+          // Make sure that the "self" argument to forEach/map callbacks is the
+          // Cursor, not the SynchronousCursor.
+          selfForIteration: self,
+          useTransform: true
+        });
+    }
 
     return self._synchronousCursor[method].apply(
       self._synchronousCursor, arguments);
@@ -481,20 +487,21 @@ Cursor.prototype.observeChanges = function (callbacks) {
     self._cursorDescription, ordered, callbacks);
 };
 
-MongoConnection.prototype._createSynchronousCursor = function(cursorDescription,
-                                                              useTransform) {
+MongoConnection.prototype._createSynchronousCursor = function(
+    cursorDescription, options) {
   var self = this;
+  options = _.pick(options || {}, 'selfForIteration', 'useTransform');
 
   var collection = self._getCollection(cursorDescription.collectionName);
-  var options = cursorDescription.options;
+  var cursorOptions = cursorDescription.options;
   var mongoOptions = {
-    sort: options.sort,
-    limit: options.limit,
-    skip: options.skip
+    sort: cursorOptions.sort,
+    limit: cursorOptions.limit,
+    skip: cursorOptions.skip
   };
 
   // Do we want a tailable cursor (which only works on capped collections)?
-  if (options.tailable) {
+  if (cursorOptions.tailable) {
     // We want a tailable cursor...
     mongoOptions.tailable = true;
     // ... and for the server to wait a bit if any getMore has no data (rather
@@ -507,16 +514,21 @@ MongoConnection.prototype._createSynchronousCursor = function(cursorDescription,
 
   var dbCursor = collection.find(
     replaceTypes(cursorDescription.selector, replaceMeteorAtomWithMongo),
-    options.fields, mongoOptions);
+    cursorOptions.fields, mongoOptions);
 
-  return new SynchronousCursor(dbCursor, cursorDescription, useTransform);
+  return new SynchronousCursor(dbCursor, cursorDescription, options);
 };
 
-var SynchronousCursor = function (dbCursor, cursorDescription, useTransform) {
+var SynchronousCursor = function (dbCursor, cursorDescription, options) {
   var self = this;
+  options = _.pick(options || {}, 'selfForIteration', 'useTransform');
+
   self._dbCursor = dbCursor;
   self._cursorDescription = cursorDescription;
-  if (useTransform && cursorDescription.options.transform) {
+  // The "self" argument passed to forEach/map callbacks. If we're wrapped
+  // inside a user-visible Cursor, we want to provide the outer cursor!
+  self._selfForIteration = options.selfForIteration || self;
+  if (options.useTransform && cursorDescription.options.transform) {
     self._transform = Deps._makeNonreactive(
       cursorDescription.options.transform
     );
@@ -558,29 +570,26 @@ _.extend(SynchronousCursor.prototype, {
     }
   },
 
-  // XXX Make more like ECMA forEach:
-  //     https://github.com/meteor/meteor/pull/63#issuecomment-5320050
-  forEach: function (callback) {
+  forEach: function (callback, thisArg) {
     var self = this;
 
     // We implement the loop ourself instead of using self._dbCursor.each,
     // because "each" will call its callback outside of a fiber which makes it
     // much more complex to make this function synchronous.
+    var index = 0;
     while (true) {
       var doc = self._nextObject();
       if (!doc) return;
-      callback(doc);
+      callback.call(thisArg, doc, index++, self._selfForIteration);
     }
   },
 
-  // XXX Make more like ECMA map:
-  //     https://github.com/meteor/meteor/pull/63#issuecomment-5320050
   // XXX Allow overlapping callback executions if callback yields.
-  map: function (callback) {
+  map: function (callback, thisArg) {
     var self = this;
     var res = [];
-    self.forEach(function (doc) {
-      res.push(callback(doc));
+    self.forEach(function (doc, index) {
+      res.push(callback.call(thisArg, doc, index, self._selfForIteration));
     });
     return res;
   },
@@ -892,7 +901,7 @@ _.extend(LiveResultsSet.prototype, {
       self._synchronousCursor.rewind();
     } else {
       self._synchronousCursor = self._mongoHandle._createSynchronousCursor(
-        self._cursorDescription, false /* !useTransform */);
+        self._cursorDescription);
     }
     var newResults = self._synchronousCursor.getRawObjects(self._ordered);
     var oldResults = self._results;
@@ -1020,8 +1029,7 @@ MongoConnection.prototype._observeChangesTailable = function (
                     + " tailable cursor without a "
                     + (ordered ? "addedBefore" : "added") + " callback");
   }
-  var cursor = self._createSynchronousCursor(cursorDescription,
-                                            false /* useTransform */);
+  var cursor = self._createSynchronousCursor(cursorDescription);
 
   var stopped = false;
   var lastTS = undefined;
@@ -1063,7 +1071,7 @@ MongoConnection.prototype._observeChangesTailable = function (
         cursor = self._createSynchronousCursor(new CursorDescription(
           cursorDescription.collectionName,
           newSelector,
-          cursorDescription.options), false /* useTransform */);
+          cursorDescription.options));
       }
     }
   });

From 3e1afb78501dcade1a57c71d7acc821939ee8122 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Mon, 23 Sep 2013 17:44:34 -0700
Subject: [PATCH 120/335] Tests for extra forEach/map arguments.

---
 packages/minimongo/minimongo_tests.js         | 15 ++++++++++++---
 .../mongo-livedata/mongo_livedata_tests.js    | 19 +++++++++++++++----
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/packages/minimongo/minimongo_tests.js b/packages/minimongo/minimongo_tests.js
index 5f19e703e0..6248c99825 100644
--- a/packages/minimongo/minimongo_tests.js
+++ b/packages/minimongo/minimongo_tests.js
@@ -180,16 +180,25 @@ Tinytest.add("minimongo - cursors", function (test) {
 
   // forEach
   var count = 0;
-  q.forEach(function (obj) {
+  var context = {};
+  q.forEach(function (obj, i, cursor) {
     test.equal(obj.i, count++);
-  });
+    test.equal(obj.i, i);
+    test.isTrue(context === this);
+    test.isTrue(cursor === q);
+  }, context);
   test.equal(count, 20);
   // everything empty
   test.length(q.fetch(), 0);
   q.rewind();
 
   // map
-  res = q.map(function (obj) { return obj.i * 2; });
+  res = q.map(function (obj, i, cursor) {
+    test.equal(obj.i, i);
+    test.isTrue(context === this);
+    test.isTrue(cursor === q);
+    return obj.i * 2;
+  }, context);
   test.length(res, 20);
   for (var i = 0; i < 20; i++)
     test.equal(res[i], i * 2);
diff --git a/packages/mongo-livedata/mongo_livedata_tests.js b/packages/mongo-livedata/mongo_livedata_tests.js
index 64a23991ee..4b8a75fdf8 100644
--- a/packages/mongo-livedata/mongo_livedata_tests.js
+++ b/packages/mongo-livedata/mongo_livedata_tests.js
@@ -176,7 +176,12 @@ Tinytest.addAsync("mongo-livedata - basics, " + idGeneration, function (test, on
 
   var cur = coll.find({run: run}, {sort: ["x"]});
   var total = 0;
-  cur.forEach(function (doc) {
+  var index = 0;
+  var context = {};
+  cur.forEach(function (doc, i, cursor) {
+    test.equal(i, index++);
+    test.isTrue(cursor === cur);
+    test.isTrue(context === this);
     total *= 10;
     if (Meteor.isServer) {
       // Verify that the callbacks from forEach run sequentially and that
@@ -190,13 +195,19 @@ Tinytest.addAsync("mongo-livedata - basics, " + idGeneration, function (test, on
     total += doc.x;
     // verify the meteor environment is set up here
     coll2.insert({total:total});
-  });
+  }, context);
   test.equal(total, 14);
 
   cur.rewind();
-  test.equal(cur.map(function (doc) {
+  index = 0;
+  test.equal(cur.map(function (doc, i, cursor) {
+    // XXX we could theoretically make map run its iterations in parallel or
+    // something which would make this fail
+    test.equal(i, index++);
+    test.isTrue(cursor === cur);
+    test.isTrue(context === this);
     return doc.x * 2;
-  }), [2, 8]);
+  }, context), [2, 8]);
 
   test.equal(_.pluck(coll.find({run: run}, {sort: {x: -1}}).fetch(), "x"),
              [4, 1]);

From 7f490a4081c70fe504567826a3b4884b691e21c8 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Tue, 24 Sep 2013 16:08:40 -0700
Subject: [PATCH 121/335] Docs for ES5-style iteration.

---
 docs/client/api.html |  4 ++++
 docs/client/api.js   | 14 ++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/docs/client/api.html b/docs/client/api.html
index e3f96a1f90..9fa58c4fbb 100644
--- a/docs/client/api.html
+++ b/docs/client/api.html
@@ -965,6 +965,8 @@ cursor, use [`forEach`](#foreach), [`map`](#map), or [`fetch`](#fetch).
 
 {{> api_box cursor_foreach}}
 
+This interface is compatible with [Array.forEach](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/forEach).
+
 When called from a reactive computation, `forEach` registers dependencies on
 the matching documents.
 
@@ -980,6 +982,8 @@ Examples:
 
 {{> api_box cursor_map}}
 
+This interface is compatible with [Array.map](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/map).
+
 When called from a reactive computation, `map` registers dependencies on
 the matching documents.
 
diff --git a/docs/client/api.js b/docs/client/api.js
index 2ab15f343e..4a7402824a 100644
--- a/docs/client/api.js
+++ b/docs/client/api.js
@@ -675,25 +675,31 @@ Template.api.cursor_fetch = {
 
 Template.api.cursor_foreach = {
   id: "foreach",
-  name: "<em>cursor</em>.forEach(callback)",
+  name: "<em>cursor</em>.forEach(callback, [thisArg])",
   locus: "Anywhere",
   descr: ["Call `callback` once for each matching document, sequentially and synchronously."],
   args: [
     {name: "callback",
      type: "Function",
-     descr: "Function to call."}
+     descr: "Function to call. It will be called with three arguments: the document, a 0-based index, and <em>cursor</em> itself."},
+    {name: "thisArg",
+     type: "Any",
+     descr: "An object which will be the value of `this` inside `callback`."}
   ]
 };
 
 Template.api.cursor_map = {
   id: "map",
-  name: "<em>cursor</em>.map(callback)",
+  name: "<em>cursor</em>.map(callback, [thisArg])",
   locus: "Anywhere",
   descr: ["Map callback over all matching documents.  Returns an Array."],
   args: [
     {name: "callback",
      type: "Function",
-     descr: "Function to call."}
+     descr: "Function to call. It will be called with three arguments: the document, a 0-based index, and <em>cursor</em> itself."},
+    {name: "thisArg",
+     type: "Any",
+     descr: "An object which will be the value of `this` inside `callback`."}
   ]
 };
 

From b86ba7e3dad23411559a29ebab4c678ae97f393c Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Tue, 24 Sep 2013 16:11:29 -0700
Subject: [PATCH 122/335] History.md update for forEach/map arguments.

---
 History.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/History.md b/History.md
index 6c2d8769ba..e502bdc762 100644
--- a/History.md
+++ b/History.md
@@ -3,6 +3,9 @@
 * `restrictCreationByEmail` option in `Accounts.config` to restrict new users to
   emails of specific domain (eg. only users with @meteor.com emails).
 
+* Pass an index and the cursor itself to the callbacks in `cursor.forEach` and
+  `cursor.map`, just like the corresponding `Array` methods. #63
+
 * Better error when passing a string to {{#each}}. #722
 
 * Write dates to Mongo as ISODate rather than Integer; existing data can be

From 6494ec563fba223c3f168019d9fd459600e511fc Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Fri, 27 Sep 2013 18:50:39 -0700
Subject: [PATCH 123/335] Put .upsert() on LocalCollection and mongo driver.

This way LocalCollection and Meteor.Collection have the same API.
---
 packages/minimongo/minimongo.js               | 24 ++++++--
 packages/minimongo/minimongo_tests.js         |  4 +-
 packages/mongo-livedata/collection.js         | 48 +++++-----------
 packages/mongo-livedata/mongo_driver.js       | 55 +++++++++++++------
 .../mongo-livedata/mongo_livedata_tests.js    |  1 -
 .../remote_collection_driver.js               |  2 +-
 6 files changed, 75 insertions(+), 59 deletions(-)

diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index 95941a7fdc..b78d873b3d 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -599,11 +599,17 @@ LocalCollection.prototype.update = function (selector, mod, options, callback) {
     updateCount = 1;
   }
 
-  var result = {
-    numberAffected: updateCount
-  };
-  if (insertedId !== undefined)
-    result.insertedId = insertedId;
+  var result;
+  if (options.returnObject) {
+    result = {
+      numberAffected: updateCount
+    };
+    if (insertedId !== undefined)
+      result.insertedId = insertedId;
+  } else {
+    result = updateCount;
+  }
+
   if (callback)
     Meteor.defer(function () {
       callback(null, result);
@@ -611,6 +617,14 @@ LocalCollection.prototype.update = function (selector, mod, options, callback) {
   return result;
 };
 
+LocalCollection.prototype.upsert = function (selector, mod, options, callback) {
+  var self = this;
+  return self.update(selector, mod, _.extend({}, options, {
+    upsert: true,
+    returnObject: true
+  }, callback));
+};
+
 LocalCollection.prototype._modifyAndNotify = function (
     doc, mod, recomputeQids) {
   var self = this;
diff --git a/packages/minimongo/minimongo_tests.js b/packages/minimongo/minimongo_tests.js
index 8df21830bf..343e7f198c 100644
--- a/packages/minimongo/minimongo_tests.js
+++ b/packages/minimongo/minimongo_tests.js
@@ -89,7 +89,7 @@ Tinytest.add("minimongo - basics", function (test) {
   test.length(c.find({type: "cryptographer"}).fetch(), 2);
 
   count = c.update({name: "snookums"}, {$set: {type: "cryptographer"}});
-  test.equal(count, { numberAffected: 1 });
+  test.equal(count, 1);
   test.equal(c.find().count(), 4);
   test.equal(c.find({type: "kitten"}).count(), 1);
   test.equal(c.find({type: "cryptographer"}).count(), 3);
@@ -2016,7 +2016,7 @@ Tinytest.add("minimongo - saveOriginals", function (test) {
   c.update('bar', {$set: {k: 7}});  // update same doc twice
 
   // Verify returned count is correct
-  test.equal(count, { numberAffected: 2 });
+  test.equal(count, 2);
 
   // Verify the originals.
   var originals = c.retrieveOriginals();
diff --git a/packages/mongo-livedata/collection.js b/packages/mongo-livedata/collection.js
index 32cbca3dd5..7f95b7c5df 100644
--- a/packages/mongo-livedata/collection.js
+++ b/packages/mongo-livedata/collection.js
@@ -343,23 +343,15 @@ _.each(["insert", "update", "remove", "upsert"], function (name) {
     var args = _.toArray(arguments);
     var callback;
     var ret;
-    var methodName = name;
 
-    // Calling `Collection.upsert()` is just like calling `Collection.update()`
-    // with upsert: true, except that we return the whole object with
-    // `numberAffected` and `idInserted` keys. So we do the same thing as an
-    // update, except that we save `isUpsert` to determine what to return when
-    // we're done.
-    var isUpsert = false;
-    if (methodName === "upsert") {
-      isUpsert = true;
-      methodName = "update";
-    }
+    var isUpdateOrUpsert = (name === "update" || name === "upsert");
+    var isUpsert = (name === "update" && options && options.upsert) ||
+          (name === "upsert");
 
     if (args.length && args[args.length - 1] instanceof Function)
       callback = args.pop();
 
-    if (methodName === "insert") {
+    if (name === "insert") {
       if (!args.length)
         throw new Error("insert requires an argument");
       // shallow-copy the document and generate an ID
@@ -375,12 +367,10 @@ _.each(["insert", "update", "remove", "upsert"], function (name) {
     } else {
       args[0] = Meteor.Collection._rewriteSelector(args[0]);
 
-      if (methodName === "update") {
+      if (isUpdateOrUpsert) {
         // Mutate args but copy the original options object.
         var options = args[2] = _.clone(args[2]) || {};
-        if (isUpsert)
-          options.upsert = true;
-        if (options && options.upsert) {
+        if (isUpsert) {
           // set `insertedId` if absent.  `insertedId` is a Meteor extension.
           if (options.insertedId) {
             if (!(typeof options.insertedId === 'string'
@@ -393,21 +383,13 @@ _.each(["insert", "update", "remove", "upsert"], function (name) {
       }
     }
 
-    // On inserts, always return the id that we generated. On updates and
-    // removes, return the number of documents we affected. On upsert(), return
-    // the whole object that the collection returns on update (with the number
-    // affected and insertedId).
+    // On inserts, always return the id that we generated; on all other
+    // operations, just return the result from the collection.
     var transformResultFromCollection = function (result) {
-      if (methodName === "insert") {
+      if (name === "insert")
         return ret;
-      } else if (methodName === "update" && ! isUpsert) {
-        if (result)
-          return result.numberAffected;
-        else
-          return undefined;
-      } else {
+      else
         return result;
-      }
     };
 
     var wrappedCallback;
@@ -429,20 +411,20 @@ _.each(["insert", "update", "remove", "upsert"], function (name) {
         // down.
         wrappedCallback = function (err) {
           if (err)
-            Meteor._debug(methodName + " failed: " + (err.reason || err.stack));
+            Meteor._debug(name + " failed: " + (err.reason || err.stack));
         };
       }
 
       var enclosing = DDP._CurrentInvocation.get();
       var alreadyInSimulation = enclosing && enclosing.isSimulation;
-      if (!alreadyInSimulation && methodName !== "insert") {
+      if (!alreadyInSimulation && name !== "insert") {
         // If we're about to actually send an RPC, we should throw an error if
         // this is a non-ID selector, because the mutation methods only allow
         // single-ID selectors. (If we don't throw here, we'll see flicker.)
-        throwIfSelectorIsNotId(args[0], methodName);
+        throwIfSelectorIsNotId(args[0], name);
       }
 
-      self._connection.apply(self._prefix + methodName, args, wrappedCallback);
+      self._connection.apply(self._prefix + name, args, wrappedCallback);
 
     } else {
       // it's my collection.  descend into the collection object
@@ -450,7 +432,7 @@ _.each(["insert", "update", "remove", "upsert"], function (name) {
       args.push(wrappedCallback);
       try {
         // If the user provided a callback, then we expect queryRet to be undefined.
-        var queryRet = self._collection[methodName].apply(self._collection, args);
+        var queryRet = self._collection[name].apply(self._collection, args);
         ret = transformResultFromCollection(queryRet);
       } catch (e) {
         if (callback) {
diff --git a/packages/mongo-livedata/mongo_driver.js b/packages/mongo-livedata/mongo_driver.js
index 149a0fc1bc..e680b1cd79 100644
--- a/packages/mongo-livedata/mongo_driver.js
+++ b/packages/mongo-livedata/mongo_driver.js
@@ -257,16 +257,6 @@ MongoConnection.prototype._refresh = function (collectionName, selector) {
   }
 };
 
-var numberAffectedCallback = function (callback) {
-  return Meteor.bindEnvironment(function (err, numberAffected) {
-    callback && callback(err, ! err && {
-      numberAffected: numberAffected
-    });
-  }, function (err) {
-    Meteor._debug("Error in Mongo write:", err.stack);
-  });
-};
-
 MongoConnection.prototype._remove = function (collection_name, selector,
                                               callback) {
   var self = this;
@@ -346,10 +336,20 @@ MongoConnection.prototype._update = function (collection_name, selector, mod,
         options.insertedId) {
       mongoOpts.insertedId = options.insertedId;
       simulateUpsertWithInsertedId(collection, mongoSelector, mongoMod,
-                                   isModify, mongoOpts, callback);
+                                   isModify, mongoOpts, function (err, result) {
+                                     // If we got here via a upsert() call, then
+                                     // we should return the whole
+                                     // object. Otherwise, we should just return
+                                     // the number of affected docs to match the
+                                     // mongo API.
+                                     if (result && ! options.returnObject)
+                                       callback(err, result.numberAffected);
+                                     else
+                                       callback(err, result);
+                                   });
     } else {
-      collection.update(mongoSelector, mongoMod, mongoOpts,
-                        numberAffectedCallback(callback));
+      // For non-upserts, just return the number of affected documents.
+      collection.update(mongoSelector, mongoMod, mongoOpts, callback);
     }
   } catch (e) {
     write.committed();
@@ -364,13 +364,20 @@ var isModificationMod = function (mod) {
   return false;
 };
 
+// Assumes callback has already been wrapped with bindEnvironment.
+var numberAffectedCallback = function (callback) {
+  return function (err, result) {
+    callback(err, ! err && { numberAffected: result });
+  };
+};
+
 var NUM_OPTIMISTIC_TRIES = 3;
 
 var simulateUpsertWithInsertedId = function (collection, selector, mod,
                                              isModify, options, callback) {
   var insertedId = options.insertedId; // must exist
 
-  var mongoOptsForUpdate = _.extend({}, options);
+  var mongoOptsForUpdate = _.extend({}, options, { returnObject: true });
   delete mongoOptsForUpdate.insertedId;
   delete mongoOptsForUpdate.upsert;
 
@@ -426,7 +433,7 @@ var simulateUpsertWithInsertedId = function (collection, selector, mod,
     newDoc = mod;
   }
 
-  var mongoOptsForInsert = _.extend({}, options);
+  var mongoOptsForInsert = _.extend({}, options, { returnObject: true });
   delete mongoOptsForUpdate.insertedId;
   mongoOptsForInsert.upsert = true;
   delete mongoOptsForInsert.multi;
@@ -444,8 +451,7 @@ var simulateUpsertWithInsertedId = function (collection, selector, mod,
                           Meteor._debug(err);
                           callback(err);
                         } else {
-                          callback(null, _.extend(result,
-                                                  { insertedId: insertedId }));
+                          callback(null, _.extend(result, { insertedId: insertedId }));
                         }
                       }));
   };
@@ -460,6 +466,21 @@ _.each(["insert", "update", "remove"], function (method) {
   };
 });
 
+MongoConnection.prototype.upsert = function (collectionName, selector, mod,
+                                             options, callback) {
+  var self = this;
+  if (typeof options === "function" && ! callback) {
+    callback = options;
+    options = {};
+  }
+
+  return self.update(collectionName, selector, mod,
+                     _.extend({}, options, {
+                       upsert: true,
+                       returnObject: true
+                     }, callback));
+};
+
 MongoConnection.prototype.find = function (collectionName, selector, options) {
   var self = this;
 
diff --git a/packages/mongo-livedata/mongo_livedata_tests.js b/packages/mongo-livedata/mongo_livedata_tests.js
index ae44683cd4..e473b1cc0c 100644
--- a/packages/mongo-livedata/mongo_livedata_tests.js
+++ b/packages/mongo-livedata/mongo_livedata_tests.js
@@ -50,7 +50,6 @@ EJSON.addType("dog", function (o) { return new Dog(o.name, o.color, o.actions);}
 // Parameterize tests.
 _.each( ['STRING', 'MONGO'], function(idGeneration) {
 
-
 var collectionOptions = { idGeneration: idGeneration};
 
 testAsyncMulti("mongo-livedata - database error reporting. " + idGeneration, [
diff --git a/packages/mongo-livedata/remote_collection_driver.js b/packages/mongo-livedata/remote_collection_driver.js
index 9c155ca698..b32f82b0d3 100644
--- a/packages/mongo-livedata/remote_collection_driver.js
+++ b/packages/mongo-livedata/remote_collection_driver.js
@@ -9,7 +9,7 @@ _.extend(MongoInternals.RemoteCollectionDriver.prototype, {
     var ret = {};
     _.each(
       ['find', 'findOne', 'insert', 'update', 'remove', '_ensureIndex',
-       '_dropIndex', '_createCappedCollection'],
+       '_dropIndex', '_createCappedCollection', 'upsert'],
       function (m) {
         ret[m] = _.bind(self.mongo[m], self.mongo, name);
       });

From 3e87c8f9d556351bd0e6ead91078ded4e485ced3 Mon Sep 17 00:00:00 2001
From: David Greenspan <dgreenspan@alum.mit.edu>
Date: Fri, 27 Sep 2013 17:53:06 -0700
Subject: [PATCH 124/335] finish optimistic retry code detect collision

---
 packages/mongo-livedata/mongo_driver.js       | 16 +++++++++---
 .../mongo-livedata/mongo_livedata_tests.js    | 26 +++++++++++++++++++
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/packages/mongo-livedata/mongo_driver.js b/packages/mongo-livedata/mongo_driver.js
index e680b1cd79..f0a5bcc8df 100644
--- a/packages/mongo-livedata/mongo_driver.js
+++ b/packages/mongo-livedata/mongo_driver.js
@@ -373,6 +373,13 @@ var numberAffectedCallback = function (callback) {
 
 var NUM_OPTIMISTIC_TRIES = 3;
 
+// exposed for testing
+MongoConnection._isCannotChangeIdError = function (err) {
+  // either of these checks should work, but just to be safe...
+  return (err.code === 13596 ||
+          err.err.indexOf("cannot change _id of a document") === 0);
+};
+
 var simulateUpsertWithInsertedId = function (collection, selector, mod,
                                              isModify, options, callback) {
   var insertedId = options.insertedId; // must exist
@@ -445,11 +452,14 @@ var simulateUpsertWithInsertedId = function (collection, selector, mod,
     collection.update(selector, replacementWithId, mongoOptsForInsert,
                       numberAffectedCallback(function (err, result) {
                         if (err) {
-                          // XXX figure out if this is a
+                          // figure out if this is a
                           // "cannot change _id of document" error, and
                           // if so, try doUpdate() again, up to 3 times.
-                          Meteor._debug(err);
-                          callback(err);
+                          if (MongoConnection._isCannotChangeIdError(err)) {
+                            doUpdate();
+                          } else {
+                            callback(err);
+                          }
                         } else {
                           callback(null, _.extend(result, { insertedId: insertedId }));
                         }
diff --git a/packages/mongo-livedata/mongo_livedata_tests.js b/packages/mongo-livedata/mongo_livedata_tests.js
index e473b1cc0c..0f9f5da7d9 100644
--- a/packages/mongo-livedata/mongo_livedata_tests.js
+++ b/packages/mongo-livedata/mongo_livedata_tests.js
@@ -913,6 +913,32 @@ if (Meteor.isServer) {
     onComplete();
   });
 
+  Tinytest.addAsync("mongo-livedata - upsert error parse, " + idGeneration, function (test, onComplete) {
+    var run = test.runId();
+    var coll = new Meteor.Collection("livedata_upsert_errorparse_collection_"+run, collectionOptions);
+
+    coll.insert({_id: 'foobar'});
+    var err;
+    try {
+      coll.update({_id: 'foobar'}, {_id: 'cowbar'});
+    } catch (e) {
+      err = e;
+    }
+    test.isTrue(err);
+    test.isTrue(MongoInternals.Connection._isCannotChangeIdError(err));
+
+    try {
+      coll.insert({_id: 'foobar'});
+    } catch (e) {
+      err = e;
+    }
+    test.isTrue(err);
+    // duplicate id error is not same as change id error
+    test.isFalse(MongoInternals.Connection._isCannotChangeIdError(err));
+
+    onComplete();
+  });
+
 } // end Meteor.isServer
 
 _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {

From 2724bd0d84c27952f43f67c10c352752c02c1529 Mon Sep 17 00:00:00 2001
From: David Greenspan <dgreenspan@alum.mit.edu>
Date: Fri, 27 Sep 2013 18:53:23 -0700
Subject: [PATCH 125/335] upsert bugfixes and tests

* mongo_driver native upsert returns insertedId
* minimongo doesn't use query _id on upsert/replace
* minimongo supports insertedId option
* tests for all this
---
 packages/minimongo/minimongo.js               |   2 +
 packages/minimongo/modify.js                  |   6 +-
 packages/mongo-livedata/mongo_driver.js       |  29 ++++-
 .../mongo-livedata/mongo_livedata_tests.js    | 118 +++++++++++++++++-
 4 files changed, 147 insertions(+), 8 deletions(-)

diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index b78d873b3d..cb7b0fd5d6 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -595,6 +595,8 @@ LocalCollection.prototype.update = function (selector, mod, options, callback) {
   if (updateCount === 0 && options.upsert) {
     var newDoc = _.clone(selector);
     LocalCollection._modify(newDoc, mod, true);
+    if (! newDoc._id && options.insertedId)
+      newDoc._id = options.insertedId;
     insertedId = self.insert(newDoc);
     updateCount = 1;
   }
diff --git a/packages/minimongo/modify.js b/packages/minimongo/modify.js
index 0e404914dd..dc9fda5964 100644
--- a/packages/minimongo/modify.js
+++ b/packages/minimongo/modify.js
@@ -62,7 +62,11 @@ LocalCollection._modify = function (doc, mod, onInsert) {
     // Note: this used to be for (var k in doc) however, this does not
     // work right in Opera. Deleting from a doc while iterating over it
     // would sometimes cause opera to skip some keys.
-    if (k !== '_id')
+
+    // onInsert: if we're constructing a document to insert (via upsert)
+    // and we're in replacement mode, not modify mode, DON'T take the
+    // _id from the query.  This matches mongo's behavior.
+    if (k !== '_id' || onInsert)
       delete doc[k];
   });
   for (var k in new_doc) {
diff --git a/packages/mongo-livedata/mongo_driver.js b/packages/mongo-livedata/mongo_driver.js
index f0a5bcc8df..bf809c1b8c 100644
--- a/packages/mongo-livedata/mongo_driver.js
+++ b/packages/mongo-livedata/mongo_driver.js
@@ -257,6 +257,16 @@ MongoConnection.prototype._refresh = function (collectionName, selector) {
   }
 };
 
+var numberAffectedCallback = function (callback) {
+  return Meteor.bindEnvironment(function (err, numberAffected, extraInfo) {
+    callback && callback(err, ! err && {
+      numberAffected: numberAffected
+    }, extraInfo);
+  }, function (err) {
+    Meteor._debug("Error in Mongo write:", err.stack);
+  });
+};
+
 MongoConnection.prototype._remove = function (collection_name, selector,
                                               callback) {
   var self = this;
@@ -330,10 +340,9 @@ MongoConnection.prototype._update = function (collection_name, selector, mod,
     var mongoMod = replaceTypes(mod, replaceMeteorAtomWithMongo);
 
     var isModify = isModificationMod(mongoMod);
+    var knownId = (isModify ? mongoSelector._id : mongoMod._id);
 
-    if (options.upsert &&
-        (isModify ? (! mongoSelector._id) : (! mongoMod._id)) &&
-        options.insertedId) {
+    if (options.upsert && (! knownId) && options.insertedId) {
       mongoOpts.insertedId = options.insertedId;
       simulateUpsertWithInsertedId(collection, mongoSelector, mongoMod,
                                    isModify, mongoOpts, function (err, result) {
@@ -348,8 +357,18 @@ MongoConnection.prototype._update = function (collection_name, selector, mod,
                                        callback(err, result);
                                    });
     } else {
-      // For non-upserts, just return the number of affected documents.
-      collection.update(mongoSelector, mongoMod, mongoOpts, callback);
+      collection.update(mongoSelector, mongoMod, mongoOpts,
+                        numberAffectedCallback(function (err, result, extra) {
+                          if (! err) {
+                            if (options.upsert && (! extra.updatedExisting) &&
+                                knownId) {
+                              result.insertedId = knownId;
+                            }
+                            if (result && ! options.returnObject)
+                              result = result.numberAffected;
+                          }
+                          callback(err, result);
+                        }));
     }
   } catch (e) {
     write.committed();
diff --git a/packages/mongo-livedata/mongo_livedata_tests.js b/packages/mongo-livedata/mongo_livedata_tests.js
index 0f9f5da7d9..9a564b6570 100644
--- a/packages/mongo-livedata/mongo_livedata_tests.js
+++ b/packages/mongo-livedata/mongo_livedata_tests.js
@@ -943,7 +943,7 @@ if (Meteor.isServer) {
 
 _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
   _.each([true, false], function (useUpdate) {
-    Tinytest.addAsync("mongo-livedata - " + (useUpdate ? "update " : "") + "upsert " + (minimongo ? "minimongo" : "") + ", " + idGeneration, function (test, onComplete) {
+    Tinytest.addAsync("mongo-livedata - " + (useUpdate ? "update " : "") + "upsert" + (minimongo ? " minimongo" : "") + ", " + idGeneration, function (test, onComplete) {
       var upsert = function (query, mod, options) {
         if (useUpdate)
           return { numberAffected:
@@ -960,6 +960,7 @@ _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
           actual = _.map(actual, stripId);
           expected = _.map(expected, stripId);
         }
+        // (technically should ignore order in comparison)
         test.equal(actual, expected);
       };
 
@@ -1001,7 +1002,7 @@ _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
 
       coll.remove({});
 
-      // Test modification
+      // Test modification by upsert
 
       var result5 = upsert({name: 'David'}, {$set: {foo: 1}});
       test.equal(result5.numberAffected, 1);
@@ -1052,6 +1053,119 @@ _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
                       {name: 'Emily', foo: 2, bar: 7, _id: emilyId},
                       {name: 'Fred', foo: 2, bar: 7, _id: fredId}]);
 
+      // test `insertedId` option
+      var result9 = upsert({name: 'Steve'},
+                           {name: 'Steve'},
+                           {insertedId: 'steve'});
+      test.equal(result9.numberAffected, 1);
+      if (! useUpdate)
+        test.equal(result9.insertedId, 'steve');
+      compareResults(coll.find().fetch(),
+                     [{name: 'David', foo: 2, bar: 7, _id: davidId},
+                      {name: 'Emily', foo: 2, bar: 7, _id: emilyId},
+                      {name: 'Fred', foo: 2, bar: 7, _id: fredId},
+                      {name: 'Steve', _id: 'steve'}]);
+      test.isTrue(coll.findOne('steve'));
+      test.isFalse(coll.findOne('fred'));
+
+      onComplete();
+    });
+  });
+});
+
+_.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
+  _.each([true, false], function (useUpdate) {
+    Tinytest.addAsync("mongo-livedata - " + (useUpdate ? "update " : "") + "upsert by id" + (minimongo ? " minimongo" : "") + ", " + idGeneration, function (test, onComplete) {
+      var upsert = function (query, mod, options) {
+        if (useUpdate)
+          return { numberAffected:
+                   coll.update(query, mod,
+                                     _.extend({ upsert: true }, options)) };
+        else
+          return coll.upsert(query, mod, options);
+      };
+      var stripId = function (obj) {
+        delete obj._id;
+      };
+      var compareResults = function (actual, expected, stripIds) {
+        if (stripIds) {
+          actual = _.map(actual, stripId);
+          expected = _.map(expected, stripId);
+        }
+        // (technically should ignore order in comparison)
+        test.equal(actual, expected);
+      };
+
+      var run = test.runId();
+      var options = collectionOptions;
+      if (minimongo)
+        options = _.extend({}, collectionOptions, { connection: null });
+      var coll = new Meteor.Collection("livedata_upsert_by_id_collection_"+run, options);
+
+      var ret;
+      ret = upsert({_id: 'foo'}, {$set: {x: 1}});
+      test.equal(ret.numberAffected, 1);
+      if (! useUpdate)
+        test.equal(ret.insertedId, 'foo');
+      compareResults(coll.find().fetch(),
+                     [{_id: 'foo', x: 1}]);
+
+      ret = upsert({_id: 'foo'}, {$set: {x: 2}});
+      test.equal(ret.numberAffected, 1);
+      if (! useUpdate)
+        test.isFalse(ret.insertedId);
+      compareResults(coll.find().fetch(),
+                     [{_id: 'foo', x: 2}]);
+
+      ret = upsert({_id: 'bar'}, {$set: {x: 1}});
+      test.equal(ret.numberAffected, 1);
+      if (! useUpdate)
+        test.equal(ret.insertedId, 'bar');
+      compareResults(coll.find().fetch(),
+                     [{_id: 'foo', x: 2},
+                      {_id: 'bar', x: 1}]);
+
+      coll.remove({});
+
+      ret = upsert({_id: 'traz'}, {x: 1});
+      test.equal(ret.numberAffected, 1);
+      var myId = ret.insertedId;
+      if (! useUpdate) {
+        test.isTrue(myId);
+        // upsert with entire document does NOT take _id from
+        // the query.
+        test.notEqual(myId, 'traz');
+      } else {
+        myId = coll.findOne()._id;
+      }
+      compareResults(coll.find().fetch(),
+                     [{x: 1, _id: myId}]);
+
+      // this time, insert as _id 'traz'
+      ret = upsert({_id: 'traz'}, {_id: 'traz', x: 2});
+      test.equal(ret.numberAffected, 1);
+      if (! useUpdate)
+        test.equal(ret.insertedId, 'traz');
+      compareResults(coll.find().fetch(),
+                     [{x: 1, _id: myId},
+                      {x: 2, _id: 'traz'}]);
+
+      // now update _id 'traz'
+      ret = upsert({_id: 'traz'}, {x: 3});
+      test.equal(ret.numberAffected, 1);
+      test.isFalse(ret.insertedId);
+      compareResults(coll.find().fetch(),
+                     [{x: 1, _id: myId},
+                      {x: 3, _id: 'traz'}]);
+
+      // now update, passing _id (which is ok as long as it's the same)
+      ret = upsert({_id: 'traz'}, {_id: 'traz', x: 4});
+      test.equal(ret.numberAffected, 1);
+      test.isFalse(ret.insertedId);
+      compareResults(coll.find().fetch(),
+                     [{x: 1, _id: myId},
+                      {x: 4, _id: 'traz'}]);
+
       onComplete();
     });
   });

From 22d3a56b813fa28ba219e69da86b103412dae545 Mon Sep 17 00:00:00 2001
From: David Greenspan <dgreenspan@alum.mit.edu>
Date: Fri, 27 Sep 2013 19:13:42 -0700
Subject: [PATCH 126/335] remove duplicate function

---
 packages/mongo-livedata/mongo_driver.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/packages/mongo-livedata/mongo_driver.js b/packages/mongo-livedata/mongo_driver.js
index bf809c1b8c..0e39b82b1d 100644
--- a/packages/mongo-livedata/mongo_driver.js
+++ b/packages/mongo-livedata/mongo_driver.js
@@ -383,13 +383,6 @@ var isModificationMod = function (mod) {
   return false;
 };
 
-// Assumes callback has already been wrapped with bindEnvironment.
-var numberAffectedCallback = function (callback) {
-  return function (err, result) {
-    callback(err, ! err && { numberAffected: result });
-  };
-};
-
 var NUM_OPTIMISTIC_TRIES = 3;
 
 // exposed for testing

From 6329cedc51a9f48bf7e00876e1b82c09330b3536 Mon Sep 17 00:00:00 2001
From: David Greenspan <dgreenspan@alum.mit.edu>
Date: Fri, 27 Sep 2013 19:41:24 -0700
Subject: [PATCH 127/335] upsert method -- let upsert go over the network

Only works in insecure mode.  (Not supported by allow/deny.)
---
 packages/mongo-livedata/collection.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/mongo-livedata/collection.js b/packages/mongo-livedata/collection.js
index 7f95b7c5df..8f8f6cdf01 100644
--- a/packages/mongo-livedata/collection.js
+++ b/packages/mongo-livedata/collection.js
@@ -568,6 +568,7 @@ Meteor.Collection.prototype._defineMutationMethods = function() {
     insert: {allow: [], deny: []},
     update: {allow: [], deny: []},
     remove: {allow: [], deny: []},
+    upsert: {allow: [], deny: []}, // dummy arrays; can't set these!
     fetch: [],
     fetchAllFields: false
   };
@@ -583,7 +584,7 @@ Meteor.Collection.prototype._defineMutationMethods = function() {
   if (self._connection) {
     var m = {};
 
-    _.each(['insert', 'update', 'remove'], function (method) {
+    _.each(['insert', 'update', 'remove', 'upsert'], function (method) {
       m[self._prefix + method] = function (/* ... */) {
         // All the methods do their own validation, instead of using check().
         check(arguments, [Match.Any]);
@@ -597,8 +598,12 @@ Meteor.Collection.prototype._defineMutationMethods = function() {
             return;
           }
 
-          // This is the server receiving a method call from the client. We
-          // don't allow arbitrary selectors in mutations from the client: only
+          // This is the server receiving a method call from the client.
+
+          if (method === 'upsert' && ! self._isInsecure())
+            throw new Meteor.Error(403, "Not permitted.  Untrusted code may not upsert (not supported by allow/deny).  Upsert from a method instead.");
+
+          // We don't allow arbitrary selectors in mutations from the client: only
           // single-ID selectors.
           if (method !== 'insert')
             throwIfSelectorIsNotId(arguments[0], method);

From 4893fe048c556a196c146b074fc2fb45b55734df Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Tue, 13 Aug 2013 21:50:45 -0700
Subject: [PATCH 128/335] Package for security-related http headers.

---
 docs/client/docs.js                           |   4 +-
 docs/client/packages.html                     |   2 +
 docs/client/packages/browser-policy.html      | 126 +++++++++++
 .../packages/starter-browser-policy.html      |  25 +++
 packages/browser-policy/.gitignore            |   1 +
 packages/browser-policy/browser-policy.js     | 200 ++++++++++++++++++
 packages/browser-policy/package.js            |   9 +
 packages/starter-browser-policy/.gitignore    |   1 +
 packages/starter-browser-policy/package.js    |   8 +
 .../starter-browser-policy.js                 |  13 ++
 packages/webapp/webapp_server.js              |  40 +++-
 tools/app.html.in                             |   4 +-
 12 files changed, 419 insertions(+), 14 deletions(-)
 create mode 100644 docs/client/packages/browser-policy.html
 create mode 100644 docs/client/packages/starter-browser-policy.html
 create mode 100644 packages/browser-policy/.gitignore
 create mode 100644 packages/browser-policy/browser-policy.js
 create mode 100644 packages/browser-policy/package.js
 create mode 100644 packages/starter-browser-policy/.gitignore
 create mode 100644 packages/starter-browser-policy/package.js
 create mode 100644 packages/starter-browser-policy/starter-browser-policy.js

diff --git a/docs/client/docs.js b/docs/client/docs.js
index c057ef71bd..036ed23c89 100644
--- a/docs/client/docs.js
+++ b/docs/client/docs.js
@@ -344,7 +344,9 @@ var toc = [
     "spiderable",
     "stylus",
     "showdown",
-    "underscore"
+    "underscore",
+    "browser-policy",
+    "starter-browser-policy"
   ] ],
 
   "Command line", [ [
diff --git a/docs/client/packages.html b/docs/client/packages.html
index 0ee701bbe8..ac344171cd 100644
--- a/docs/client/packages.html
+++ b/docs/client/packages.html
@@ -32,6 +32,8 @@ and removed with:
 {{> pkg_stylus}}
 {{> pkg_showdown}}
 {{> pkg_underscore}}
+{{> pkg_browser_policy}}
+{{> pkg_starter_browser_policy}}
 
 {{/better_markdown}}
 </template>
diff --git a/docs/client/packages/browser-policy.html b/docs/client/packages/browser-policy.html
new file mode 100644
index 0000000000..b2da7d5117
--- /dev/null
+++ b/docs/client/packages/browser-policy.html
@@ -0,0 +1,126 @@
+<template name="pkg_browser_policy">
+{{#better_markdown}}
+## `browser-policy`
+
+The `browser-policy` package lets you set security-related policies that will be
+enforced by newer browsers. These policies help you prevent and mitigate common
+attacks like cross-site scripting and clickjacking.
+
+`browser-policy` lets you configure the HTTP headers X-Frame-Options and
+Content-Security-Policy. X-Frame-Options tells the browser which websites are
+allowed to frame your app. You should only let trusted websites frame your app,
+because malicious sites could harm your users
+with <a href="https://www.owasp.org/index.php/Clickjacking">clickjacking
+attacks</a>.
+<a href="https://developer.mozilla.org/en-US/docs/Security/CSP/Introducing_Content_Security_Policy">Content-Security-Policy</a>
+tells the browser where your app can load content from, which encourages safe
+practices and mitigates the damage of a cross-site-scripting attack.
+
+For most apps, we recommend that you use the `starter-browser-policy` package to
+enable reasonable policies, and then use the functions below to tighten or relax
+the policies as necessary. For example, an app that only loads content from its
+own origin and that doesn't use inline Javascript should use
+`starter-browser-policy` and then call `BrowserPolicy.disallowInlineScripts()`
+to gain additional security against cross-site scripting attacks.
+
+You can use the following functions to specify which websites are allowed to
+frame your app:
+<dl class="callbacks">
+{{#dtdd "BrowserPolicy.disallowFraming()"}}
+Your app will never render inside a frame or iframe.
+{{/dtdd}}
+
+{{#dtdd "BrowserPolicy.allowFramingByOrigin(origin)"}}
+Your app will only render inside frames loaded by `origin` (such as
+http://meteor.com). You can only call this function once with a single origin,
+and cannot specify multiple origins that are allowed to frame your app. (This is
+a limitation of the X-Frame-Options header.)
+{{/dtdd}}
+
+{{#dtdd "BrowserPolicy.allowFramingBySameOrigin()"}}
+Your app will only render inside frames loaded by webpages on the same origin as
+your app.
+{{/dtdd}}
+
+{{#dtdd "BrowserPolicy.allowFramingByAnyOrigin()"}}
+Your app can be framed by any website.
+{{/dtdd}}
+</dl>
+
+You can use these functions to tighten or relax restrictions on where Javascript
+and CSS can be run:
+
+<dl class="callbacks">
+{{#dtdd "BrowserPolicy.allowInlineScripts()"}}
+Allows inline `<script>` tags, `javascript:` URLs, and inline event handlers.
+{{/dtdd}}
+
+{{#dtdd "BrowserPolicy.disallowInlineScripts()"}}
+Disallows inline Javascript. Calling this function results in an extra
+round-trip on page load to retrieve Meteor runtime configuration that is usually
+part of an inline script tag.
+{{/dtdd}}
+
+{{#dtdd "BrowserPolicy.allowEval()"}}
+Allows the creation of Javascript code from strings using function such as `eval()`.
+{{/dtdd}}
+
+{{#dtdd "BrowserPolicy.disallowEval()"}}
+Disallows eval and related functions.
+{{/dtdd}}
+
+{{#dtdd "BrowserPolicy.allowInlineStyles()"}}
+Allows inline style tags and style attributes.
+{{/dtdd}}
+
+{{#dtdd "BrowserPolicy.disallowInlineStyles()"}}
+Disallows inline CSS.
+{{/dtdd}}
+</dl>
+
+Finally, you can configure a whitelist of allowed requests that various types of
+content can make. Examples:
+
+* `BrowserPolicy.disallowObject()` causes the browser to disallow all
+`<object>` tags.
+* `BrowserPolicy.allowImageOrigin("https://example.com")`
+allows images to have their `src` attributes point to images served from
+`https://example.com`.
+* `BrowserPolicy.allowConnectOrigin("https://example.com")` allows XMLHttpRequest
+and WebSocket connections to `https://example.com`.
+
+The following functions are defined for the content types
+script, object, image, media, font, and connect.
+
+<dl class="callbacks">
+{{#dtdd "BrowserPolicy.allow&lt;ContentType&gt;Origin(origin)"}}
+Allows this type of content to be loaded from the given origin. `origin` is a
+string and can include an optional scheme (such as `http` or `https`), an
+optional wildcard at the beginning, and an optional port which can be a
+wildcard. Examples include `example.com`, `https://*.example.com`, and
+`example.com:*`. You can call these functions multiple times with different
+origins to specify a whitelist of allowed origins.
+{{/dtdd}}
+
+{{#dtdd "BrowserPolicy.allow&lt;ContentType&gt;DataUrl()"}}
+Allows this type of content to be loaded from a `data:` URL.
+{{/dtdd}}
+
+{{#dtdd "BrowserPolicy.allow&lt;ContentType&gt;SameOrigin()"}}
+Allows this type of content to be loaded from the same origin as your app.
+{{/dtdd}}
+
+{{#dtdd "BrowserPolicy.disallow&lt;ContentType&gt;()"}}
+Disallows this type of content on your app.
+{{/dtdd}}
+</dl>
+
+These functions are also defined for the content type `AllContent`, which sets
+defaults for content types that you haven't configured using one of the above
+functions. For example, if you want to allow all content to be loaded from your
+app's origin but you want to disable `<object>` tags, you can simply call
+`BrowserPolicy.allowAllContentSameOrigin()` followed by
+`BrowserPolicy.disallowObject()`.
+
+{{/better_markdown}}
+</template>
diff --git a/docs/client/packages/starter-browser-policy.html b/docs/client/packages/starter-browser-policy.html
new file mode 100644
index 0000000000..bb1118fc0d
--- /dev/null
+++ b/docs/client/packages/starter-browser-policy.html
@@ -0,0 +1,25 @@
+<template name="pkg_starter_browser_policy">
+{{#better_markdown}}
+## `starter-browser-policy`
+
+The `starter-browser-policy` package provides a recommended configuration for the
+`browser-policy` package. When you add `starter-browser-policy` to your app, the
+following policies will be enforced by browsers that support the X-Frame-Options
+and Content-Security-Policy headers:
+
+* Only webpages on the same origin as your app can frame your app.
+* Your app can only load content (images, scripts, fonts, etc.) from its own
+origin, except that XMLHttpRequests and WebSocket connections can go to any
+origin.
+* Your app's client code cannot use functions such as `eval()` that convert
+strings to Javascript code.
+
+If your app does not need any inline Javascript such as inline `<script>` tags,
+we recommend that you modify this policy by calling
+`BrowserPolicy.disallowInlineScripts()` on the server. This will result in one
+extra round trip when your app is loaded, but will help prevent cross-site
+scripting attacks by disabling all scripts except those loaded from a `script
+src` attribute.
+
+{{/better_markdown}}
+</template>
diff --git a/packages/browser-policy/.gitignore b/packages/browser-policy/.gitignore
new file mode 100644
index 0000000000..677a6fc263
--- /dev/null
+++ b/packages/browser-policy/.gitignore
@@ -0,0 +1 @@
+.build*
diff --git a/packages/browser-policy/browser-policy.js b/packages/browser-policy/browser-policy.js
new file mode 100644
index 0000000000..3d9d8e330c
--- /dev/null
+++ b/packages/browser-policy/browser-policy.js
@@ -0,0 +1,200 @@
+// We recommend that you use the starter-browser-policy package to enable the
+// following default policy:
+// 1.) Only the same origin can frame the app.
+// 2.) No eval or other string-to-code, and content can only be loaded from the
+// same origin as the app (except for XHRs and websocket connections, which can
+// go to any origin).
+//
+// Apps should call BrowserPolicy.disallowInlineScripts() if they are not using
+// any inline script tags and are willing to accept an extra round trip on page
+// load.
+//
+// BrowserPolicy functions for tweaking CSP:
+// allowInlineScripts()
+// disallowInlineScripts(): adds extra round-trip to page load time
+// allowInlineStyles()
+// disallowInlineStyles()
+// allowEval()
+// disallowEval()
+//
+// For each type of content (script, object, image, media, font, connect,
+// style), there are the following functions:
+// allow<content type>Origin(origin): allows the type of content to be loaded
+// from the given origin
+// allow<content type>DataUrl(): allows the content to be loaded from data: URLs
+// allow<content type>SameOrigin(): allows the content to be loaded from the
+// same origin
+// disallow<content type>(): disallows this type of content all together (can't
+// be called for script)
+//
+// The following functions allow you to set defaults for where content can be
+// loaded from when no other rules have been specified for that type of content:
+// allowAllContentOrigin(origin)
+// allowAllContentDataUrl()
+// allowAllContentSameOrigin()
+// disallowAllContent()
+//
+//
+// For controlling which origins can frame this app,
+// BrowserPolicy.disallowFraming()
+// BrowserPolicy.allowFramingByOrigin(origin)
+// BrowserPolicy.allowFramingBySameOrigin()
+// BrowserPolicy.allowFramingByAnyOrigin();
+
+var xFrameOptions;
+var cspSrcs;
+
+// CSP keywords have to be single-quoted.
+var unsafeInline = "'unsafe-inline'";
+var unsafeEval = "'unsafe-eval'";
+var selfKeyword = "'self'";
+var noneKeyword = "'none'";
+
+var constructCsp = function () {
+  _.each(_.keys(cspSrcs), function (directive) {
+    if (_.isEmpty(cspSrcs[directive]))
+      delete cspSrcs[directive];
+  });
+
+  var header = _.map(cspSrcs, function (srcs, directive) {
+    return directive + " " + srcs.join(" ") + ";";
+  }).join(" ");
+
+  return header;
+};
+
+var parseCsp = function (csp) {
+  var policies = csp.split("; ");
+  var result = {};
+  _.each(policies, function (policy) {
+    if (policy[policy.length-1] === ";")
+      policy = policy.substring(0, policy.length - 1);
+    var srcs = policy.split(" ");
+    var directive = srcs[0];
+    result[directive] = srcs.slice(1);
+  });
+  return result;
+};
+
+var removeCspSrc = function (directive, src) {
+  cspSrcs[directive] = _.without(cspSrcs[directive] || [], src);
+};
+
+var ensureDirective = function (directive) {
+  if (! _.has(cspSrcs, directive))
+    cspSrcs[directive] = [];
+};
+
+WebApp.connectHandlers.use(function (req, res, next) {
+  if (xFrameOptions)
+    res.setHeader("X-Frame-Options", xFrameOptions);
+  if (cspSrcs)
+    res.setHeader("Content-Security-Policy", constructCsp());
+  next();
+});
+
+BrowserPolicy = {
+  allowFramingBySameOrigin: function () {
+    xFrameOptions = "SAMEORIGIN";
+  },
+  disallowFraming: function () {
+    xFrameOptions = "DENY";
+  },
+  allowFramingByOrigin: function (origin) {
+    if (xFrameOptions.indexOf("ALLOW-FROM") === 0)
+      throw new Error("You can only specify one origin that is allowed to" +
+                      " frame this app.");
+    xFrameOptions = "ALLOW-FROM " + origin;
+  },
+  allowFramingByAnyOrigin: function () {
+    xFrameOptions = null;
+  },
+
+  setContentSecurityPolicy: function (csp) {
+    cspSrcs = parseCsp(csp);
+  },
+
+  // Helpers for creating content security policies
+
+  // Used by webapp to determine whether we need an extra round trip for
+  // __meteor_runtime_config__.
+  inlineScriptsAllowed: function () {
+    ensureDirective("script-src");
+    return (_.indexOf(cspSrcs["script-src"], unsafeInline) !== -1);
+  },
+
+  allowInlineScripts: function () {
+    ensureDirective("script-src");
+    cspSrcs["script-src"].push(unsafeInline);
+  },
+  disallowInlineScripts: function () {
+    ensureDirective("script-src");
+    removeCspSrc("script-src", unsafeInline);
+  },
+  allowEval: function () {
+    ensureDirective("script-src");
+    cspSrcs["script-src"].push(unsafeEval);
+  },
+  disallowEval: function () {
+    ensureDirective("script-src");
+    removeCspSrc("script-src", unsafeEval);
+  },
+  allowInlineStyles: function () {
+    ensureDirective("style-src");
+    cspSrcs["style-src"].push(unsafeInline);
+  },
+  disallowInlineStyles: function () {
+    ensureDirective("style-src");
+    removeCspSrc("style-src", unsafeInline);
+  },
+
+  // Functions for setting defaults
+  allowAllContentSameOrigin: function () {
+    ensureDirective("default-src");
+    cspSrcs["default-src"].push(selfKeyword);
+  },
+  allowAllContentDataUrl: function () {
+    ensureDirective("default-src");
+    cspSrcs["default-src"].push("data:");
+  },
+  allowAllContentOrigin: function (origin) {
+    ensureDirective("default-src");
+    cspSrcs["default-src"].push(origin);
+  },
+  disallowAllContent: function () {
+    cspSrcs["default-src"] = [noneKeyword];
+  }
+};
+
+// allow<Resource>Origin, allow<Resource>Data, allow<Resource>self, and
+// disallow<Resource> methods for each type of resource.
+_.each(["script", "object", "img", "media",
+        "font", "connect", "style"],
+       function (resource) {
+         var directive = resource + "-src";
+         var methodResource;
+         if (resource !== "img") {
+           methodResource = resource.charAt(0).toUpperCase() +
+             resource.slice(1);
+         } else {
+           methodResource = "Image";
+         }
+         var allowMethodName = "allow" + methodResource + "Origin";
+         var disallowMethodName = "disallow" + methodResource;
+         var allowDataMethodName = "allow" + methodResource + "DataUrl";
+         var allowSelfMethodName = "allow" + methodResource + "SameOrigin";
+
+         BrowserPolicy[allowMethodName] = function (src) {
+           ensureDirective(directive);
+           cspSrcs[directive].push(src);
+         };
+         if (resource !== "script") {
+           BrowserPolicy[disallowMethodName] = function () {
+             cspSrcs[directive] = [noneKeyword];
+           };
+         }
+         BrowserPolicy[allowDataMethodName] = function () {
+           ensureDirective(directive);
+           cspSrcs[directive].push("data:");
+         };
+       });
diff --git a/packages/browser-policy/package.js b/packages/browser-policy/package.js
new file mode 100644
index 0000000000..c90f070623
--- /dev/null
+++ b/packages/browser-policy/package.js
@@ -0,0 +1,9 @@
+Package.describe({
+  summary: "Configure security policies enforced by the browser"
+});
+
+Package.on_use(function (api) {
+  api.use(["underscore", "webapp"], "server");
+  api.add_files("browser-policy.js", "server");
+  api.export("BrowserPolicy", "server");
+});
diff --git a/packages/starter-browser-policy/.gitignore b/packages/starter-browser-policy/.gitignore
new file mode 100644
index 0000000000..677a6fc263
--- /dev/null
+++ b/packages/starter-browser-policy/.gitignore
@@ -0,0 +1 @@
+.build*
diff --git a/packages/starter-browser-policy/package.js b/packages/starter-browser-policy/package.js
new file mode 100644
index 0000000000..6a7bc6d95f
--- /dev/null
+++ b/packages/starter-browser-policy/package.js
@@ -0,0 +1,8 @@
+Package.describe({
+  summary: "Basic browser security policies"
+});
+
+Package.on_use(function (api) {
+  api.use("browser-policy", "server");
+  api.add_files("starter-browser-policy.js", "server");
+});
diff --git a/packages/starter-browser-policy/starter-browser-policy.js b/packages/starter-browser-policy/starter-browser-policy.js
new file mode 100644
index 0000000000..4d7650878d
--- /dev/null
+++ b/packages/starter-browser-policy/starter-browser-policy.js
@@ -0,0 +1,13 @@
+BrowserPolicy.allowFramingBySameOrigin();
+
+// By default, unsafe inline scripts and styles are allowed, since we expect
+// many apps will use them for analytics, etc. Unsafe eval is disallowed, and
+// the only allowable content source is the same origin or data, except for
+// connect which allows anything (since meteor.com apps make websocket
+// connections to a lot of different origins).
+
+BrowserPolicy.setContentSecurityPolicy("default-src 'self'; " +
+                                       "script-src 'self' 'unsafe-inline'; " +
+                                       "connect-src *; " +
+                                       "img-src data: 'self'; " +
+                                       "style-src 'self' 'unsafe-inline';");
diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js
index af716d5d3a..3380ab81d2 100644
--- a/packages/webapp/webapp_server.js
+++ b/packages/webapp/webapp_server.js
@@ -147,7 +147,6 @@ var appUrl = function (url) {
   return true;
 };
 
-
 var runWebAppServer = function () {
   // read the control for the client we'll be serving up
   var clientJsonPath = path.join(__meteor_bootstrap__.serverDir,
@@ -231,6 +230,17 @@ var runWebAppServer = function () {
       next();
       return;
     }
+
+    if (Package["browser-policy"] &&
+        ! Package["browser-policy"].BrowserPolicy.inlineScriptsAllowed() &&
+        pathname === "/meteor_runtime_config.js") {
+      res.writeHead(200, { 'Content-type': 'application/javascript' });
+      res.write("__meteor_runtime_config__ = " +
+                JSON.stringify(__meteor_runtime_config__) + ";");
+      res.end();
+      return;
+    }
+
     if (!_.has(staticFiles, pathname)) {
       next();
       return;
@@ -387,15 +397,25 @@ var runWebAppServer = function () {
     argv = optimist(argv).boolean('keepalive').argv;
 
     var boilerplateHtmlPath = path.join(clientDir, clientJson.page);
-    boilerplateHtml =
-      fs.readFileSync(boilerplateHtmlPath, 'utf8')
-      .replace(
-        "// ##RUNTIME_CONFIG##",
-        "__meteor_runtime_config__ = " +
-          JSON.stringify(__meteor_runtime_config__) + ";")
-      .replace(
-          /##ROOT_URL_PATH_PREFIX##/g,
-        __meteor_runtime_config__.ROOT_URL_PATH_PREFIX || "");
+    boilerplateHtml = fs.readFileSync(boilerplateHtmlPath, 'utf8');
+
+    // Include __meteor_runtime_config__ in the app html, as an inline script if
+    // it's not forbidden by CSP.
+    if (! Package["browser-policy"] ||
+        Package["browser-policy"].BrowserPolicy.inlineScriptsAllowed()) {
+      boilerplateHtml = boilerplateHtml.replace(
+          /##RUNTIME_CONFIG##/,
+        "<script type='text/javascript'>__meteor_runtime_config__ = " +
+          JSON.stringify(__meteor_runtime_config__) + ";</script>");
+    } else {
+      boilerplateHtml = boilerplateHtml.replace(
+        /##RUNTIME_CONFIG##/,
+        "<script type='text/javascript' src='##ROOT_URL_PATH_PREFIX##/meteor_runtime_config.js'></script>"
+      );
+    }
+    boilerplateHtml = boilerplateHtml.replace(
+        /##ROOT_URL_PATH_PREFIX##/g,
+      __meteor_runtime_config__.ROOT_URL_PATH_PREFIX || "");
 
     // only start listening after all the startup code has run.
     var localPort = parseInt(process.env.PORT) || 0;
diff --git a/tools/app.html.in b/tools/app.html.in
index bf821f6054..e2bc250d0f 100644
--- a/tools/app.html.in
+++ b/tools/app.html.in
@@ -4,9 +4,7 @@
 {{#each stylesheets}}  <link rel="stylesheet" href="##ROOT_URL_PATH_PREFIX##{{this}}">
 {{/each}}
 
-<script type="text/javascript">
-// ##RUNTIME_CONFIG##
-</script>
+##RUNTIME_CONFIG##
 
 {{#each scripts}}  <script type="text/javascript" src="##ROOT_URL_PATH_PREFIX##{{this}}"></script>
 {{/each}}

From e6300461b1c0b1c53344882ef5d75c450a923f00 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Fri, 30 Aug 2013 18:32:20 -0700
Subject: [PATCH 129/335] Reorganize browser-policy docs a bit.

Addressing Nick's suggestions. Haven't decided yet about combining
browser-policy and starter-browser-policy docs.
---
 docs/client/docs.js                           |  6 +--
 docs/client/packages.html                     |  4 +-
 docs/client/packages/browser-policy.html      | 45 ++++++++++---------
 .../packages/starter-browser-policy.html      |  8 ++--
 packages/browser-policy/browser-policy.js     |  1 +
 packages/webapp/package.js                    |  3 ++
 6 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/docs/client/docs.js b/docs/client/docs.js
index 036ed23c89..dc489c7cb5 100644
--- a/docs/client/docs.js
+++ b/docs/client/docs.js
@@ -335,6 +335,7 @@ var toc = [
     "audit-argument-checks",
     "backbone",
     "bootstrap",
+    "browser-policy",
     "coffeescript",
     "d3",
     "force-ssl",
@@ -344,9 +345,8 @@ var toc = [
     "spiderable",
     "stylus",
     "showdown",
-    "underscore",
-    "browser-policy",
-    "starter-browser-policy"
+    "starter-browser-policy",
+    "underscore"
   ] ],
 
   "Command line", [ [
diff --git a/docs/client/packages.html b/docs/client/packages.html
index ac344171cd..c891bbc5cd 100644
--- a/docs/client/packages.html
+++ b/docs/client/packages.html
@@ -22,6 +22,7 @@ and removed with:
 {{> pkg_audit_argument_checks}}
 {{> pkg_backbone}}
 {{> pkg_bootstrap}}
+{{> pkg_browser_policy}}
 {{> pkg_coffeescript}}
 {{> pkg_d3}}
 {{> pkg_force_ssl}}
@@ -31,9 +32,8 @@ and removed with:
 {{> pkg_spiderable}}
 {{> pkg_stylus}}
 {{> pkg_showdown}}
-{{> pkg_underscore}}
-{{> pkg_browser_policy}}
 {{> pkg_starter_browser_policy}}
+{{> pkg_underscore}}
 
 {{/better_markdown}}
 </template>
diff --git a/docs/client/packages/browser-policy.html b/docs/client/packages/browser-policy.html
index b2da7d5117..efc4c2c275 100644
--- a/docs/client/packages/browser-policy.html
+++ b/docs/client/packages/browser-policy.html
@@ -16,12 +16,13 @@ attacks</a>.
 tells the browser where your app can load content from, which encourages safe
 practices and mitigates the damage of a cross-site-scripting attack.
 
-For most apps, we recommend that you use the `starter-browser-policy` package to
-enable reasonable policies, and then use the functions below to tighten or relax
-the policies as necessary. For example, an app that only loads content from its
-own origin and that doesn't use inline Javascript should use
-`starter-browser-policy` and then call `BrowserPolicy.disallowInlineScripts()`
-to gain additional security against cross-site scripting attacks.
+For most apps, we recommend that you use the
+[`starter-browser-policy`](#starterbrowserpolicy) package to enable reasonable
+policies, and then use the functions below to tighten or relax the policies as
+necessary. For example, an app that only loads content from its own origin and
+that doesn't use inline Javascript should use `starter-browser-policy` and then
+call `BrowserPolicy.disallowInlineScripts()` to gain additional security against
+cross-site scripting attacks.
 
 You can use the following functions to specify which websites are allowed to
 frame your app:
@@ -31,10 +32,11 @@ Your app will never render inside a frame or iframe.
 {{/dtdd}}
 
 {{#dtdd "BrowserPolicy.allowFramingByOrigin(origin)"}}
-Your app will only render inside frames loaded by `origin` (such as
-http://meteor.com). You can only call this function once with a single origin,
-and cannot specify multiple origins that are allowed to frame your app. (This is
-a limitation of the X-Frame-Options header.)
+Your app will only render inside frames loaded by `origin`. You can only call
+this function once with a single origin, and cannot use wildcards or specify
+multiple origins that are allowed to frame your app. (This is a limitation of
+the X-Frame-Options header.) Example values of `origin` include
+"http://example.com" and "https://foo.example.com".
 {{/dtdd}}
 
 {{#dtdd "BrowserPolicy.allowFramingBySameOrigin()"}}
@@ -79,17 +81,7 @@ Disallows inline CSS.
 </dl>
 
 Finally, you can configure a whitelist of allowed requests that various types of
-content can make. Examples:
-
-* `BrowserPolicy.disallowObject()` causes the browser to disallow all
-`<object>` tags.
-* `BrowserPolicy.allowImageOrigin("https://example.com")`
-allows images to have their `src` attributes point to images served from
-`https://example.com`.
-* `BrowserPolicy.allowConnectOrigin("https://example.com")` allows XMLHttpRequest
-and WebSocket connections to `https://example.com`.
-
-The following functions are defined for the content types
+content can make. The following functions are defined for the content types
 script, object, image, media, font, and connect.
 
 <dl class="callbacks">
@@ -122,5 +114,16 @@ app's origin but you want to disable `<object>` tags, you can simply call
 `BrowserPolicy.allowAllContentSameOrigin()` followed by
 `BrowserPolicy.disallowObject()`.
 
+Other examples of using the `BrowserPolicy` API:
+
+* `BrowserPolicy.disallowObject()` causes the browser to disallow all
+`<object>` tags.
+* `BrowserPolicy.allowImageOrigin("https://example.com")`
+allows images to have their `src` attributes point to images served from
+`https://example.com`.
+* `BrowserPolicy.allowConnectOrigin("https://example.com")` allows XMLHttpRequest
+and WebSocket connections to `https://example.com`.
+
+
 {{/better_markdown}}
 </template>
diff --git a/docs/client/packages/starter-browser-policy.html b/docs/client/packages/starter-browser-policy.html
index bb1118fc0d..71ff88911a 100644
--- a/docs/client/packages/starter-browser-policy.html
+++ b/docs/client/packages/starter-browser-policy.html
@@ -2,10 +2,10 @@
 {{#better_markdown}}
 ## `starter-browser-policy`
 
-The `starter-browser-policy` package provides a recommended configuration for the
-`browser-policy` package. When you add `starter-browser-policy` to your app, the
-following policies will be enforced by browsers that support the X-Frame-Options
-and Content-Security-Policy headers:
+The `starter-browser-policy` package provides a recommended configuration for
+the [`browser-policy`](#browserpolicy) package. When you add
+`starter-browser-policy` to your app, the following policies will be enforced by
+browsers that support the X-Frame-Options and Content-Security-Policy headers:
 
 * Only webpages on the same origin as your app can frame your app.
 * Your app can only load content (images, scripts, fonts, etc.) from its own
diff --git a/packages/browser-policy/browser-policy.js b/packages/browser-policy/browser-policy.js
index 3d9d8e330c..5f54c8d6d3 100644
--- a/packages/browser-policy/browser-policy.js
+++ b/packages/browser-policy/browser-policy.js
@@ -81,6 +81,7 @@ var removeCspSrc = function (directive, src) {
 };
 
 var ensureDirective = function (directive) {
+  cspSrcs = cspSrcs || {};
   if (! _.has(cspSrcs, directive))
     cspSrcs[directive] = [];
 };
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 0f89553822..c451f2086a 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -12,6 +12,9 @@ Package.on_use(function (api) {
   api.use(['application-configuration'], {
     unordered: true
   });
+  api.use(['browser-policy'], {
+    unordered: true
+  });
   api.export(['WebApp', 'main', 'WebAppInternals'], 'server');
   api.add_files('webapp_server.js', 'server');
 });

From a102872a963e367962f91291a37b0fff7df1e38e Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Tue, 10 Sep 2013 17:08:42 -0700
Subject: [PATCH 130/335] Rework browser-policy to make API more intuitive.

- Remove starter-browser-policy and replace it with
  BrowserPolicy.enableContentSecurityPolicy(), which gives you the starter
  policy and allows you to use the other BrowserPolicy functions to configure
  it. This is motivated by the fact that the API isn't very intuitive without a
  well-defined starting policy. ex: if the package starts off without a policy,
  and then the user calls allowAllContentSameOrigin(), that will result in
  turning off inline scripts, which is probably not what they wanted.
- AllContent functions do more of what you'd expect now;
  i.e. BrowserPolicy.disallowAllContent() actually disallows all content,
  instead of setting default-src to 'none', which will allow other types of
  content that have previously had srcs set for them.
- Add some tests
---
 docs/client/docs.js                           |   1 -
 docs/client/packages.html                     |   1 -
 docs/client/packages/browser-policy.html      |  53 +++++--
 .../packages/starter-browser-policy.html      |  25 ---
 .../browser-policy/browser-policy-test.js     | 123 +++++++++++++++
 packages/browser-policy/browser-policy.js     | 148 +++++++++++++-----
 packages/browser-policy/package.js            |   5 +
 packages/starter-browser-policy/.gitignore    |   1 -
 packages/starter-browser-policy/package.js    |   8 -
 .../starter-browser-policy.js                 |  13 --
 10 files changed, 277 insertions(+), 101 deletions(-)
 delete mode 100644 docs/client/packages/starter-browser-policy.html
 create mode 100644 packages/browser-policy/browser-policy-test.js
 delete mode 100644 packages/starter-browser-policy/.gitignore
 delete mode 100644 packages/starter-browser-policy/package.js
 delete mode 100644 packages/starter-browser-policy/starter-browser-policy.js

diff --git a/docs/client/docs.js b/docs/client/docs.js
index dc489c7cb5..3ac001e554 100644
--- a/docs/client/docs.js
+++ b/docs/client/docs.js
@@ -345,7 +345,6 @@ var toc = [
     "spiderable",
     "stylus",
     "showdown",
-    "starter-browser-policy",
     "underscore"
   ] ],
 
diff --git a/docs/client/packages.html b/docs/client/packages.html
index c891bbc5cd..077e4f1cd1 100644
--- a/docs/client/packages.html
+++ b/docs/client/packages.html
@@ -32,7 +32,6 @@ and removed with:
 {{> pkg_spiderable}}
 {{> pkg_stylus}}
 {{> pkg_showdown}}
-{{> pkg_starter_browser_policy}}
 {{> pkg_underscore}}
 
 {{/better_markdown}}
diff --git a/docs/client/packages/browser-policy.html b/docs/client/packages/browser-policy.html
index efc4c2c275..5b8e31354e 100644
--- a/docs/client/packages/browser-policy.html
+++ b/docs/client/packages/browser-policy.html
@@ -16,13 +16,26 @@ attacks</a>.
 tells the browser where your app can load content from, which encourages safe
 practices and mitigates the damage of a cross-site-scripting attack.
 
-For most apps, we recommend that you use the
-[`starter-browser-policy`](#starterbrowserpolicy) package to enable reasonable
-policies, and then use the functions below to tighten or relax the policies as
-necessary. For example, an app that only loads content from its own origin and
-that doesn't use inline Javascript should use `starter-browser-policy` and then
-call `BrowserPolicy.disallowInlineScripts()` to gain additional security against
-cross-site scripting attacks.
+For most apps, we recommend that you take the following steps when using
+`browser-policy`:
+
+* Call `BrowserPolicy.enableContentSecurityPolicy()` to enable a starter policy
+for your app. With this starter policy, your app's client code will be able to
+load content (images, scripts, fonts, etc.) only from its own origin, except
+that XMLHttpRequests and WebSocket connections can go to any origin. Further,
+your app's client code will not be able to use functions such as `eval()` that
+convert strings to code.
+* You can use the functions described below to customize the content
+security policy. If your app does not need any inline Javascript such as inline
+`<script>` tags, we recommend that you modify the policy by calling
+`BrowserPolicy.disallowInlineScripts()` in server code. This will result in one
+extra round trip when your app is loaded, but will help prevent cross-site
+scripting attacks by disabling all scripts except those loaded from a `script
+src` attribute.
+* If your app does not need to be framed by other websites, call
+`BrowserPolicy.allowFramingBySameOrigin()` to help prevent clickjacking attacks.
+
+#### Frame options
 
 You can use the following functions to specify which websites are allowed to
 frame your app:
@@ -36,7 +49,9 @@ Your app will only render inside frames loaded by `origin`. You can only call
 this function once with a single origin, and cannot use wildcards or specify
 multiple origins that are allowed to frame your app. (This is a limitation of
 the X-Frame-Options header.) Example values of `origin` include
-"http://example.com" and "https://foo.example.com".
+"http://example.com" and "https://foo.example.com". Note that this value of the
+X-Frame-Options header is not yet supported in Chrome or Safari and will be
+ignored in those browsers.
 {{/dtdd}}
 
 {{#dtdd "BrowserPolicy.allowFramingBySameOrigin()"}}
@@ -49,8 +64,16 @@ Your app can be framed by any website.
 {{/dtdd}}
 </dl>
 
-You can use these functions to tighten or relax restrictions on where Javascript
-and CSS can be run:
+#### Content options
+
+You can use the functions in this section to control how different types of
+content can be loaded on your site. In order to use any of these functions, you
+must first call `BrowserPolicy.enableContentSecurityPolicy()`, which enables the
+starter policy described above. This section covers additional functions that
+you can use to tighten or relax what content your app can use.
+
+You can use the following functions to tighten or relax restrictions on where
+Javascript and CSS can be run:
 
 <dl class="callbacks">
 {{#dtdd "BrowserPolicy.allowInlineScripts()"}}
@@ -107,11 +130,11 @@ Disallows this type of content on your app.
 {{/dtdd}}
 </dl>
 
-These functions are also defined for the content type `AllContent`, which sets
-defaults for content types that you haven't configured using one of the above
-functions. For example, if you want to allow all content to be loaded from your
-app's origin but you want to disable `<object>` tags, you can simply call
-`BrowserPolicy.allowAllContentSameOrigin()` followed by
+These functions are also defined for the content type `AllContent`, which is a
+shorthand for calling one of the above functions once for each content type.
+For example, if you want to allow the origin `https://foo.com` for all types of
+content but you want to disable `<object>` tags, you can call
+`BrowserPolicy.allowAllContentOrigin("https://foo.com")` followed by
 `BrowserPolicy.disallowObject()`.
 
 Other examples of using the `BrowserPolicy` API:
diff --git a/docs/client/packages/starter-browser-policy.html b/docs/client/packages/starter-browser-policy.html
deleted file mode 100644
index 71ff88911a..0000000000
--- a/docs/client/packages/starter-browser-policy.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<template name="pkg_starter_browser_policy">
-{{#better_markdown}}
-## `starter-browser-policy`
-
-The `starter-browser-policy` package provides a recommended configuration for
-the [`browser-policy`](#browserpolicy) package. When you add
-`starter-browser-policy` to your app, the following policies will be enforced by
-browsers that support the X-Frame-Options and Content-Security-Policy headers:
-
-* Only webpages on the same origin as your app can frame your app.
-* Your app can only load content (images, scripts, fonts, etc.) from its own
-origin, except that XMLHttpRequests and WebSocket connections can go to any
-origin.
-* Your app's client code cannot use functions such as `eval()` that convert
-strings to Javascript code.
-
-If your app does not need any inline Javascript such as inline `<script>` tags,
-we recommend that you modify this policy by calling
-`BrowserPolicy.disallowInlineScripts()` on the server. This will result in one
-extra round trip when your app is loaded, but will help prevent cross-site
-scripting attacks by disabling all scripts except those loaded from a `script
-src` attribute.
-
-{{/better_markdown}}
-</template>
diff --git a/packages/browser-policy/browser-policy-test.js b/packages/browser-policy/browser-policy-test.js
new file mode 100644
index 0000000000..875a6323eb
--- /dev/null
+++ b/packages/browser-policy/browser-policy-test.js
@@ -0,0 +1,123 @@
+var cspsEqual = function (csp1, csp2) {
+  var cspToObj = function (csp) {
+    csp = csp.substring(0, csp.length - 1);
+    var parts = _.map(csp.split("; "), function (part) {
+      return part.split(" ");
+    });
+    var keys = _.map(parts, _.first);
+    var values = _.map(parts, _.rest);
+    _.each(values, function (value) {
+      value.sort();
+    });
+    return _.object(keys, values);
+  };
+
+  return EJSON.equals(cspToObj(csp1), cspToObj(csp2));
+};
+
+Tinytest.add("browser-policy - csp", function (test) {
+  var defaultCsp = "default-src 'self'; script-src 'self' 'unsafe-inline'; " +
+        "connect-src * 'self'; img-src data: 'self'; style-src 'self' 'unsafe-inline';"
+  BrowserPolicy.enableContentSecurityPolicy();
+
+  // Default policy
+  test.isTrue(cspsEqual(BrowserPolicy._constructCsp(), defaultCsp));
+  test.isTrue(BrowserPolicy.inlineScriptsAllowed());
+
+  // Redundant whitelisting (inline scripts already allowed in default policy)
+  BrowserPolicy.allowInlineScripts();
+  test.isTrue(cspsEqual(BrowserPolicy._constructCsp(), defaultCsp));
+
+  // Disallow inline scripts
+  BrowserPolicy.disallowInlineScripts();
+  test.isTrue(cspsEqual(BrowserPolicy._constructCsp(),
+                        "default-src 'self'; script-src 'self'; " +
+                        "connect-src * 'self'; img-src data: 'self'; style-src 'self' 'unsafe-inline';"));
+  test.isFalse(BrowserPolicy.inlineScriptsAllowed());
+
+  // Allow eval
+  BrowserPolicy.allowEval();
+  test.isTrue(cspsEqual(BrowserPolicy._constructCsp(), "default-src 'self'; script-src 'self' 'unsafe-eval'; " +
+                        "connect-src * 'self'; img-src data: 'self'; style-src 'self' 'unsafe-inline';"));
+
+  // Disallow inline styles
+  BrowserPolicy.disallowInlineStyles();
+  test.isTrue(cspsEqual(BrowserPolicy._constructCsp(), "default-src 'self'; script-src 'self' 'unsafe-eval'; " +
+                        "connect-src * 'self'; img-src data: 'self'; style-src 'self';"));
+
+  // Allow data: urls everywhere
+  BrowserPolicy.allowAllContentDataUrl();
+  test.isTrue(cspsEqual(BrowserPolicy._constructCsp(),
+                        "default-src 'self' data:; script-src 'self' 'unsafe-eval' data:; " +
+                        "connect-src * data: 'self'; img-src data: 'self'; style-src 'self' data:;"));
+
+  // Disallow everything
+  BrowserPolicy.disallowAllContent();
+  test.isTrue(cspsEqual(BrowserPolicy._constructCsp(), "default-src 'none';"));
+  test.isFalse(BrowserPolicy.inlineScriptsAllowed());
+
+  // Put inline scripts back in
+  BrowserPolicy.allowInlineScripts();
+  test.isTrue(cspsEqual(BrowserPolicy._constructCsp(),
+                        "default-src 'none'; script-src 'unsafe-inline';"));
+  test.isTrue(BrowserPolicy.inlineScriptsAllowed());
+
+  // Add 'self' to all content types
+  BrowserPolicy.allowAllContentSameOrigin();
+  test.isTrue(cspsEqual(BrowserPolicy._constructCsp(),
+                        "default-src 'self'; script-src 'self' 'unsafe-inline';"));
+  test.isTrue(BrowserPolicy.inlineScriptsAllowed());
+
+  // Disallow all content except same-origin scripts
+  BrowserPolicy.disallowAllContent();
+  BrowserPolicy.allowScriptSameOrigin();
+  test.isTrue(cspsEqual(BrowserPolicy._constructCsp(),
+                        "default-src 'none'; script-src 'self';"));
+  test.isFalse(BrowserPolicy.inlineScriptsAllowed());
+
+  // Starting with all content same origin, disallowScript() and then allow
+  // inline scripts. Result should be that that only inline scripts can execute,
+  // not same-origin scripts.
+  BrowserPolicy.disallowAllContent();
+  BrowserPolicy.allowAllContentSameOrigin();
+  test.isTrue(cspsEqual(BrowserPolicy._constructCsp(), "default-src 'self';"));
+  BrowserPolicy.disallowScript();
+  test.isTrue(cspsEqual(BrowserPolicy._constructCsp(),
+                        "default-src 'self'; script-src 'none';"));
+  BrowserPolicy.allowInlineScripts();
+  test.isTrue(cspsEqual(BrowserPolicy._constructCsp(),
+                        "default-src 'self'; script-src 'unsafe-inline';"));
+
+  // Starting with all content same origin, allow inline scripts. (Should result
+  // in both same origin and inline scripts allowed.)
+  BrowserPolicy.disallowAllContent();
+  BrowserPolicy.allowAllContentSameOrigin();
+  BrowserPolicy.allowInlineScripts();
+  test.isTrue(cspsEqual(BrowserPolicy._constructCsp(),
+                        "default-src 'self'; script-src 'self' 'unsafe-inline';"));
+  BrowserPolicy.disallowInlineScripts();
+  test.isTrue(cspsEqual(BrowserPolicy._constructCsp(),
+                        "default-src 'self'; script-src 'self';"));
+
+  // Allow same origin for all content, then disallow object entirely.
+  BrowserPolicy.disallowAllContent();
+  BrowserPolicy.allowAllContentSameOrigin();
+  BrowserPolicy.disallowObject();
+  test.isTrue(cspsEqual(BrowserPolicy._constructCsp(),
+                        "default-src 'self'; object-src 'none';"));
+});
+
+Tinytest.add("browser-policy - x-frame-options", function (test) {
+  BrowserPolicy._reset();
+  BrowserPolicy.disallowFraming();
+  test.equal(BrowserPolicy._constructXFrameOptions(), "DENY");
+  BrowserPolicy.allowFramingBySameOrigin();
+  test.equal(BrowserPolicy._constructXFrameOptions(), "SAMEORIGIN");
+  BrowserPolicy.allowFramingByOrigin("foo.com");
+  test.equal(BrowserPolicy._constructXFrameOptions(), "ALLOW-FROM foo.com");
+  test.throws(function () {
+    BrowserPolicy.allowFramingByOrigin("bar.com");
+  });
+  BrowserPolicy.allowFramingByAnyOrigin();
+  test.isFalse(BrowserPolicy._constructXFrameOptions());
+});
diff --git a/packages/browser-policy/browser-policy.js b/packages/browser-policy/browser-policy.js
index 5f54c8d6d3..40588dc536 100644
--- a/packages/browser-policy/browser-policy.js
+++ b/packages/browser-policy/browser-policy.js
@@ -1,10 +1,13 @@
-// We recommend that you use the starter-browser-policy package to enable the
-// following default policy:
-// 1.) Only the same origin can frame the app.
-// 2.) No eval or other string-to-code, and content can only be loaded from the
+// To enable CSP, call BrowserPolicy.enableContentSecurityPolicy(). This enables
+// the following default policy:
+// No eval or other string-to-code, and content can only be loaded from the
 // same origin as the app (except for XHRs and websocket connections, which can
 // go to any origin).
 //
+// Apps should call BrowserPolicy.allowFramingBySameOrigin() to allow only
+// same-origin pages to frame their apps, if they don't explicitly want to be
+// framed by third-party sites.
+//
 // Apps should call BrowserPolicy.disallowInlineScripts() if they are not using
 // any inline script tags and are willing to accept an extra round trip on page
 // load.
@@ -27,8 +30,8 @@
 // disallow<content type>(): disallows this type of content all together (can't
 // be called for script)
 //
-// The following functions allow you to set defaults for where content can be
-// loaded from when no other rules have been specified for that type of content:
+// The following functions allow you to set rules for all types of content at
+// once:
 // allowAllContentOrigin(origin)
 // allowAllContentDataUrl()
 // allowAllContentSameOrigin()
@@ -43,6 +46,7 @@
 
 var xFrameOptions;
 var cspSrcs;
+//var cspUnsafeAllowed;
 
 // CSP keywords have to be single-quoted.
 var unsafeInline = "'unsafe-inline'";
@@ -50,30 +54,56 @@ var unsafeEval = "'unsafe-eval'";
 var selfKeyword = "'self'";
 var noneKeyword = "'none'";
 
-var constructCsp = function () {
-  _.each(_.keys(cspSrcs), function (directive) {
-    if (_.isEmpty(cspSrcs[directive]))
-      delete cspSrcs[directive];
-  });
+var cspEnabled = false;
+
+BrowserPolicy = {};
+
+// Exported for tests.
+var constructXFrameOptions = BrowserPolicy._constructXFrameOptions =
+      function () {
+        return xFrameOptions;
+      };
+
+var constructCsp = BrowserPolicy._constructCsp = function () {
+  if (! cspEnabled)
+    return null;
+
+  cspSrcs = cspSrcs || {};
 
   var header = _.map(cspSrcs, function (srcs, directive) {
-    return directive + " " + srcs.join(" ") + ";";
-  }).join(" ");
+    srcs = srcs || [];
+    if (_.isEmpty(srcs))
+      srcs = [noneKeyword];
+    var directiveCsp = _.uniq(srcs).join(" ");
+    return directive + " " + directiveCsp + ";";
+  });
 
+  header = header.join(" ");
   return header;
 };
 
 var parseCsp = function (csp) {
   var policies = csp.split("; ");
-  var result = {};
+  cspSrcs = {};
   _.each(policies, function (policy) {
-    if (policy[policy.length-1] === ";")
+    if (policy[policy.length - 1] === ";")
       policy = policy.substring(0, policy.length - 1);
     var srcs = policy.split(" ");
     var directive = srcs[0];
-    result[directive] = srcs.slice(1);
+    if (_.indexOf(srcs, noneKeyword) !== -1)
+      cspSrcs[directive] = null;
+    else
+      cspSrcs[directive] = srcs.slice(1);
+  });
+
+  if (cspSrcs["default-src"] === undefined)
+    throw new Error("Content Security Policies used with " +
+                    "browser-policy must specify a default-src.");
+
+  // Copy default-src sources to other directives.
+  _.each(cspSrcs, function (sources, directive) {
+    cspSrcs[directive] = _.union(sources || [], cspSrcs["default-src"] || []);
   });
-  return result;
 };
 
 var removeCspSrc = function (directive, src) {
@@ -81,28 +111,45 @@ var removeCspSrc = function (directive, src) {
 };
 
 var ensureDirective = function (directive) {
+  throwIfNotEnabled();
   cspSrcs = cspSrcs || {};
   if (! _.has(cspSrcs, directive))
-    cspSrcs[directive] = [];
+    cspSrcs[directive] = _.clone(cspSrcs["default-src"]);
+};
+
+var throwIfNotEnabled = function () {
+  if (! cspEnabled)
+    throw new Error("Enable this function by calling "+
+                    "BrowserPolicy.enableContentSecurityPolicy().");
 };
 
 WebApp.connectHandlers.use(function (req, res, next) {
   if (xFrameOptions)
-    res.setHeader("X-Frame-Options", xFrameOptions);
-  if (cspSrcs)
+    res.setHeader("X-Frame-Options", constructXFrameOptions());
+  if (cspEnabled)
     res.setHeader("Content-Security-Policy", constructCsp());
   next();
 });
 
-BrowserPolicy = {
+BrowserPolicy = _.extend(BrowserPolicy, {
+  _reset: function () {
+    xFrameOptions = null;
+    cspSrcs = null;
+    cspEnabled = false;
+  },
+
   allowFramingBySameOrigin: function () {
     xFrameOptions = "SAMEORIGIN";
   },
   disallowFraming: function () {
     xFrameOptions = "DENY";
   },
+  // ALLOW-FROM not supported in Chrome or Safari.
   allowFramingByOrigin: function (origin) {
-    if (xFrameOptions.indexOf("ALLOW-FROM") === 0)
+    // Trying to specify two allow-from throws to prevent users from
+    // accidentally overwriting an allow-from origin when they think they are
+    // adding multiple origins.
+    if (xFrameOptions && xFrameOptions.indexOf("ALLOW-FROM") === 0)
       throw new Error("You can only specify one origin that is allowed to" +
                       " frame this app.");
     xFrameOptions = "ALLOW-FROM " + origin;
@@ -111,17 +158,38 @@ BrowserPolicy = {
     xFrameOptions = null;
   },
 
+  enableContentSecurityPolicy: function () {
+    // By default, unsafe inline scripts and styles are allowed, since we expect
+    // many apps will use them for analytics, etc. Unsafe eval is disallowed, and
+    // the only allowable content source is the same origin or data, except for
+    // connect which allows anything (since meteor.com apps make websocket
+    // connections to a lot of different origins).
+    cspEnabled = true;
+    cspSrcs = {};
+    BrowserPolicy.setContentSecurityPolicy("default-src 'self'; " +
+                                           "script-src 'self' 'unsafe-inline'; " +
+                                           "connect-src *; " +
+                                           "img-src data: 'self'; " +
+                                           "style-src 'self' 'unsafe-inline';");
+  },
+
   setContentSecurityPolicy: function (csp) {
-    cspSrcs = parseCsp(csp);
+    throwIfNotEnabled();
+    parseCsp(csp);
   },
 
   // Helpers for creating content security policies
 
+  _keywordAllowed: function (directive, keyword) {
+    return ! cspEnabled ||
+      (cspSrcs[directive] &&
+       _.indexOf(cspSrcs[directive], keyword) !== -1);
+  },
+
   // Used by webapp to determine whether we need an extra round trip for
   // __meteor_runtime_config__.
   inlineScriptsAllowed: function () {
-    ensureDirective("script-src");
-    return (_.indexOf(cspSrcs["script-src"], unsafeInline) !== -1);
+    return BrowserPolicy._keywordAllowed("script-src", unsafeInline);
   },
 
   allowInlineScripts: function () {
@@ -151,21 +219,24 @@ BrowserPolicy = {
 
   // Functions for setting defaults
   allowAllContentSameOrigin: function () {
-    ensureDirective("default-src");
-    cspSrcs["default-src"].push(selfKeyword);
+    BrowserPolicy.allowAllContentOrigin(selfKeyword);
   },
   allowAllContentDataUrl: function () {
-    ensureDirective("default-src");
-    cspSrcs["default-src"].push("data:");
+    BrowserPolicy.allowAllContentOrigin("data:");
   },
   allowAllContentOrigin: function (origin) {
     ensureDirective("default-src");
-    cspSrcs["default-src"].push(origin);
+    _.each(_.keys(cspSrcs), function (directive) {
+      cspSrcs[directive].push(origin);
+    });
   },
   disallowAllContent: function () {
-    cspSrcs["default-src"] = [noneKeyword];
+    throwIfNotEnabled();
+    cspSrcs = {
+      "default-src": []
+    };
   }
-};
+});
 
 // allow<Resource>Origin, allow<Resource>Data, allow<Resource>self, and
 // disallow<Resource> methods for each type of resource.
@@ -189,13 +260,16 @@ _.each(["script", "object", "img", "media",
            ensureDirective(directive);
            cspSrcs[directive].push(src);
          };
-         if (resource !== "script") {
-           BrowserPolicy[disallowMethodName] = function () {
-             cspSrcs[directive] = [noneKeyword];
-           };
-         }
+         BrowserPolicy[disallowMethodName] = function () {
+           throwIfNotEnabled();
+           cspSrcs[directive] = [];
+         };
          BrowserPolicy[allowDataMethodName] = function () {
            ensureDirective(directive);
            cspSrcs[directive].push("data:");
          };
+         BrowserPolicy[allowSelfMethodName] = function () {
+           ensureDirective(directive);
+           cspSrcs[directive].push(selfKeyword);
+         };
        });
diff --git a/packages/browser-policy/package.js b/packages/browser-policy/package.js
index c90f070623..ca3d0eff2f 100644
--- a/packages/browser-policy/package.js
+++ b/packages/browser-policy/package.js
@@ -7,3 +7,8 @@ Package.on_use(function (api) {
   api.add_files("browser-policy.js", "server");
   api.export("BrowserPolicy", "server");
 });
+
+Package.on_test(function (api) {
+  api.use(["tinytest", "browser-policy", "ejson"]);
+  api.add_files("browser-policy-test.js", "server");
+});
diff --git a/packages/starter-browser-policy/.gitignore b/packages/starter-browser-policy/.gitignore
deleted file mode 100644
index 677a6fc263..0000000000
--- a/packages/starter-browser-policy/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.build*
diff --git a/packages/starter-browser-policy/package.js b/packages/starter-browser-policy/package.js
deleted file mode 100644
index 6a7bc6d95f..0000000000
--- a/packages/starter-browser-policy/package.js
+++ /dev/null
@@ -1,8 +0,0 @@
-Package.describe({
-  summary: "Basic browser security policies"
-});
-
-Package.on_use(function (api) {
-  api.use("browser-policy", "server");
-  api.add_files("starter-browser-policy.js", "server");
-});
diff --git a/packages/starter-browser-policy/starter-browser-policy.js b/packages/starter-browser-policy/starter-browser-policy.js
deleted file mode 100644
index 4d7650878d..0000000000
--- a/packages/starter-browser-policy/starter-browser-policy.js
+++ /dev/null
@@ -1,13 +0,0 @@
-BrowserPolicy.allowFramingBySameOrigin();
-
-// By default, unsafe inline scripts and styles are allowed, since we expect
-// many apps will use them for analytics, etc. Unsafe eval is disallowed, and
-// the only allowable content source is the same origin or data, except for
-// connect which allows anything (since meteor.com apps make websocket
-// connections to a lot of different origins).
-
-BrowserPolicy.setContentSecurityPolicy("default-src 'self'; " +
-                                       "script-src 'self' 'unsafe-inline'; " +
-                                       "connect-src *; " +
-                                       "img-src data: 'self'; " +
-                                       "style-src 'self' 'unsafe-inline';");

From 9d1e3dbd562541164fc1f2d6b3e6fbe32b968223 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Fri, 13 Sep 2013 11:19:44 -0700
Subject: [PATCH 131/335] Enable CSP differently for tests.

Avoids sending header and using meteor_runtime_config.js on tests. Also tweak
wording on browser-policy docs.
---
 docs/client/packages/browser-policy.html      | 10 ++++--
 .../browser-policy/browser-policy-test.js     | 14 ++++-----
 packages/browser-policy/browser-policy.js     | 31 ++++++++++++-------
 packages/webapp/package.js                    |  8 +++--
 4 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/docs/client/packages/browser-policy.html b/docs/client/packages/browser-policy.html
index 5b8e31354e..f7676e7445 100644
--- a/docs/client/packages/browser-policy.html
+++ b/docs/client/packages/browser-policy.html
@@ -35,6 +35,10 @@ src` attribute.
 * If your app does not need to be framed by other websites, call
 `BrowserPolicy.allowFramingBySameOrigin()` to help prevent clickjacking attacks.
 
+Meteor determines the browser policy when the server starts up, so you should
+call `BrowserPolicy` functions in top-level application code or in
+`Meteor.startup`.
+
 #### Frame options
 
 You can use the following functions to specify which websites are allowed to
@@ -70,10 +74,10 @@ You can use the functions in this section to control how different types of
 content can be loaded on your site. In order to use any of these functions, you
 must first call `BrowserPolicy.enableContentSecurityPolicy()`, which enables the
 starter policy described above. This section covers additional functions that
-you can use to tighten or relax what content your app can use.
+you can use to tighten or relax restrictions on what content your app can use.
 
-You can use the following functions to tighten or relax restrictions on where
-Javascript and CSS can be run:
+You can use the following functions to adjust policies on where Javascript and
+CSS can be run:
 
 <dl class="callbacks">
 {{#dtdd "BrowserPolicy.allowInlineScripts()"}}
diff --git a/packages/browser-policy/browser-policy-test.js b/packages/browser-policy/browser-policy-test.js
index 875a6323eb..cf9ddd9e59 100644
--- a/packages/browser-policy/browser-policy-test.js
+++ b/packages/browser-policy/browser-policy-test.js
@@ -18,11 +18,11 @@ var cspsEqual = function (csp1, csp2) {
 Tinytest.add("browser-policy - csp", function (test) {
   var defaultCsp = "default-src 'self'; script-src 'self' 'unsafe-inline'; " +
         "connect-src * 'self'; img-src data: 'self'; style-src 'self' 'unsafe-inline';"
-  BrowserPolicy.enableContentSecurityPolicy();
+  BrowserPolicy.enableContentSecurityPolicy(true /* enable for tests */);
 
   // Default policy
   test.isTrue(cspsEqual(BrowserPolicy._constructCsp(), defaultCsp));
-  test.isTrue(BrowserPolicy.inlineScriptsAllowed());
+  test.isTrue(BrowserPolicy.inlineScriptsAllowed(true /* tests-only flag */));
 
   // Redundant whitelisting (inline scripts already allowed in default policy)
   BrowserPolicy.allowInlineScripts();
@@ -33,7 +33,7 @@ Tinytest.add("browser-policy - csp", function (test) {
   test.isTrue(cspsEqual(BrowserPolicy._constructCsp(),
                         "default-src 'self'; script-src 'self'; " +
                         "connect-src * 'self'; img-src data: 'self'; style-src 'self' 'unsafe-inline';"));
-  test.isFalse(BrowserPolicy.inlineScriptsAllowed());
+  test.isFalse(BrowserPolicy.inlineScriptsAllowed(true));
 
   // Allow eval
   BrowserPolicy.allowEval();
@@ -54,26 +54,26 @@ Tinytest.add("browser-policy - csp", function (test) {
   // Disallow everything
   BrowserPolicy.disallowAllContent();
   test.isTrue(cspsEqual(BrowserPolicy._constructCsp(), "default-src 'none';"));
-  test.isFalse(BrowserPolicy.inlineScriptsAllowed());
+  test.isFalse(BrowserPolicy.inlineScriptsAllowed(true));
 
   // Put inline scripts back in
   BrowserPolicy.allowInlineScripts();
   test.isTrue(cspsEqual(BrowserPolicy._constructCsp(),
                         "default-src 'none'; script-src 'unsafe-inline';"));
-  test.isTrue(BrowserPolicy.inlineScriptsAllowed());
+  test.isTrue(BrowserPolicy.inlineScriptsAllowed(true));
 
   // Add 'self' to all content types
   BrowserPolicy.allowAllContentSameOrigin();
   test.isTrue(cspsEqual(BrowserPolicy._constructCsp(),
                         "default-src 'self'; script-src 'self' 'unsafe-inline';"));
-  test.isTrue(BrowserPolicy.inlineScriptsAllowed());
+  test.isTrue(BrowserPolicy.inlineScriptsAllowed(true));
 
   // Disallow all content except same-origin scripts
   BrowserPolicy.disallowAllContent();
   BrowserPolicy.allowScriptSameOrigin();
   test.isTrue(cspsEqual(BrowserPolicy._constructCsp(),
                         "default-src 'none'; script-src 'self';"));
-  test.isFalse(BrowserPolicy.inlineScriptsAllowed());
+  test.isFalse(BrowserPolicy.inlineScriptsAllowed(true));
 
   // Starting with all content same origin, disallowScript() and then allow
   // inline scripts. Result should be that that only inline scripts can execute,
diff --git a/packages/browser-policy/browser-policy.js b/packages/browser-policy/browser-policy.js
index 40588dc536..a605d7f13e 100644
--- a/packages/browser-policy/browser-policy.js
+++ b/packages/browser-policy/browser-policy.js
@@ -46,7 +46,6 @@
 
 var xFrameOptions;
 var cspSrcs;
-//var cspUnsafeAllowed;
 
 // CSP keywords have to be single-quoted.
 var unsafeInline = "'unsafe-inline'";
@@ -55,6 +54,7 @@ var selfKeyword = "'self'";
 var noneKeyword = "'none'";
 
 var cspEnabled = false;
+var cspEnabledForTests = false;
 
 BrowserPolicy = {};
 
@@ -65,9 +65,6 @@ var constructXFrameOptions = BrowserPolicy._constructXFrameOptions =
       };
 
 var constructCsp = BrowserPolicy._constructCsp = function () {
-  if (! cspEnabled)
-    return null;
-
   cspSrcs = cspSrcs || {};
 
   var header = _.map(cspSrcs, function (srcs, directive) {
@@ -118,7 +115,7 @@ var ensureDirective = function (directive) {
 };
 
 var throwIfNotEnabled = function () {
-  if (! cspEnabled)
+  if (! cspEnabled && ! cspEnabledForTests)
     throw new Error("Enable this function by calling "+
                     "BrowserPolicy.enableContentSecurityPolicy().");
 };
@@ -158,13 +155,18 @@ BrowserPolicy = _.extend(BrowserPolicy, {
     xFrameOptions = null;
   },
 
-  enableContentSecurityPolicy: function () {
+  // _enableForTests means that you can call CSP functions, but the header won't
+  // actually be sent.
+  enableContentSecurityPolicy: function (_enableForTests) {
     // By default, unsafe inline scripts and styles are allowed, since we expect
     // many apps will use them for analytics, etc. Unsafe eval is disallowed, and
     // the only allowable content source is the same origin or data, except for
     // connect which allows anything (since meteor.com apps make websocket
     // connections to a lot of different origins).
-    cspEnabled = true;
+    if (! _enableForTests)
+      cspEnabled = true;
+    else
+      cspEnabledForTests = true;
     cspSrcs = {};
     BrowserPolicy.setContentSecurityPolicy("default-src 'self'; " +
                                            "script-src 'self' 'unsafe-inline'; " +
@@ -180,16 +182,23 @@ BrowserPolicy = _.extend(BrowserPolicy, {
 
   // Helpers for creating content security policies
 
-  _keywordAllowed: function (directive, keyword) {
-    return ! cspEnabled ||
+  _keywordAllowed: function (directive, keyword, _calledFromTests) {
+    // All keywords are allowed if csp is not enabled and we're not in a test
+    // run. If csp is enabled or we're in a test run, then look in cspSrcs to
+    // see if it's allowed.
+    return (! cspEnabled && ! _calledFromTests) ||
       (cspSrcs[directive] &&
        _.indexOf(cspSrcs[directive], keyword) !== -1);
   },
 
   // Used by webapp to determine whether we need an extra round trip for
   // __meteor_runtime_config__.
-  inlineScriptsAllowed: function () {
-    return BrowserPolicy._keywordAllowed("script-src", unsafeInline);
+  // _calledFromTests is used to indicate that we should ignore cspEnabled and
+  // instead look directly in cspSrcs to determine if the keyword is allowed.
+  // XXX maybe this test interface could be cleaned up
+  inlineScriptsAllowed: function (_calledFromTests) {
+    return BrowserPolicy._keywordAllowed("script-src",
+                                         unsafeInline, _calledFromTests);
   },
 
   allowInlineScripts: function () {
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index c451f2086a..ea662b2be8 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -12,9 +12,11 @@ Package.on_use(function (api) {
   api.use(['application-configuration'], {
     unordered: true
   });
-  api.use(['browser-policy'], {
-    unordered: true
-  });
+  // At response serving time, webapp uses browser-policy if it is loaded. If
+  // browser-policy is loaded, then it must be loaded after webapp
+  // (browser-policy depends on webapp). So we don't explicitly depend in any
+  // way on browser-policy here, but we use it when it is loaded, and it can be
+  // loaded after webapp.
   api.export(['WebApp', 'main', 'WebAppInternals'], 'server');
   api.add_files('webapp_server.js', 'server');
 });

From ab59ae2bcba622e8faa10e70ca2cc1c9d72fdc29 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Sat, 28 Sep 2013 18:53:40 -0700
Subject: [PATCH 132/335] Add browser-policy to History.md

---
 History.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/History.md b/History.md
index e502bdc762..b38f30a6d5 100644
--- a/History.md
+++ b/History.md
@@ -32,6 +32,10 @@
 * Support OAuth1 services that require request token secrets as well as
   authentication token secrets.  #1253
 
+* Add `browser-policy` package for configuring and sending Content Security
+  Policy and X-Frame-Options HTTP headers.
+
+
 ## v0.6.5.1
 
 * Fix syntax errors on lines that end with a backslash. #1326

From f7d33c734d029af6069a2d42e667043e6da1ce52 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Sat, 28 Sep 2013 22:58:19 -0700
Subject: [PATCH 133/335] Plumb mutation method return values through to
 callbacks.

Also:
* Fix some bugs: compareResults wasn't working so well; insertedId return values
  weren't being passed through replaceTypes; a few places where options objects
  weren't being treated as optional.
* Duplicate upsert tests for async upserts (with some changes to account for the
  fact that updates and removes can only be by id). Maybe this can be cleaned up
  to be less duplicate-y.
* Still need tests for async update/remove return values.
---
 packages/minimongo/minimongo.js               |   4 +
 packages/mongo-livedata/collection.js         |   6 +-
 packages/mongo-livedata/mongo_driver.js       |  14 +-
 .../mongo-livedata/mongo_livedata_tests.js    | 182 +++++++++++++++++-
 4 files changed, 195 insertions(+), 11 deletions(-)

diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index cb7b0fd5d6..0fee02aea9 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -621,6 +621,10 @@ LocalCollection.prototype.update = function (selector, mod, options, callback) {
 
 LocalCollection.prototype.upsert = function (selector, mod, options, callback) {
   var self = this;
+  if (! callback && typeof options === "function") {
+    callback = options;
+    options = {};
+  }
   return self.update(selector, mod, _.extend({}, options, {
     upsert: true,
     returnObject: true
diff --git a/packages/mongo-livedata/collection.js b/packages/mongo-livedata/collection.js
index 8f8f6cdf01..7e8a876697 100644
--- a/packages/mongo-livedata/collection.js
+++ b/packages/mongo-livedata/collection.js
@@ -619,11 +619,11 @@ Meteor.Collection.prototype._defineMutationMethods = function() {
             var validatedMethodName =
                   '_validated' + method.charAt(0).toUpperCase() + method.slice(1);
             var argsWithUserId = [this.userId].concat(_.toArray(arguments));
-            self[validatedMethodName].apply(self, argsWithUserId);
+            return self[validatedMethodName].apply(self, argsWithUserId);
           } else if (self._isInsecure()) {
             // In insecure mode, allow any mutation (with a simple selector).
-            self._collection[method].apply(self._collection,
-                                           _.toArray(arguments));
+            return self._collection[method].apply(self._collection,
+                                                  _.toArray(arguments));
           } else {
             // In secure mode, if we haven't called allow or deny, then nothing
             // is permitted.
diff --git a/packages/mongo-livedata/mongo_driver.js b/packages/mongo-livedata/mongo_driver.js
index 0e39b82b1d..b107725fd5 100644
--- a/packages/mongo-livedata/mongo_driver.js
+++ b/packages/mongo-livedata/mongo_driver.js
@@ -367,7 +367,10 @@ MongoConnection.prototype._update = function (collection_name, selector, mod,
                             if (result && ! options.returnObject)
                               result = result.numberAffected;
                           }
-                          callback(err, result);
+                          callback(err, replaceTypes(
+                            result,
+                            replaceMongoAtomWithMeteor
+                          ));
                         }));
     }
   } catch (e) {
@@ -426,7 +429,10 @@ var simulateUpsertWithInsertedId = function (collection, selector, mod,
                           if (err) {
                             callback(err);
                           } else if (result.numberAffected) {
-                            callback(null, result);
+                            callback(null, replaceTypes(
+                              result,
+                              replaceMongoAtomWithMeteor
+                            ));
                           } else {
                             doConditionalInsert();
                           }
@@ -473,7 +479,9 @@ var simulateUpsertWithInsertedId = function (collection, selector, mod,
                             callback(err);
                           }
                         } else {
-                          callback(null, _.extend(result, { insertedId: insertedId }));
+                          callback(null, replaceTypes(_.extend(result, {
+                            insertedId: insertedId
+                          }), replaceMongoAtomWithMeteor));
                         }
                       }));
   };
diff --git a/packages/mongo-livedata/mongo_livedata_tests.js b/packages/mongo-livedata/mongo_livedata_tests.js
index 9a564b6570..cf97ce2374 100644
--- a/packages/mongo-livedata/mongo_livedata_tests.js
+++ b/packages/mongo-livedata/mongo_livedata_tests.js
@@ -941,6 +941,12 @@ if (Meteor.isServer) {
 
 } // end Meteor.isServer
 
+var stripId = function (obj) {
+  delete obj._id;
+};
+
+// This test is duplicated below (with some changes) for async upserts that go
+// over the network.
 _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
   _.each([true, false], function (useUpdate) {
     Tinytest.addAsync("mongo-livedata - " + (useUpdate ? "update " : "") + "upsert" + (minimongo ? " minimongo" : "") + ", " + idGeneration, function (test, onComplete) {
@@ -952,13 +958,11 @@ _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
         else
           return coll.upsert(query, mod, options);
       };
-      var stripId = function (obj) {
-        delete obj._id;
-      };
+
       var compareResults = function (actual, expected) {
         if (useUpdate) {
-          actual = _.map(actual, stripId);
-          expected = _.map(expected, stripId);
+          _.map(actual, stripId);
+          _.map(expected, stripId);
         }
         // (technically should ignore order in comparison)
         test.equal(actual, expected);
@@ -1073,6 +1077,174 @@ _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
   });
 });
 
+// This is a duplicate of the test above, with some changes to make it work for
+// async upserts that go over the network.
+if (Meteor.isClient) {
+  _.each([true, false], function (useUpdate) {
+    Tinytest.addAsync("mongo-livedata - async " + (useUpdate ? "update " : "") + "upsert" + ", " + idGeneration, function (test, onComplete) {
+      var coll;
+      var upsert = function (query, mod, options, callback) {
+        if (! callback && typeof options === "function") {
+          callback = options;
+          options = {};
+        }
+        if (useUpdate)
+          coll.update(query, mod, _.extend({ upsert: true }, options), function (err, result) {
+            callback(err, result ? { numberAffected: result } : undefined);
+          });
+        else
+          coll.upsert(query, mod, options, callback);
+      };
+
+      var compareResults = function (actual, expected) {
+        if (useUpdate) {
+          _.map(actual, stripId);
+          _.map(expected, stripId);
+        }
+        // (technically should ignore order in comparison)
+        test.equal(actual, expected);
+      };
+
+      var run = test.runId();
+      var collName = "livedata_upsert_collection_"+run;
+      Meteor.call("createInsecureCollection", collName, collectionOptions);
+      coll = new Meteor.Collection(collName, collectionOptions);
+      Meteor.subscribe("c-" + collName);
+
+      var result1;
+      var next1 = function (err, result) {
+        result1 = result;
+        test.equal(result1.numberAffected, 1);
+        if (! useUpdate) {
+          test.isTrue(result1.insertedId);
+          test.equal(result1.insertedId, 'foo');
+        }
+        compareResults(coll.find().fetch(), [{foo: 'bar', _id: 'foo'}]);
+        upsert({_id: 'foo'}, {foo: 'baz'}, next2);
+      };
+
+      // Test starts here.
+      upsert({_id: 'foo'}, {_id: 'foo', foo: 'bar'}, next1);
+
+      var t1, t2, result2;
+      var next2 = function (err, result) {
+        result2 = result;
+        test.equal(result2.numberAffected, 1);
+        if (! useUpdate)
+          test.isFalse(result2.insertedId);
+        compareResults(coll.find().fetch(), [{foo: 'baz', _id: result1.insertedId}]);
+        coll.remove({_id: 'foo'});
+        compareResults(coll.find().fetch(), []);
+
+        // Test values that require transformation to go into Mongo:
+
+        t1 = new Meteor.Collection.ObjectID();
+        t2 = new Meteor.Collection.ObjectID();
+        upsert({_id: t1}, {_id: t1, foo: 'bar'}, next3);
+      };
+
+      var result3;
+      var next3 = function (err, result) {
+        result3 = result;
+        test.equal(result3.numberAffected, 1);
+        if (! useUpdate) {
+          test.isTrue(result3.insertedId);
+          test.equal(t1, result3.insertedId);
+        }
+        compareResults(coll.find().fetch(), [{_id: t1, foo: 'bar'}]);
+
+        upsert({_id: t1}, {foo: t2}, next4);
+      };
+
+      var next4 = function (err, result4) {
+        test.equal(result2.numberAffected, 1);
+        if (! useUpdate)
+          test.isFalse(result2.insertedId);
+        compareResults(coll.find().fetch(), [{foo: t2, _id: result3.insertedId}]);
+
+        coll.remove({_id: t1});
+
+        // Test modification by upsert
+        upsert({_id: 'David'}, {$set: {foo: 1}}, next5);
+      };
+
+      var result5;
+      var next5 = function (err, result) {
+        result5 = result;
+        test.equal(result5.numberAffected, 1);
+        if (! useUpdate) {
+          test.isTrue(result5.insertedId);
+          test.equal(result5.insertedId, 'David');
+        }
+        var davidId = result5.insertedId;
+        compareResults(coll.find().fetch(), [{foo: 1, _id: davidId}]);
+
+        // test that bad modifier fails
+        upsert({_id: 'David'}, {$blah: {foo: 2}}, function (err) {
+          test.isTrue(err);
+          upsert({_id: 'David'}, {$set: {foo: 2}}, next6);
+        });
+      };
+
+      var result6;
+      var next6 = function (err, result) {
+        result6 = result;
+        test.equal(result6.numberAffected, 1);
+        if (! useUpdate)
+          test.isFalse(result6.insertedId);
+        compareResults(coll.find().fetch(), [{_id: 'David', foo: 2}]);
+
+        var emilyId = coll.insert({_id: 'Emily', foo: 2});
+        compareResults(coll.find().fetch(), [{_id: 'David', foo: 2},
+                                             {_id: 'Emily', foo: 2}]);
+
+        // multi update by upsert.
+        // We can't actually update multiple documents since we have to do it by
+        // id, but at least make sure the multi flag doesn't mess anything up.
+        upsert({_id: 'Emily'},
+               {$set: {bar: 7},
+                $setOnInsert: {name: 'Fred', foo: 2}},
+               {multi: true}, next7);
+      };
+
+      var result7;
+      var next7 = function (err, result) {
+        result7 = result;
+        test.equal(result7.numberAffected, 1);
+        if (! useUpdate)
+          test.isFalse(result7.insertedId);
+        compareResults(coll.find().fetch(), [{_id: 'David', foo: 2},
+                                             {_id: 'Emily', foo: 2, bar: 7}]);
+
+        // insert by multi upsert
+        upsert({_id: 'Fred'},
+               {$set: {bar: 7},
+                $setOnInsert: {name: 'Fred', foo: 2}},
+               {multi: true}, next8);
+
+      };
+
+      var result8;
+      var next8 = function (err, result) {
+        result8 = result;
+
+        test.equal(result8.numberAffected, 1);
+        if (! useUpdate) {
+          test.isTrue(result8.insertedId);
+          test.equal(result8.insertedId, 'Fred');
+        }
+        var fredId = result8.insertedId;
+        compareResults(coll.find().fetch(),
+                       [{_id: 'David', foo: 2},
+                        {_id: 'Emily', foo: 2, bar: 7},
+                        {name: 'Fred', foo: 2, bar: 7, _id: fredId}]);
+        onComplete();
+      };
+    });
+  });
+}
+
+
 _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
   _.each([true, false], function (useUpdate) {
     Tinytest.addAsync("mongo-livedata - " + (useUpdate ? "update " : "") + "upsert by id" + (minimongo ? " minimongo" : "") + ", " + idGeneration, function (test, onComplete) {

From 7cba2923f55e7ca674dd7bd9561e3f2a441b0634 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Sat, 28 Sep 2013 23:14:37 -0700
Subject: [PATCH 134/335] Add a test for update/remove return values over the
 network.

---
 .../mongo-livedata/mongo_livedata_tests.js    | 35 ++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/packages/mongo-livedata/mongo_livedata_tests.js b/packages/mongo-livedata/mongo_livedata_tests.js
index cf97ce2374..e161b653e4 100644
--- a/packages/mongo-livedata/mongo_livedata_tests.js
+++ b/packages/mongo-livedata/mongo_livedata_tests.js
@@ -618,6 +618,7 @@ if (Meteor.isServer) {
     var id = coll.insert(doc);
     coll.update(id, { $set: { foo: "baz" } }, function (err, result) {
       test.equal(err, null);
+      test.equal(result, 1);
       test.equal(x, 1);
       onComplete();
     });
@@ -1242,7 +1243,39 @@ if (Meteor.isClient) {
       };
     });
   });
-}
+
+  Tinytest.addAsync("mongo-livedata - async update/remove return values over network " + idGeneration, function (test, onComplete) {
+    var coll;
+    var run = test.runId();
+    var collName = "livedata_upsert_collection_"+run;
+    Meteor.call("createInsecureCollection", collName, collectionOptions);
+    coll = new Meteor.Collection(collName, collectionOptions);
+    Meteor.subscribe("c-" + collName);
+
+    coll.insert({ _id: "foo" });
+    coll.insert({ _id: "bar" });
+    coll.update({ _id: "foo" }, { $set: { foo: 1 } }, { multi: true }, function (err, result) {
+      test.isFalse(err);
+      test.equal(result, 1);
+      coll.update({ _id: "foo" }, { _id: "foo", foo: 2 }, function (err, result) {
+        test.isFalse(err);
+        test.equal(result, 1);
+        coll.update({ _id: "baz" }, { $set: { foo: 1 } }, function (err, result) {
+          test.isFalse(err);
+          test.equal(result, 0);
+          coll.remove({ _id: "foo" }, function (err, result) {
+            test.equal(result, 1);
+            coll.remove({ _id: "baz" }, function (err, result) {
+              test.equal(result, 0);
+              onComplete();
+            });
+          });
+        });
+      });
+    });
+  });
+
+} // end isClient
 
 
 _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {

From dd44f6b165acbf21b6c36fe4ca4c6484a3220394 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Mon, 30 Sep 2013 11:06:16 -0700
Subject: [PATCH 135/335] Fix compareResults everywhere and factor it out.

---
 .../mongo-livedata/mongo_livedata_tests.js    | 92 ++++++++-----------
 1 file changed, 36 insertions(+), 56 deletions(-)

diff --git a/packages/mongo-livedata/mongo_livedata_tests.js b/packages/mongo-livedata/mongo_livedata_tests.js
index e161b653e4..68d0593d5f 100644
--- a/packages/mongo-livedata/mongo_livedata_tests.js
+++ b/packages/mongo-livedata/mongo_livedata_tests.js
@@ -946,6 +946,15 @@ var stripId = function (obj) {
   delete obj._id;
 };
 
+var compareResults = function (test, useUpdate, actual, expected) {
+  if (useUpdate) {
+    _.map(actual, stripId);
+    _.map(expected, stripId);
+  }
+  // (technically should ignore order in comparison)
+  test.equal(actual, expected);
+};
+
 // This test is duplicated below (with some changes) for async upserts that go
 // over the network.
 _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
@@ -960,15 +969,6 @@ _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
           return coll.upsert(query, mod, options);
       };
 
-      var compareResults = function (actual, expected) {
-        if (useUpdate) {
-          _.map(actual, stripId);
-          _.map(expected, stripId);
-        }
-        // (technically should ignore order in comparison)
-        test.equal(actual, expected);
-      };
-
       var run = test.runId();
       var options = collectionOptions;
       if (minimongo)
@@ -979,13 +979,13 @@ _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
       test.equal(result1.numberAffected, 1);
       if (! useUpdate)
         test.isTrue(result1.insertedId);
-      compareResults(coll.find().fetch(), [{foo: 'bar', _id: result1.insertedId}]);
+      compareResults(test, useUpdate, coll.find().fetch(), [{foo: 'bar', _id: result1.insertedId}]);
 
       var result2 = upsert({foo: 'bar'}, {foo: 'baz'});
       test.equal(result2.numberAffected, 1);
       if (! useUpdate)
         test.isFalse(result2.insertedId);
-      compareResults(coll.find().fetch(), [{foo: 'baz', _id: result1.insertedId}]);
+      compareResults(test, useUpdate, coll.find().fetch(), [{foo: 'baz', _id: result1.insertedId}]);
 
       coll.remove({});
 
@@ -997,13 +997,13 @@ _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
       test.equal(result3.numberAffected, 1);
       if (! useUpdate)
         test.isTrue(result3.insertedId);
-      compareResults(coll.find().fetch(), [{foo: t1, _id: result3.insertedId}]);
+      compareResults(test, useUpdate, coll.find().fetch(), [{foo: t1, _id: result3.insertedId}]);
 
       var result4 = upsert({foo: t1}, {foo: t2});
       test.equal(result2.numberAffected, 1);
       if (! useUpdate)
         test.isFalse(result2.insertedId);
-      compareResults(coll.find().fetch(), [{foo: t2, _id: result3.insertedId}]);
+      compareResults(test, useUpdate, coll.find().fetch(), [{foo: t2, _id: result3.insertedId}]);
 
       coll.remove({});
 
@@ -1014,7 +1014,7 @@ _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
       if (! useUpdate)
         test.isTrue(result5.insertedId);
       var davidId = result5.insertedId;
-      compareResults(coll.find().fetch(), [{name: 'David', foo: 1, _id: davidId}]);
+      compareResults(test, useUpdate, coll.find().fetch(), [{name: 'David', foo: 1, _id: davidId}]);
 
       test.throws(function () {
         // test that bad modifier fails fast
@@ -1026,11 +1026,11 @@ _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
       test.equal(result6.numberAffected, 1);
       if (! useUpdate)
         test.isFalse(result6.insertedId);
-      compareResults(coll.find().fetch(), [{name: 'David', foo: 2,
+      compareResults(test, useUpdate, coll.find().fetch(), [{name: 'David', foo: 2,
                                         _id: result5.insertedId}]);
 
       var emilyId = coll.insert({name: 'Emily', foo: 2});
-      compareResults(coll.find().fetch(), [{name: 'David', foo: 2, _id: davidId},
+      compareResults(test, useUpdate, coll.find().fetch(), [{name: 'David', foo: 2, _id: davidId},
                                            {name: 'Emily', foo: 2, _id: emilyId}]);
 
       // multi update by upsert
@@ -1041,7 +1041,7 @@ _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
       test.equal(result7.numberAffected, 2);
       if (! useUpdate)
         test.isFalse(result7.insertedId);
-      compareResults(coll.find().fetch(), [{name: 'David', foo: 2, bar: 7, _id: davidId},
+      compareResults(test, useUpdate, coll.find().fetch(), [{name: 'David', foo: 2, bar: 7, _id: davidId},
                                            {name: 'Emily', foo: 2, bar: 7, _id: emilyId}]);
 
       // insert by multi upsert
@@ -1053,7 +1053,7 @@ _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
       if (! useUpdate)
         test.isTrue(result8.insertedId);
       var fredId = result8.insertedId;
-      compareResults(coll.find().fetch(),
+      compareResults(test, useUpdate, coll.find().fetch(),
                      [{name: 'David', foo: 2, bar: 7, _id: davidId},
                       {name: 'Emily', foo: 2, bar: 7, _id: emilyId},
                       {name: 'Fred', foo: 2, bar: 7, _id: fredId}]);
@@ -1065,7 +1065,7 @@ _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
       test.equal(result9.numberAffected, 1);
       if (! useUpdate)
         test.equal(result9.insertedId, 'steve');
-      compareResults(coll.find().fetch(),
+      compareResults(test, useUpdate, coll.find().fetch(),
                      [{name: 'David', foo: 2, bar: 7, _id: davidId},
                       {name: 'Emily', foo: 2, bar: 7, _id: emilyId},
                       {name: 'Fred', foo: 2, bar: 7, _id: fredId},
@@ -1097,15 +1097,6 @@ if (Meteor.isClient) {
           coll.upsert(query, mod, options, callback);
       };
 
-      var compareResults = function (actual, expected) {
-        if (useUpdate) {
-          _.map(actual, stripId);
-          _.map(expected, stripId);
-        }
-        // (technically should ignore order in comparison)
-        test.equal(actual, expected);
-      };
-
       var run = test.runId();
       var collName = "livedata_upsert_collection_"+run;
       Meteor.call("createInsecureCollection", collName, collectionOptions);
@@ -1120,7 +1111,7 @@ if (Meteor.isClient) {
           test.isTrue(result1.insertedId);
           test.equal(result1.insertedId, 'foo');
         }
-        compareResults(coll.find().fetch(), [{foo: 'bar', _id: 'foo'}]);
+        compareResults(test, useUpdate, coll.find().fetch(), [{foo: 'bar', _id: 'foo'}]);
         upsert({_id: 'foo'}, {foo: 'baz'}, next2);
       };
 
@@ -1133,9 +1124,9 @@ if (Meteor.isClient) {
         test.equal(result2.numberAffected, 1);
         if (! useUpdate)
           test.isFalse(result2.insertedId);
-        compareResults(coll.find().fetch(), [{foo: 'baz', _id: result1.insertedId}]);
+        compareResults(test, useUpdate, coll.find().fetch(), [{foo: 'baz', _id: result1.insertedId}]);
         coll.remove({_id: 'foo'});
-        compareResults(coll.find().fetch(), []);
+        compareResults(test, useUpdate, coll.find().fetch(), []);
 
         // Test values that require transformation to go into Mongo:
 
@@ -1152,7 +1143,7 @@ if (Meteor.isClient) {
           test.isTrue(result3.insertedId);
           test.equal(t1, result3.insertedId);
         }
-        compareResults(coll.find().fetch(), [{_id: t1, foo: 'bar'}]);
+        compareResults(test, useUpdate, coll.find().fetch(), [{_id: t1, foo: 'bar'}]);
 
         upsert({_id: t1}, {foo: t2}, next4);
       };
@@ -1161,7 +1152,7 @@ if (Meteor.isClient) {
         test.equal(result2.numberAffected, 1);
         if (! useUpdate)
           test.isFalse(result2.insertedId);
-        compareResults(coll.find().fetch(), [{foo: t2, _id: result3.insertedId}]);
+        compareResults(test, useUpdate, coll.find().fetch(), [{foo: t2, _id: result3.insertedId}]);
 
         coll.remove({_id: t1});
 
@@ -1178,7 +1169,7 @@ if (Meteor.isClient) {
           test.equal(result5.insertedId, 'David');
         }
         var davidId = result5.insertedId;
-        compareResults(coll.find().fetch(), [{foo: 1, _id: davidId}]);
+        compareResults(test, useUpdate, coll.find().fetch(), [{foo: 1, _id: davidId}]);
 
         // test that bad modifier fails
         upsert({_id: 'David'}, {$blah: {foo: 2}}, function (err) {
@@ -1193,10 +1184,10 @@ if (Meteor.isClient) {
         test.equal(result6.numberAffected, 1);
         if (! useUpdate)
           test.isFalse(result6.insertedId);
-        compareResults(coll.find().fetch(), [{_id: 'David', foo: 2}]);
+        compareResults(test, useUpdate, coll.find().fetch(), [{_id: 'David', foo: 2}]);
 
         var emilyId = coll.insert({_id: 'Emily', foo: 2});
-        compareResults(coll.find().fetch(), [{_id: 'David', foo: 2},
+        compareResults(test, useUpdate, coll.find().fetch(), [{_id: 'David', foo: 2},
                                              {_id: 'Emily', foo: 2}]);
 
         // multi update by upsert.
@@ -1214,7 +1205,7 @@ if (Meteor.isClient) {
         test.equal(result7.numberAffected, 1);
         if (! useUpdate)
           test.isFalse(result7.insertedId);
-        compareResults(coll.find().fetch(), [{_id: 'David', foo: 2},
+        compareResults(test, useUpdate, coll.find().fetch(), [{_id: 'David', foo: 2},
                                              {_id: 'Emily', foo: 2, bar: 7}]);
 
         // insert by multi upsert
@@ -1235,7 +1226,7 @@ if (Meteor.isClient) {
           test.equal(result8.insertedId, 'Fred');
         }
         var fredId = result8.insertedId;
-        compareResults(coll.find().fetch(),
+        compareResults(test, useUpdate,  coll.find().fetch(),
                        [{_id: 'David', foo: 2},
                         {_id: 'Emily', foo: 2, bar: 7},
                         {name: 'Fred', foo: 2, bar: 7, _id: fredId}]);
@@ -1289,17 +1280,6 @@ _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
         else
           return coll.upsert(query, mod, options);
       };
-      var stripId = function (obj) {
-        delete obj._id;
-      };
-      var compareResults = function (actual, expected, stripIds) {
-        if (stripIds) {
-          actual = _.map(actual, stripId);
-          expected = _.map(expected, stripId);
-        }
-        // (technically should ignore order in comparison)
-        test.equal(actual, expected);
-      };
 
       var run = test.runId();
       var options = collectionOptions;
@@ -1312,21 +1292,21 @@ _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
       test.equal(ret.numberAffected, 1);
       if (! useUpdate)
         test.equal(ret.insertedId, 'foo');
-      compareResults(coll.find().fetch(),
+      compareResults(test, useUpdate, coll.find().fetch(),
                      [{_id: 'foo', x: 1}]);
 
       ret = upsert({_id: 'foo'}, {$set: {x: 2}});
       test.equal(ret.numberAffected, 1);
       if (! useUpdate)
         test.isFalse(ret.insertedId);
-      compareResults(coll.find().fetch(),
+      compareResults(test, useUpdate, coll.find().fetch(),
                      [{_id: 'foo', x: 2}]);
 
       ret = upsert({_id: 'bar'}, {$set: {x: 1}});
       test.equal(ret.numberAffected, 1);
       if (! useUpdate)
         test.equal(ret.insertedId, 'bar');
-      compareResults(coll.find().fetch(),
+      compareResults(test, useUpdate, coll.find().fetch(),
                      [{_id: 'foo', x: 2},
                       {_id: 'bar', x: 1}]);
 
@@ -1343,7 +1323,7 @@ _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
       } else {
         myId = coll.findOne()._id;
       }
-      compareResults(coll.find().fetch(),
+      compareResults(test, useUpdate, coll.find().fetch(),
                      [{x: 1, _id: myId}]);
 
       // this time, insert as _id 'traz'
@@ -1351,7 +1331,7 @@ _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
       test.equal(ret.numberAffected, 1);
       if (! useUpdate)
         test.equal(ret.insertedId, 'traz');
-      compareResults(coll.find().fetch(),
+      compareResults(test, useUpdate, coll.find().fetch(),
                      [{x: 1, _id: myId},
                       {x: 2, _id: 'traz'}]);
 
@@ -1359,7 +1339,7 @@ _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
       ret = upsert({_id: 'traz'}, {x: 3});
       test.equal(ret.numberAffected, 1);
       test.isFalse(ret.insertedId);
-      compareResults(coll.find().fetch(),
+      compareResults(test, useUpdate, coll.find().fetch(),
                      [{x: 1, _id: myId},
                       {x: 3, _id: 'traz'}]);
 
@@ -1367,7 +1347,7 @@ _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
       ret = upsert({_id: 'traz'}, {_id: 'traz', x: 4});
       test.equal(ret.numberAffected, 1);
       test.isFalse(ret.insertedId);
-      compareResults(coll.find().fetch(),
+      compareResults(test, useUpdate, coll.find().fetch(),
                      [{x: 1, _id: myId},
                       {x: 4, _id: 'traz'}]);
 

From 1bbb34e6023ad99442df12e865c0d22e39b9dbbc Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Mon, 30 Sep 2013 11:21:11 -0700
Subject: [PATCH 136/335] Take the async out of tests that don't need it

---
 packages/mongo-livedata/mongo_livedata_tests.js | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/packages/mongo-livedata/mongo_livedata_tests.js b/packages/mongo-livedata/mongo_livedata_tests.js
index 68d0593d5f..10285800eb 100644
--- a/packages/mongo-livedata/mongo_livedata_tests.js
+++ b/packages/mongo-livedata/mongo_livedata_tests.js
@@ -914,7 +914,7 @@ if (Meteor.isServer) {
     onComplete();
   });
 
-  Tinytest.addAsync("mongo-livedata - upsert error parse, " + idGeneration, function (test, onComplete) {
+  Tinytest.add("mongo-livedata - upsert error parse, " + idGeneration, function (test) {
     var run = test.runId();
     var coll = new Meteor.Collection("livedata_upsert_errorparse_collection_"+run, collectionOptions);
 
@@ -936,8 +936,6 @@ if (Meteor.isServer) {
     test.isTrue(err);
     // duplicate id error is not same as change id error
     test.isFalse(MongoInternals.Connection._isCannotChangeIdError(err));
-
-    onComplete();
   });
 
 } // end Meteor.isServer
@@ -959,7 +957,7 @@ var compareResults = function (test, useUpdate, actual, expected) {
 // over the network.
 _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
   _.each([true, false], function (useUpdate) {
-    Tinytest.addAsync("mongo-livedata - " + (useUpdate ? "update " : "") + "upsert" + (minimongo ? " minimongo" : "") + ", " + idGeneration, function (test, onComplete) {
+    Tinytest.add("mongo-livedata - " + (useUpdate ? "update " : "") + "upsert" + (minimongo ? " minimongo" : "") + ", " + idGeneration, function (test) {
       var upsert = function (query, mod, options) {
         if (useUpdate)
           return { numberAffected:
@@ -1072,8 +1070,6 @@ _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
                       {name: 'Steve', _id: 'steve'}]);
       test.isTrue(coll.findOne('steve'));
       test.isFalse(coll.findOne('fred'));
-
-      onComplete();
     });
   });
 });
@@ -1271,7 +1267,7 @@ if (Meteor.isClient) {
 
 _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
   _.each([true, false], function (useUpdate) {
-    Tinytest.addAsync("mongo-livedata - " + (useUpdate ? "update " : "") + "upsert by id" + (minimongo ? " minimongo" : "") + ", " + idGeneration, function (test, onComplete) {
+    Tinytest.add("mongo-livedata - " + (useUpdate ? "update " : "") + "upsert by id" + (minimongo ? " minimongo" : "") + ", " + idGeneration, function (test) {
       var upsert = function (query, mod, options) {
         if (useUpdate)
           return { numberAffected:
@@ -1351,7 +1347,6 @@ _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
                      [{x: 1, _id: myId},
                       {x: 4, _id: 'traz'}]);
 
-      onComplete();
     });
   });
 });

From f0e273eaf0246993867e2f6faf621841863ff2f5 Mon Sep 17 00:00:00 2001
From: Geoff Schmidt <geoff@geoffschmidt.com>
Date: Mon, 30 Sep 2013 15:31:04 -0700
Subject: [PATCH 137/335] #1063 In parties example, latency compensate object
 insertion from method.

---
 examples/parties/client/client.js | 12 +++++-------
 examples/parties/model.js         | 14 ++++++++++++--
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/examples/parties/client/client.js b/examples/parties/client/client.js
index cbd3a65aa8..a78350d36f 100644
--- a/examples/parties/client/client.js
+++ b/examples/parties/client/client.js
@@ -213,19 +213,17 @@ Template.createDialog.events({
     var coords = Session.get("createCoords");
 
     if (title.length && description.length) {
-      Meteor.call('createParty', {
+      var id = createParty({
         title: title,
         description: description,
         x: coords.x,
         y: coords.y,
         public: public
-      }, function (error, party) {
-        if (! error) {
-          Session.set("selected", party);
-          if (! public && Meteor.users.find().count() > 1)
-            openInviteDialog();
-        }
       });
+
+      Session.set("selected", id);
+      if (! public && Meteor.users.find().count() > 1)
+        openInviteDialog();
       Session.set("showCreateDialog", false);
     } else {
       Session.set("createError",
diff --git a/examples/parties/model.js b/examples/parties/model.js
index 6eb086aae6..e51f92199c 100644
--- a/examples/parties/model.js
+++ b/examples/parties/model.js
@@ -52,6 +52,12 @@ var Coordinate = Match.Where(function (x) {
   return x >= 0 && x <= 1;
 });
 
+createParty = function (options) {
+  var id = Meteor.uuid();
+  Meteor.call('createParty', _.extend({ _id: id }, options));
+  return id;
+};
+
 Meteor.methods({
   // options should include: title, description, x, y, public
   createParty: function (options) {
@@ -60,7 +66,8 @@ Meteor.methods({
       description: NonEmptyString,
       x: Coordinate,
       y: Coordinate,
-      public: Match.Optional(Boolean)
+      public: Match.Optional(Boolean),
+      _id: Match.Optional(NonEmptyString)
     });
 
     if (options.title.length > 100)
@@ -70,7 +77,9 @@ Meteor.methods({
     if (! this.userId)
       throw new Meteor.Error(403, "You must be logged in");
 
-    return Parties.insert({
+    var id = options._id || Meteor.uuid();
+    Parties.insert({
+      _id: id,
       owner: this.userId,
       x: options.x,
       y: options.y,
@@ -80,6 +89,7 @@ Meteor.methods({
       invited: [],
       rsvps: []
     });
+    return id;
   },
 
   invite: function (partyId, userId) {

From e1dd2b40f84ed9a8a88edda628e628f0cdcac7f2 Mon Sep 17 00:00:00 2001
From: David Greenspan <dgreenspan@alum.mit.edu>
Date: Mon, 30 Sep 2013 15:41:47 -0700
Subject: [PATCH 138/335] return un-mongo-converted insertedId
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

… instead of converting to mongo form and back
---
 packages/mongo-livedata/mongo_driver.js | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/packages/mongo-livedata/mongo_driver.js b/packages/mongo-livedata/mongo_driver.js
index 3af2b41b5a..c7acecb048 100644
--- a/packages/mongo-livedata/mongo_driver.js
+++ b/packages/mongo-livedata/mongo_driver.js
@@ -340,7 +340,7 @@ MongoConnection.prototype._update = function (collection_name, selector, mod,
     var mongoMod = replaceTypes(mod, replaceMeteorAtomWithMongo);
 
     var isModify = isModificationMod(mongoMod);
-    var knownId = (isModify ? mongoSelector._id : mongoMod._id);
+    var knownId = (isModify ? selector._id : mod._id);
 
     if (options.upsert && (! knownId) && options.insertedId) {
       mongoOpts.insertedId = options.insertedId;
@@ -367,10 +367,7 @@ MongoConnection.prototype._update = function (collection_name, selector, mod,
                             if (result && ! options.returnObject)
                               result = result.numberAffected;
                           }
-                          callback(err, replaceTypes(
-                            result,
-                            replaceMongoAtomWithMeteor
-                          ));
+                          callback(err, result);
                         }));
     }
   } catch (e) {
@@ -429,10 +426,7 @@ var simulateUpsertWithInsertedId = function (collection, selector, mod,
                           if (err) {
                             callback(err);
                           } else if (result.numberAffected) {
-                            callback(null, replaceTypes(
-                              result,
-                              replaceMongoAtomWithMeteor
-                            ));
+                            callback(null, result);
                           } else {
                             doConditionalInsert();
                           }
@@ -479,9 +473,9 @@ var simulateUpsertWithInsertedId = function (collection, selector, mod,
                             callback(err);
                           }
                         } else {
-                          callback(null, replaceTypes(_.extend(result, {
+                          callback(null, _.extend(result, {
                             insertedId: insertedId
-                          }), replaceMongoAtomWithMeteor));
+                          }));
                         }
                       }));
   };

From b28c81724101f84547c6c6b9c203353f2e05fbb7 Mon Sep 17 00:00:00 2001
From: Geoff Schmidt <geoff@geoffschmidt.com>
Date: Mon, 30 Sep 2013 15:41:53 -0700
Subject: [PATCH 139/335] Use Random.id rather than the deprecated Meteor.uuid.

---
 examples/parties/model.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/parties/model.js b/examples/parties/model.js
index e51f92199c..14fe2f7945 100644
--- a/examples/parties/model.js
+++ b/examples/parties/model.js
@@ -53,7 +53,7 @@ var Coordinate = Match.Where(function (x) {
 });
 
 createParty = function (options) {
-  var id = Meteor.uuid();
+  var id = Random.id();
   Meteor.call('createParty', _.extend({ _id: id }, options));
   return id;
 };
@@ -77,7 +77,7 @@ Meteor.methods({
     if (! this.userId)
       throw new Meteor.Error(403, "You must be logged in");
 
-    var id = options._id || Meteor.uuid();
+    var id = options._id || Random.id();
     Parties.insert({
       _id: id,
       owner: this.userId,

From f397295b8a3596771341550ce0367c47174700ad Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Mon, 30 Sep 2013 15:47:40 -0700
Subject: [PATCH 140/335] Suppress invalid modifier log message in upsert test

---
 packages/mongo-livedata/mongo_livedata_tests.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/mongo-livedata/mongo_livedata_tests.js b/packages/mongo-livedata/mongo_livedata_tests.js
index c84a33c37d..1062c0131a 100644
--- a/packages/mongo-livedata/mongo_livedata_tests.js
+++ b/packages/mongo-livedata/mongo_livedata_tests.js
@@ -1179,6 +1179,9 @@ if (Meteor.isClient) {
         compareResults(test, useUpdate, coll.find().fetch(), [{foo: 1, _id: davidId}]);
 
         // test that bad modifier fails
+        // The stub throws an exception about the invalid modifier, which
+        // livedata logs (so we suppress it).
+        Meteor._suppress_log(1);
         upsert({_id: 'David'}, {$blah: {foo: 2}}, function (err) {
           test.isTrue(err);
           upsert({_id: 'David'}, {$set: {foo: 2}}, next6);

From 60dd2c89ffb1f32b7d2d8c14a94cefb26c51aeca Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Mon, 30 Sep 2013 17:59:07 -0700
Subject: [PATCH 141/335] Clarify minimongo fields docs.

---
 docs/client/api.html | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/docs/client/api.html b/docs/client/api.html
index 9fa58c4fbb..be68c131ef 100644
--- a/docs/client/api.html
+++ b/docs/client/api.html
@@ -1261,12 +1261,13 @@ is a dictionary whose keys are field names and whose values are `0`.
     // Users.find({}, {fields: {password: 0, hash: 0}})
 
 To return an object that only includes the specified field, use `1` as
-the value.  The `_id` field is still included in the result.
+the value. The `_id` field is still included in the result.
 
     // Users.find({}, {fields: {firstname: 1, lastname: 1}})
 
-It is not possible to mix inclusion and exclusion styles (exception for `_id`).
-Field operators such as `$` and `$elemMatch` are not available on client side yet.
+It is not possible to mix inclusion and exclusion styles (except for the cases
+when `_id` is included by default or explicitly included). Field operators such
+as `$` and `$elemMatch` are not available on the client side yet.
 
 More advanced example:
 
@@ -1278,7 +1279,8 @@ More advanced example:
 
     // returns { alterEgos: [{ name: "Kira" }, { name: "L" }] }
 
-Notice the nested field rule and array behavior, learn more in MongoDB docs.
+See <a href="http://docs.mongodb.org/manual/tutorial/project-fields-from-query-results/#projection">
+the MongoDB docs</a> for details of the nested field rules and array behavior.
 
 {{/api_box_inline}}
 

From 008d28c03a4d735c9d42d13c382f566e02fd5994 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Mon, 30 Sep 2013 18:04:24 -0700
Subject: [PATCH 142/335] Touch History.md regarding fields projection in
 minimongo.

---
 History.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/History.md b/History.md
index b38f30a6d5..36dbd680c0 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,8 @@
 ## vNEXT
 
+* Minimongo supports simple fields projections (but still no `$elemMatch` and
+  `$` operators support in projections).
+
 * `restrictCreationByEmail` option in `Accounts.config` to restrict new users to
   emails of specific domain (eg. only users with @meteor.com emails).
 

From 3a8fc57a24b6abb1e136ab1aecdaf3a43c456eff Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Mon, 30 Sep 2013 18:11:47 -0700
Subject: [PATCH 143/335] Fix docs typo.

---
 docs/client/api.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/client/api.html b/docs/client/api.html
index be68c131ef..0554538882 100644
--- a/docs/client/api.html
+++ b/docs/client/api.html
@@ -1266,7 +1266,7 @@ the value. The `_id` field is still included in the result.
     // Users.find({}, {fields: {firstname: 1, lastname: 1}})
 
 It is not possible to mix inclusion and exclusion styles (except for the cases
-when `_id` is included by default or explicitly included). Field operators such
+when `_id` is included by default or explicitly excluded). Field operators such
 as `$` and `$elemMatch` are not available on the client side yet.
 
 More advanced example:

From c9ba1b3ec9218c90896256ea0c87d7200e70a7a4 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Mon, 30 Sep 2013 17:34:25 -0700
Subject: [PATCH 144/335] Fix handling of Mongo exit callback (followup to
 6358930).

---
 tools/mongo_runner.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/mongo_runner.js b/tools/mongo_runner.js
index b2c1b55093..10745d9141 100644
--- a/tools/mongo_runner.js
+++ b/tools/mongo_runner.js
@@ -165,10 +165,13 @@ exports.launch_mongo = function (app_dir, port, launch_callback, on_exit_callbac
       '--port', port,
       '--dbpath', data_path
     ]);
+    var callOnExit = function (code, signal) {
+      on_exit_callback(code, signal, stderrOutput);
+    };
     handle.stop = function (callback) {
       var tries = 0;
       var exited = false;
-      proc.removeListener('exit', on_exit_callback);
+      proc.removeListener('exit', callOnExit);
       proc.kill('SIGINT');
       callback && callback(err);
     };
@@ -180,9 +183,7 @@ exports.launch_mongo = function (app_dir, port, launch_callback, on_exit_callbac
       stderrOutput += data;
     });
 
-    proc.on('exit', function (code, signal) {
-      on_exit_callback(code, signal, stderrOutput);
-    });
+    proc.on('exit', callOnExit);
 
     proc.stdout.setEncoding('utf8');
     proc.stdout.on('data', function (data) {

From 81d9fdf4e37c783b7cb773e600138bf3227bb4f1 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Mon, 30 Sep 2013 18:15:26 -0700
Subject: [PATCH 145/335] Rough draft of History.md additions. Covered all
 changes through ab59ae2.

Includes some XXX notes (some of which are about History.md itself, some of
which are suggestions for things to make sure to address before the next
release).
---
 History.md | 93 ++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 80 insertions(+), 13 deletions(-)

diff --git a/History.md b/History.md
index 36dbd680c0..aa9a7592bc 100644
--- a/History.md
+++ b/History.md
@@ -1,23 +1,59 @@
 ## vNEXT
 
-* Minimongo supports simple fields projections (but still no `$elemMatch` and
-  `$` operators support in projections).
+(XXX format section headers in a more standard way)
 
-* `restrictCreationByEmail` option in `Accounts.config` to restrict new users to
-  emails of specific domain (eg. only users with @meteor.com emails).
+SECURITY
+
+* Add `browser-policy` package for configuring and sending Content Security
+  Policy and X-Frame-Options HTTP headers.
+
+* Use cryptographically strong pseudorandom number generators when available.
+
+MINIMONGO
 
 * Pass an index and the cursor itself to the callbacks in `cursor.forEach` and
-  `cursor.map`, just like the corresponding `Array` methods. #63
+  `cursor.map`, just like the corresponding `Array` methods.  #63
 
-* Better error when passing a string to {{#each}}. #722
+* The `fields` option to the collection methods `find` and `findOne` now works
+  on the client as well.  (Operators such as `$elemMatch` and `$` are not yet
+  supported in `fields` projections.) #1287
 
-* Write dates to Mongo as ISODate rather than Integer; existing data can be
-  converted by passing it through `new Date()`. #1228
+* Support `c.find(query, {limit: N}).count()` on the client.  #654
+
+* Fix various bugs with using Mongo ObjectIds. (XXX bad description! this is
+  3cfeed and 008847)
+
+* Improve behavior of `$ne`, $nin`, and `$not` selectors with objects containing
+  arrays.  #1451
+
+DDP
+
+* Fix infinite loop if a client disconnects while a long yielding method is
+  running.
+
+* Unfinished code to support DDP session resumption has been removed. Meteor
+  servers now stop processing messages from clients and reclaim memory
+  associated with them as soon as they are disconnected instead of a few minutes
+  later.
+
+ACCOUNTS
+
+* `restrictCreationByEmail` option in `Accounts.config` to restrict new users to
+  emails of specific domain (eg. only users with @meteor.com emails).  #1332
+  XXX glasser agrees with Avi's concern that this option name does not suggest "domain".
+
+* Write dates generated by Meteor Accounts to Mongo as Date instead of number;
+  existing data can be converted by passing it through `new Date()`. #1228
 
 * Login token deletion: Expire login tokens periodically. Add
   Meteor._logoutAllOthers() for logging out other connections logged in as the
   current user. Log out and close connections for deleted users and tokens.
 
+* Support OAuth1 services that require request token secrets as well as
+  authentication token secrets.  #1253
+
+TOOLS
+
 * The pre-0.6.5 `Package.register_extension` API has been removed. Use
   `Package._transitional_registerBuildPlugin` instead, which was introduced in
   0.6.5. (A bug prevented the 0.6.5 reimplementation of `register_extension`
@@ -28,15 +64,46 @@
   behind a proxy. Use the standard `http_proxy` environment variable to
   specify your proxy endpoint.  #429, #689, #1338
 
+* Install NPM modules with `--force` to avoid corrupted local caches.
+
+* Rebuild NPM modules in packages when upgrading to a version of Meteor that
+  uses a different version of Node.
+
 * Build Linux binaries on an older Linux machine. Meteor now supports
   running on Linux machines with glibc 2.9 or newer (Ubuntu 10.04+, RHEL
-  and CentOS 6+, Fedora 10+, Debian 6+).
+  and CentOS 6+, Fedora 10+, Debian 6+). Improve error message when running
+  on Linux with unsupported glibc, and include Mongo stderr if it fails
+  to start.
 
-* Support OAuth1 services that require request token secrets as well as
-  authentication token secrets.  #1253
+* Disable the Mongo http interface. This lets you run meteor on two ports
+  differing by 1000 at the same time.
 
-* Add `browser-policy` package for configuring and sending Content Security
-  Policy and X-Frame-Options HTTP headers.
+MISC
+
+* Check that the argument to `EJSON.parse` is a string.  #1401
+
+* Better error from functions that use `Meteor._wrapAsync` (eg collection write
+  methods and `HTTP` methods) and in DDP server message processing.  #1387
+
+* XXX: Does appconfig branch have any visible effects that need to be here?
+
+* Support `appcache` on Chrome for iOS.
+
+* Support literate CoffeeScript files with the extension `.coffee.md` (in
+  addition to the already-supported `.litcoffee` extension). #1407
+
+* Make `madewith` package work again (broken in 0.6.5).  #1448
+
+* Better error when passing a string to {{#each}}. #722
+
+* Upgraded dependencies:
+  * Node from 0.8.24 to 0.10.19
+  * MongoDB from 2.4.4 to 2.4.6
+  * http-proxy from 0.10.1 to a pre-release of 1.0.0
+  * stylus from 0.30.1 to 0.37.0
+  * nib from 0.8.2 to 1.0.0  #1121 #1315
+  * XXX: we should try to do more upgrades in this release if possible (in
+    conjunction with the Node upgrade)
 
 
 ## v0.6.5.1

From bad2102c060060789d5012e77c0e3493b61a402a Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Tue, 1 Oct 2013 10:12:02 -0700
Subject: [PATCH 146/335] Return results from collection methods on livedata
 connection.

This allows us to immediately return local collection return values inside
stubs.
---
 packages/mongo-livedata/collection.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/mongo-livedata/collection.js b/packages/mongo-livedata/collection.js
index 7e8a876697..f79b471cf1 100644
--- a/packages/mongo-livedata/collection.js
+++ b/packages/mongo-livedata/collection.js
@@ -424,7 +424,9 @@ _.each(["insert", "update", "remove", "upsert"], function (name) {
         throwIfSelectorIsNotId(args[0], name);
       }
 
-      self._connection.apply(self._prefix + name, args, wrappedCallback);
+      ret = transformResultFromCollection(
+        self._connection.apply(self._prefix + name, args, wrappedCallback)
+      );
 
     } else {
       // it's my collection.  descend into the collection object

From dc8e948cb1f8d08217ad47a103e68f87f412197e Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Tue, 1 Oct 2013 11:36:56 -0700
Subject: [PATCH 147/335] Test and fixes for returning upsert results
 immediately inside stubs.

Added a test for upsert return values. Factored out some more upsert test
helpers.

Could still use a test for update/remove return values inside a method stub.
---
 packages/mongo-livedata/collection.js         |  13 +-
 .../mongo-livedata/mongo_livedata_tests.js    | 218 ++++++++++++------
 2 files changed, 156 insertions(+), 75 deletions(-)

diff --git a/packages/mongo-livedata/collection.js b/packages/mongo-livedata/collection.js
index f79b471cf1..d43b3094c0 100644
--- a/packages/mongo-livedata/collection.js
+++ b/packages/mongo-livedata/collection.js
@@ -403,20 +403,24 @@ _.each(["insert", "update", "remove", "upsert"], function (name) {
       // just remote to another endpoint, propagate return value or
       // exception.
 
-      if (Meteor.isClient && !wrappedCallback) {
+      var enclosing = DDP._CurrentInvocation.get();
+      var alreadyInSimulation = enclosing && enclosing.isSimulation;
+
+      if (Meteor.isClient && !wrappedCallback && ! alreadyInSimulation) {
         // Client can't block, so it can't report errors by exception,
         // only by callback. If they forget the callback, give them a
         // default one that logs the error, so they aren't totally
         // baffled if their writes don't work because their database is
         // down.
+        // Don't give a default callback in simulation, because inside stubs we
+        // want to return the results from the local collection immediately and
+        // not force a callback.
         wrappedCallback = function (err) {
           if (err)
             Meteor._debug(name + " failed: " + (err.reason || err.stack));
         };
       }
 
-      var enclosing = DDP._CurrentInvocation.get();
-      var alreadyInSimulation = enclosing && enclosing.isSimulation;
       if (!alreadyInSimulation && name !== "insert") {
         // If we're about to actually send an RPC, we should throw an error if
         // this is a non-ID selector, because the mutation methods only allow
@@ -595,9 +599,8 @@ Meteor.Collection.prototype._defineMutationMethods = function() {
 
             // In a client simulation, you can do any mutation (even with a
             // complex selector).
-            self._collection[method].apply(
+            return self._collection[method].apply(
               self._collection, _.toArray(arguments));
-            return;
           }
 
           // This is the server receiving a method call from the client.
diff --git a/packages/mongo-livedata/mongo_livedata_tests.js b/packages/mongo-livedata/mongo_livedata_tests.js
index 1062c0131a..3e0ca2e71f 100644
--- a/packages/mongo-livedata/mongo_livedata_tests.js
+++ b/packages/mongo-livedata/mongo_livedata_tests.js
@@ -23,6 +23,108 @@ if (Meteor.isServer) {
   });
 }
 
+
+// Helpers for upsert tests
+
+var stripId = function (obj) {
+  delete obj._id;
+};
+
+var compareResults = function (test, useUpdate, actual, expected) {
+  if (useUpdate) {
+    _.map(actual, stripId);
+    _.map(expected, stripId);
+  }
+  // (technically should ignore order in comparison)
+  test.equal(actual, expected);
+};
+
+var upsert = function (coll, useUpdate, query, mod, options, callback) {
+  if (! callback && typeof options === "function") {
+    callback = options;
+    options = {};
+  }
+
+  if (useUpdate) {
+    if (callback)
+      return coll.update(query, mod,
+                         _.extend({ upsert: true }, options),
+                         function (err, result) {
+                           callback(err, ! err && {
+                             numberAffected: result
+                           });
+                         });
+    return {
+      numberAffected: coll.update(query, mod,
+                                  _.extend({ upsert: true }, options))
+    };
+  } else {
+    return coll.upsert(query, mod, options, callback);
+  }
+};
+
+var upsertTestMethod = "livedata_upsert_test_method";
+var upsertTestMethodColl;
+
+// This is the implementation of the upsert test method on both the client and
+// the server. On the client, we get a test object. On the server, we just throw
+// errors if something doesn't go according to plan, and when the client
+// receives those errors it will cause the test to fail.
+//
+// Client-side exceptions in here will NOT cause the test to fail! Because it's
+// a stub, those exceptions will get caught and logged.
+var upsertTestMethodImpl = function (coll, useUpdate, test) {
+  coll.remove({});
+  var result1 = upsert(coll, useUpdate, { foo: "bar" }, { foo: "bar" });
+
+  if (! test) {
+    test = {
+      equal: function (a, b) {
+        if (! EJSON.equals(a, b))
+          throw new Error("Not equal: " +
+                          JSON.stringify(a) + ", " + JSON.stringify(b));
+      },
+      isTrue: function (a) {
+        if (! a)
+          throw new Error("Not truthy: " + JSON.stringify(a));
+      },
+      isFalse: function (a) {
+        if (a)
+          throw new Error("Not falsey: " + JSON.stringify(a));
+      }
+    };
+  }
+
+  // if we don't test this, then testing result1.numberAffected will throw,
+  // which will get caught and logged and the whole test will pass!
+  test.isTrue(result1);
+
+  test.equal(result1.numberAffected, 1);
+  if (! useUpdate)
+    test.isTrue(result1.insertedId);
+  var fooId = result1.insertedId;
+  var obj = coll.findOne({ foo: "bar" });
+  test.isTrue(obj);
+  if (! useUpdate)
+    test.equal(obj._id, result1.insertedId);
+  var result2 = upsert(coll, useUpdate, { _id: fooId },
+                       { $set: { foo: "baz " } });
+  test.isTrue(result2);
+  test.equal(result2.numberAffected, 1);
+  test.isFalse(result2.insertedId);
+};
+
+if (Meteor.isServer) {
+  var m = {};
+  m[upsertTestMethod] = function (run, useUpdate, options) {
+    check(run, String);
+    check(useUpdate, Boolean);
+    upsertTestMethodColl = new Meteor.Collection(upsertTestMethod + "_collection_" + run, options);
+    upsertTestMethodImpl(upsertTestMethodColl, useUpdate);
+  };
+  Meteor.methods(m);
+}
+
 Meteor._FailureTestCollection =
   new Meteor.Collection("___meteor_failure_test_collection");
 
@@ -951,46 +1053,24 @@ if (Meteor.isServer) {
 
 } // end Meteor.isServer
 
-var stripId = function (obj) {
-  delete obj._id;
-};
-
-var compareResults = function (test, useUpdate, actual, expected) {
-  if (useUpdate) {
-    _.map(actual, stripId);
-    _.map(expected, stripId);
-  }
-  // (technically should ignore order in comparison)
-  test.equal(actual, expected);
-};
-
 // This test is duplicated below (with some changes) for async upserts that go
 // over the network.
 _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
   _.each([true, false], function (useUpdate) {
     Tinytest.add("mongo-livedata - " + (useUpdate ? "update " : "") + "upsert" + (minimongo ? " minimongo" : "") + ", " + idGeneration, function (test) {
-      var upsert = function (query, mod, options) {
-        if (useUpdate)
-          return { numberAffected:
-                   coll.update(query, mod,
-                                     _.extend({ upsert: true }, options)) };
-        else
-          return coll.upsert(query, mod, options);
-      };
-
       var run = test.runId();
       var options = collectionOptions;
       if (minimongo)
         options = _.extend({}, collectionOptions, { connection: null });
       var coll = new Meteor.Collection("livedata_upsert_collection_"+run, options);
 
-      var result1 = upsert({foo: 'bar'}, {foo: 'bar'});
+      var result1 = upsert(coll, useUpdate, {foo: 'bar'}, {foo: 'bar'});
       test.equal(result1.numberAffected, 1);
       if (! useUpdate)
         test.isTrue(result1.insertedId);
       compareResults(test, useUpdate, coll.find().fetch(), [{foo: 'bar', _id: result1.insertedId}]);
 
-      var result2 = upsert({foo: 'bar'}, {foo: 'baz'});
+      var result2 = upsert(coll, useUpdate, {foo: 'bar'}, {foo: 'baz'});
       test.equal(result2.numberAffected, 1);
       if (! useUpdate)
         test.isFalse(result2.insertedId);
@@ -1002,13 +1082,13 @@ _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
 
       var t1 = new Meteor.Collection.ObjectID();
       var t2 = new Meteor.Collection.ObjectID();
-      var result3 = upsert({foo: t1}, {foo: t1});
+      var result3 = upsert(coll, useUpdate, {foo: t1}, {foo: t1});
       test.equal(result3.numberAffected, 1);
       if (! useUpdate)
         test.isTrue(result3.insertedId);
       compareResults(test, useUpdate, coll.find().fetch(), [{foo: t1, _id: result3.insertedId}]);
 
-      var result4 = upsert({foo: t1}, {foo: t2});
+      var result4 = upsert(coll, useUpdate, {foo: t1}, {foo: t2});
       test.equal(result2.numberAffected, 1);
       if (! useUpdate)
         test.isFalse(result2.insertedId);
@@ -1018,7 +1098,7 @@ _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
 
       // Test modification by upsert
 
-      var result5 = upsert({name: 'David'}, {$set: {foo: 1}});
+      var result5 = upsert(coll, useUpdate, {name: 'David'}, {$set: {foo: 1}});
       test.equal(result5.numberAffected, 1);
       if (! useUpdate)
         test.isTrue(result5.insertedId);
@@ -1027,11 +1107,11 @@ _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
 
       test.throws(function () {
         // test that bad modifier fails fast
-        upsert({name: 'David'}, {$blah: {foo: 2}});
+        upsert(coll, useUpdate, {name: 'David'}, {$blah: {foo: 2}});
       });
 
 
-      var result6 = upsert({name: 'David'}, {$set: {foo: 2}});
+      var result6 = upsert(coll, useUpdate, {name: 'David'}, {$set: {foo: 2}});
       test.equal(result6.numberAffected, 1);
       if (! useUpdate)
         test.isFalse(result6.insertedId);
@@ -1043,7 +1123,7 @@ _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
                                            {name: 'Emily', foo: 2, _id: emilyId}]);
 
       // multi update by upsert
-      var result7 = upsert({foo: 2},
+      var result7 = upsert(coll, useUpdate, {foo: 2},
                            {$set: {bar: 7},
                             $setOnInsert: {name: 'Fred', foo: 2}},
                            {multi: true});
@@ -1054,7 +1134,7 @@ _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
                                            {name: 'Emily', foo: 2, bar: 7, _id: emilyId}]);
 
       // insert by multi upsert
-      var result8 = upsert({foo: 3},
+      var result8 = upsert(coll, useUpdate, {foo: 3},
                            {$set: {bar: 7},
                             $setOnInsert: {name: 'Fred', foo: 2}},
                            {multi: true});
@@ -1068,7 +1148,7 @@ _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
                       {name: 'Fred', foo: 2, bar: 7, _id: fredId}]);
 
       // test `insertedId` option
-      var result9 = upsert({name: 'Steve'},
+      var result9 = upsert(coll, useUpdate, {name: 'Steve'},
                            {name: 'Steve'},
                            {insertedId: 'steve'});
       test.equal(result9.numberAffected, 1);
@@ -1091,19 +1171,6 @@ if (Meteor.isClient) {
   _.each([true, false], function (useUpdate) {
     Tinytest.addAsync("mongo-livedata - async " + (useUpdate ? "update " : "") + "upsert" + ", " + idGeneration, function (test, onComplete) {
       var coll;
-      var upsert = function (query, mod, options, callback) {
-        if (! callback && typeof options === "function") {
-          callback = options;
-          options = {};
-        }
-        if (useUpdate)
-          coll.update(query, mod, _.extend({ upsert: true }, options), function (err, result) {
-            callback(err, result ? { numberAffected: result } : undefined);
-          });
-        else
-          coll.upsert(query, mod, options, callback);
-      };
-
       var run = test.runId();
       var collName = "livedata_upsert_collection_"+run;
       Meteor.call("createInsecureCollection", collName, collectionOptions);
@@ -1119,11 +1186,11 @@ if (Meteor.isClient) {
           test.equal(result1.insertedId, 'foo');
         }
         compareResults(test, useUpdate, coll.find().fetch(), [{foo: 'bar', _id: 'foo'}]);
-        upsert({_id: 'foo'}, {foo: 'baz'}, next2);
+        upsert(coll, useUpdate, {_id: 'foo'}, {foo: 'baz'}, next2);
       };
 
       // Test starts here.
-      upsert({_id: 'foo'}, {_id: 'foo', foo: 'bar'}, next1);
+      upsert(coll, useUpdate, {_id: 'foo'}, {_id: 'foo', foo: 'bar'}, next1);
 
       var t1, t2, result2;
       var next2 = function (err, result) {
@@ -1139,7 +1206,7 @@ if (Meteor.isClient) {
 
         t1 = new Meteor.Collection.ObjectID();
         t2 = new Meteor.Collection.ObjectID();
-        upsert({_id: t1}, {_id: t1, foo: 'bar'}, next3);
+        upsert(coll, useUpdate, {_id: t1}, {_id: t1, foo: 'bar'}, next3);
       };
 
       var result3;
@@ -1152,7 +1219,7 @@ if (Meteor.isClient) {
         }
         compareResults(test, useUpdate, coll.find().fetch(), [{_id: t1, foo: 'bar'}]);
 
-        upsert({_id: t1}, {foo: t2}, next4);
+        upsert(coll, useUpdate, {_id: t1}, {foo: t2}, next4);
       };
 
       var next4 = function (err, result4) {
@@ -1164,7 +1231,7 @@ if (Meteor.isClient) {
         coll.remove({_id: t1});
 
         // Test modification by upsert
-        upsert({_id: 'David'}, {$set: {foo: 1}}, next5);
+        upsert(coll, useUpdate, {_id: 'David'}, {$set: {foo: 1}}, next5);
       };
 
       var result5;
@@ -1182,9 +1249,9 @@ if (Meteor.isClient) {
         // The stub throws an exception about the invalid modifier, which
         // livedata logs (so we suppress it).
         Meteor._suppress_log(1);
-        upsert({_id: 'David'}, {$blah: {foo: 2}}, function (err) {
+        upsert(coll, useUpdate, {_id: 'David'}, {$blah: {foo: 2}}, function (err) {
           test.isTrue(err);
-          upsert({_id: 'David'}, {$set: {foo: 2}}, next6);
+          upsert(coll, useUpdate, {_id: 'David'}, {$set: {foo: 2}}, next6);
         });
       };
 
@@ -1203,7 +1270,7 @@ if (Meteor.isClient) {
         // multi update by upsert.
         // We can't actually update multiple documents since we have to do it by
         // id, but at least make sure the multi flag doesn't mess anything up.
-        upsert({_id: 'Emily'},
+        upsert(coll, useUpdate, {_id: 'Emily'},
                {$set: {bar: 7},
                 $setOnInsert: {name: 'Fred', foo: 2}},
                {multi: true}, next7);
@@ -1219,7 +1286,7 @@ if (Meteor.isClient) {
                                              {_id: 'Emily', foo: 2, bar: 7}]);
 
         // insert by multi upsert
-        upsert({_id: 'Fred'},
+        upsert(coll, useUpdate, {_id: 'Fred'},
                {$set: {bar: 7},
                 $setOnInsert: {name: 'Fred', foo: 2}},
                {multi: true}, next8);
@@ -1278,19 +1345,30 @@ if (Meteor.isClient) {
 
 } // end isClient
 
+// Runs a method and its stub which do some upserts. The method throws an error
+// if we don't get the right return values.
+if (Meteor.isClient) {
+  _.each([true, false], function (useUpdate) {
+    Tinytest.addAsync("mongo-livedata - " + (useUpdate ? "update " : "") + "upsert in method, " + idGeneration, function (test, onComplete) {
+      var run = test.runId();
+      upsertTestMethodColl = new Meteor.Collection(upsertTestMethod + "_collection_" + run, collectionOptions);
+      var m = {};
+      delete Meteor.connection._methodHandlers[upsertTestMethod];
+      m[upsertTestMethod] = function (run, useUpdate, options) {
+        upsertTestMethodImpl(upsertTestMethodColl, useUpdate, test);
+      };
+      Meteor.methods(m);
+      Meteor.call(upsertTestMethod, run, useUpdate, collectionOptions, function (err, result) {
+        test.isFalse(err);
+        onComplete();
+      });
+    });
+  });
+}
 
 _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
   _.each([true, false], function (useUpdate) {
     Tinytest.add("mongo-livedata - " + (useUpdate ? "update " : "") + "upsert by id" + (minimongo ? " minimongo" : "") + ", " + idGeneration, function (test) {
-      var upsert = function (query, mod, options) {
-        if (useUpdate)
-          return { numberAffected:
-                   coll.update(query, mod,
-                                     _.extend({ upsert: true }, options)) };
-        else
-          return coll.upsert(query, mod, options);
-      };
-
       var run = test.runId();
       var options = collectionOptions;
       if (minimongo)
@@ -1298,21 +1376,21 @@ _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
       var coll = new Meteor.Collection("livedata_upsert_by_id_collection_"+run, options);
 
       var ret;
-      ret = upsert({_id: 'foo'}, {$set: {x: 1}});
+      ret = upsert(coll, useUpdate, {_id: 'foo'}, {$set: {x: 1}});
       test.equal(ret.numberAffected, 1);
       if (! useUpdate)
         test.equal(ret.insertedId, 'foo');
       compareResults(test, useUpdate, coll.find().fetch(),
                      [{_id: 'foo', x: 1}]);
 
-      ret = upsert({_id: 'foo'}, {$set: {x: 2}});
+      ret = upsert(coll, useUpdate, {_id: 'foo'}, {$set: {x: 2}});
       test.equal(ret.numberAffected, 1);
       if (! useUpdate)
         test.isFalse(ret.insertedId);
       compareResults(test, useUpdate, coll.find().fetch(),
                      [{_id: 'foo', x: 2}]);
 
-      ret = upsert({_id: 'bar'}, {$set: {x: 1}});
+      ret = upsert(coll, useUpdate, {_id: 'bar'}, {$set: {x: 1}});
       test.equal(ret.numberAffected, 1);
       if (! useUpdate)
         test.equal(ret.insertedId, 'bar');
@@ -1322,7 +1400,7 @@ _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
 
       coll.remove({});
 
-      ret = upsert({_id: 'traz'}, {x: 1});
+      ret = upsert(coll, useUpdate, {_id: 'traz'}, {x: 1});
       test.equal(ret.numberAffected, 1);
       var myId = ret.insertedId;
       if (! useUpdate) {
@@ -1337,7 +1415,7 @@ _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
                      [{x: 1, _id: myId}]);
 
       // this time, insert as _id 'traz'
-      ret = upsert({_id: 'traz'}, {_id: 'traz', x: 2});
+      ret = upsert(coll, useUpdate, {_id: 'traz'}, {_id: 'traz', x: 2});
       test.equal(ret.numberAffected, 1);
       if (! useUpdate)
         test.equal(ret.insertedId, 'traz');
@@ -1346,7 +1424,7 @@ _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
                       {x: 2, _id: 'traz'}]);
 
       // now update _id 'traz'
-      ret = upsert({_id: 'traz'}, {x: 3});
+      ret = upsert(coll, useUpdate, {_id: 'traz'}, {x: 3});
       test.equal(ret.numberAffected, 1);
       test.isFalse(ret.insertedId);
       compareResults(test, useUpdate, coll.find().fetch(),
@@ -1354,7 +1432,7 @@ _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
                       {x: 3, _id: 'traz'}]);
 
       // now update, passing _id (which is ok as long as it's the same)
-      ret = upsert({_id: 'traz'}, {_id: 'traz', x: 4});
+      ret = upsert(coll, useUpdate, {_id: 'traz'}, {_id: 'traz', x: 4});
       test.equal(ret.numberAffected, 1);
       test.isFalse(ret.insertedId);
       compareResults(test, useUpdate, coll.find().fetch(),

From 1002650fcda437bfb2ee3e670d349436c5770060 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Tue, 1 Oct 2013 11:48:45 -0700
Subject: [PATCH 148/335] Update Collection comments to reflect new return
 values.

---
 packages/mongo-livedata/collection.js | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/mongo-livedata/collection.js b/packages/mongo-livedata/collection.js
index d43b3094c0..9cd047dcb3 100644
--- a/packages/mongo-livedata/collection.js
+++ b/packages/mongo-livedata/collection.js
@@ -313,16 +313,21 @@ var throwIfSelectorIsNotId = function (selector, methodName) {
   }
 };
 
-// 'insert' immediately returns the inserted document's new _id.  The
-// others return nothing.
+// 'insert' immediately returns the inserted document's new _id.
+// The others return values immediately if you are in a stub, an in-memory
+// unmanaged collection, or a mongo-backed collection and you don't pass a
+// callback. 'update' and 'remove' return the number of affected
+// documents. 'upsert' returns an object with keys 'numberAffected' and, if an
+// insert happened, 'insertedId'.
 //
 // Otherwise, the semantics are exactly like other methods: they take
 // a callback as an optional last argument; if no callback is
 // provided, they block until the operation is complete, and throw an
 // exception if it fails; if a callback is provided, then they don't
-// necessarily block, and they call the callback when they finish with
-// error and result arguments.  (The insert method provides the
-// document ID as its result; update and remove don't provide a result.)
+// necessarily block, and they call the callback when they finish with error and
+// result arguments.  (The insert method provides the document ID as its result;
+// update and remove provide the number of affected docs as the result; upsert
+// provides an object with numberAffected and maybe insertedId.)
 //
 // On the client, blocking is impossible, so if a callback
 // isn't provided, they just return immediately and any error
@@ -450,7 +455,8 @@ _.each(["insert", "update", "remove", "upsert"], function (name) {
     }
 
     // both sync and async, unless we threw an exception, return ret
-    // (new document ID for insert, undefined otherwise).
+    // (new document ID for insert, num affected for update/remove, object with
+    // numberAffected and maybe insertedId for upsert).
     return ret;
   };
 });

From b9d8fffddf43c0dd73adcbf9eb3df2c07ed09b37 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Tue, 1 Oct 2013 15:14:09 -0700
Subject: [PATCH 149/335] Sockjs: accept relative base urls

(transform them to absolue urls)
---
 packages/livedata/sockjs-0.3.4.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/livedata/sockjs-0.3.4.js b/packages/livedata/sockjs-0.3.4.js
index a3a2f687eb..60dd5aef3a 100644
--- a/packages/livedata/sockjs-0.3.4.js
+++ b/packages/livedata/sockjs-0.3.4.js
@@ -1211,7 +1211,7 @@ SockJS.prototype._applyInfo = function(info, rtt, protocols_whitelist) {
     // Servers can override base_url, eg to provide a randomized domain name and
     // avoid browser per-domain connection limits.
     if (info.base_url)
-      that._base_url = info.base_url;
+      that._base_url = utils.amendUrl(info.base_url);
     var probed = utils.probeProtocols();
     that._protocols = utils.detectProtocols(probed, protocols_whitelist, info);
 // <METEOR>

From 53756bd80b11736eca3963ea26ba6eee62798f8a Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Tue, 1 Oct 2013 17:05:17 -0700
Subject: [PATCH 150/335] Allow passing function predicate for domain checks

Escape regexp construction
Don't use &= with Booleans
---
 packages/accounts-base/accounts_server.js | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index c36bc5bf47..49fd088e97 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -304,14 +304,24 @@ Accounts.validateNewUser = function (func) {
   validateNewUserHooks.push(func);
 };
 
+// XXX Copied from the middle of oplog-tailing logic
+// Like Perl's quotemeta: quotes all regexp metacharacters. See
+//   https://github.com/substack/quotemeta/blob/master/index.js
+var quotemeta = function (str) {
+    return String(str).replace(/(\W)/g, '\\$1');
+};
+
 // Helper function: returns false if email does not match company domain from
 // the configuration.
 var testEmailDomain = function (email) {
   var domain = Accounts._options.restrictCreationByEmail;
-  return !domain || (new RegExp('@' + domain + '$', 'i')).test(email);
+  return !domain ||
+    (_.isFunction(domain) && domain(email)) ||
+    (_.isString(domain) &&
+      (new RegExp('@' + quotemeta(domain) + '$', 'i')).test(email));
 };
 
-// Validate new user's email or Google/Facebook/Github account's email
+// Validate new user's email or Google/Facebook/GitHub account's email
 Accounts.validateNewUser(function (user) {
   var domain = Accounts._options.restrictCreationByEmail;
   if (!domain)
@@ -320,15 +330,17 @@ Accounts.validateNewUser(function (user) {
   var emailIsGood = true;
   // User with password can have only one email on creation
   if (user.emails)
-    emailIsGood &= testEmailDomain(user.emails[0].address);
+    emailIsGood = emailIsGood && testEmailDomain(user.emails[0].address);
 
   // Find any email of any service and check it
-  emailIsGood &= _.any(user.services, function (service) {
+  emailIsGood = emailIsGood && _.any(user.services, function (service) {
     return service.email && testEmailDomain(service.email);
   });
 
   if (!emailIsGood)
-    throw new Meteor.Error(403, "@" + domain + " email required");
+    if (_.isString(domain))
+      throw new Meteor.Error(403, "@" + domain + " email required");
+    else throw new Meteor.Error(403, "Email doesn't match the criterias.");
 
   return true;
 });

From bd77b172bd8c225a1252e41d21ed65868feacc4d Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Tue, 1 Oct 2013 17:14:30 -0700
Subject: [PATCH 151/335] Rename Accounts option 'restrictCreationByEmail' to
 'restrictCreationByEmailDomain'

---
 History.md                                | 6 +++---
 docs/client/api.js                        | 4 ++--
 packages/accounts-base/accounts_common.js | 2 +-
 packages/accounts-base/accounts_server.js | 4 ++--
 packages/google/google_client.js          | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/History.md b/History.md
index aa9a7592bc..60753e0217 100644
--- a/History.md
+++ b/History.md
@@ -38,9 +38,9 @@ DDP
 
 ACCOUNTS
 
-* `restrictCreationByEmail` option in `Accounts.config` to restrict new users to
-  emails of specific domain (eg. only users with @meteor.com emails).  #1332
-  XXX glasser agrees with Avi's concern that this option name does not suggest "domain".
+* `restrictCreationByEmailDomain` option in `Accounts.config` to restrict new
+  users to emails of specific domain (eg. only users with @meteor.com emails) or
+  a custom validator. #1332
 
 * Write dates generated by Meteor Accounts to Mongo as Date instead of number;
   existing data can be converted by passing it through `new Date()`. #1228
diff --git a/docs/client/api.js b/docs/client/api.js
index 4a7402824a..3b8360aacd 100644
--- a/docs/client/api.js
+++ b/docs/client/api.js
@@ -1108,9 +1108,9 @@ Template.api.accounts_config = {
       descr: "Calls to [`createUser`](#accounts_createuser) from the client will be rejected. In addition, if you are using [accounts-ui](#accountsui), the \"Create account\" link will not be available."
     },
     {
-      name: "restrictCreationByEmail",
+      name: "restrictCreationByEmailDomain",
       type: "String",
-      descr: "If set, only allow new users with an email in the specified domain. Works with password-based sign-in and external services that expose email addresses (Google, Facebook, GitHub). All existing users still can log in after enabling this option. Example: `Accounts.config({ restrictCreationByEmail: 'school.edu' })`."
+      descr: "If set, only allow new users with an email in the specified domain. Works with password-based sign-in and external services that expose email addresses (Google, Facebook, GitHub). All existing users still can log in after enabling this option. Example: `Accounts.config({ restrictCreationByEmailDomain: 'school.edu' })`."
     }
   ]
 };
diff --git a/packages/accounts-base/accounts_common.js b/packages/accounts-base/accounts_common.js
index 085591b128..208a03f85d 100644
--- a/packages/accounts-base/accounts_common.js
+++ b/packages/accounts-base/accounts_common.js
@@ -34,7 +34,7 @@ Accounts._options = {};
 Accounts.config = function(options) {
   // validate option keys
   var VALID_KEYS = ["sendVerificationEmail", "forbidClientAccountCreation",
-                    "restrictCreationByEmail", "_tokenLifetimeSecs",
+                    "restrictCreationByEmailDomain", "_tokenLifetimeSecs",
                     "_tokenExpirationIntervalSecs", "_minTokenLifetimeSecs",
                     "_connectionCloseDelaySecs"];
   _.each(_.keys(options), function (key) {
diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index 49fd088e97..ba2237701a 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -314,7 +314,7 @@ var quotemeta = function (str) {
 // Helper function: returns false if email does not match company domain from
 // the configuration.
 var testEmailDomain = function (email) {
-  var domain = Accounts._options.restrictCreationByEmail;
+  var domain = Accounts._options.restrictCreationByEmailDomain;
   return !domain ||
     (_.isFunction(domain) && domain(email)) ||
     (_.isString(domain) &&
@@ -323,7 +323,7 @@ var testEmailDomain = function (email) {
 
 // Validate new user's email or Google/Facebook/GitHub account's email
 Accounts.validateNewUser(function (user) {
-  var domain = Accounts._options.restrictCreationByEmail;
+  var domain = Accounts._options.restrictCreationByEmailDomain;
   if (!domain)
     return true;
 
diff --git a/packages/google/google_client.js b/packages/google/google_client.js
index fce4e19750..06ad03e00c 100644
--- a/packages/google/google_client.js
+++ b/packages/google/google_client.js
@@ -44,8 +44,8 @@ Google.requestCredential = function (options, credentialRequestCompleteCallback)
         '&access_type=' + accessType +
         '&approval_prompt=' + approvalPrompt;
 
-  if (Accounts._options.restrictCreationByEmail) {
-    loginUrl += '&hd=' + encodeURIComponent(Accounts._options.restrictCreationByEmail);
+  if (Accounts._options.restrictCreationByEmailDomain) {
+    loginUrl += '&hd=' + encodeURIComponent(Accounts._options.restrictCreationByEmailDomain);
   }
 
   Oauth.initiateLogin(credentialToken,

From c396f990b434f31df9d0a74dfee870fe27c24e16 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Tue, 1 Oct 2013 17:29:26 -0700
Subject: [PATCH 152/335] Doc string saying you can pass a predicate to
 restrict creation of new users by email.

---
 docs/client/api.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/client/api.js b/docs/client/api.js
index 3b8360aacd..ea23fe290e 100644
--- a/docs/client/api.js
+++ b/docs/client/api.js
@@ -1109,8 +1109,8 @@ Template.api.accounts_config = {
     },
     {
       name: "restrictCreationByEmailDomain",
-      type: "String",
-      descr: "If set, only allow new users with an email in the specified domain. Works with password-based sign-in and external services that expose email addresses (Google, Facebook, GitHub). All existing users still can log in after enabling this option. Example: `Accounts.config({ restrictCreationByEmailDomain: 'school.edu' })`."
+      type: "String Or Function",
+      descr: "If set, only allow new users with an email in the specified domain or if the predicate function returns true. Works with password-based sign-in and external services that expose email addresses (Google, Facebook, GitHub). All existing users still can log in after enabling this option. Example: `Accounts.config({ restrictCreationByEmailDomain: 'school.edu' })`."
     }
   ]
 };

From 009bd2dce2b0fc25a27a911e81387bc1d501ce72 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Tue, 1 Oct 2013 18:13:55 -0700
Subject: [PATCH 153/335] Add "patches contributed" to History.md.

---
 History.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/History.md b/History.md
index 60753e0217..7bfac81582 100644
--- a/History.md
+++ b/History.md
@@ -105,6 +105,10 @@ MISC
   * XXX: we should try to do more upgrades in this release if possible (in
     conjunction with the Node upgrade)
 
+Patches contributed by GitHub users ansman, awwx, codeinthehole, Maxhodges,
+meawoppl, mitar, mizzao, mquandalle, nathan-muir, RobertLowe, ryw, and
+timhaines.
+
 
 ## v0.6.5.1
 

From dd842072b18e8b41dd981968d47f911adb00180c Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Tue, 1 Oct 2013 18:26:13 -0700
Subject: [PATCH 154/335] Add .mailmap file to help with updating History.md.

---
 .mailmap | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..e710a78b4d
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,33 @@
+# This makes it easier to find GitHub usernames for History.md.
+#
+# This controls 'git shortlog'. eg, run:
+#   git shortlog -s release/0.6.5.1..HEAD
+# to get a sorted list of all committers to revisions in HEAD but not
+# in 0.6.5.1.
+#
+# For any emails that show up in the shortlog that aren't in one of
+# these lists, figure out their GitHub username and add them.
+
+GITHUB: ansman <nicklas@ansman.se>
+GITHUB: awwx <andrew.wilcox@gmail.com>
+GITHUB: codeinthehole <david.winterbottom@gmail.com>
+GITHUB: Maxhodges <Max@whiterabbitpress.com>
+GITHUB: meawoppl <meawoppl@gmail.com>
+GITHUB: mitar <mitar.git@tnode.com>
+GITHUB: mizzao <mizzao@gmail.com>
+GITHUB: mquandalle <maxime.quandalle@gmail.com>
+GITHUB: nathan-muir <ndmuir@gmail.com>
+GITHUB: RobertLowe <robert@iblargz.com>
+GITHUB: ryw <ry@rywalker.com>
+GITHUB: timhaines <tmhaines@gmail.com>
+
+METEOR: avital <avital@thewe.net>
+METEOR: debergalis <matt@meteor.com>
+METEOR: dgreensp <dgreenspan@alum.mit.edu>
+METEOR: estark37 <emily@meteor.com>
+METEOR: estark37 <estark37@gmail.com>
+METEOR: glasser <glasser@meteor.com>
+METEOR: gschmidt <geoff@geoffschmidt.com>
+METEOR: n1mmy <nim@meteor.com>
+METEOR: sixolet <naomi@meteor.com>
+METEOR: Slava <slava@meteor.com>

From cfd5861c8d429e081a866b39432e5d2034fc0610 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Tue, 1 Oct 2013 18:22:43 -0700
Subject: [PATCH 155/335] Make update() the canonical form for upserts on the
 wire.

update(..., { upsert: true }) returns the number of affected docs, and
update(..., { upsert: true, _returnObject: true }) returns the whole object that
is used by upsert(). Also includes a rename of returnObject -> _returnObject.
---
 packages/minimongo/minimongo.js         |  4 ++--
 packages/mongo-livedata/collection.js   | 27 +++++++++++++++----------
 packages/mongo-livedata/mongo_driver.js | 10 ++++-----
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index 30de169eb2..1f3443ea71 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -602,7 +602,7 @@ LocalCollection.prototype.update = function (selector, mod, options, callback) {
   }
 
   var result;
-  if (options.returnObject) {
+  if (options._returnObject) {
     result = {
       numberAffected: updateCount
     };
@@ -627,7 +627,7 @@ LocalCollection.prototype.upsert = function (selector, mod, options, callback) {
   }
   return self.update(selector, mod, _.extend({}, options, {
     upsert: true,
-    returnObject: true
+    _returnObject: true
   }, callback));
 };
 
diff --git a/packages/mongo-livedata/collection.js b/packages/mongo-livedata/collection.js
index 9cd047dcb3..d60a77a273 100644
--- a/packages/mongo-livedata/collection.js
+++ b/packages/mongo-livedata/collection.js
@@ -342,17 +342,13 @@ var throwIfSelectorIsNotId = function (selector, methodName) {
 // generating their result until the database has acknowledged
 // them. In the future maybe we should provide a flag to turn this
 // off.
-_.each(["insert", "update", "remove", "upsert"], function (name) {
+_.each(["insert", "update", "remove"], function (name) {
   Meteor.Collection.prototype[name] = function (/* arguments */) {
     var self = this;
     var args = _.toArray(arguments);
     var callback;
     var ret;
 
-    var isUpdateOrUpsert = (name === "update" || name === "upsert");
-    var isUpsert = (name === "update" && options && options.upsert) ||
-          (name === "upsert");
-
     if (args.length && args[args.length - 1] instanceof Function)
       callback = args.pop();
 
@@ -372,10 +368,10 @@ _.each(["insert", "update", "remove", "upsert"], function (name) {
     } else {
       args[0] = Meteor.Collection._rewriteSelector(args[0]);
 
-      if (isUpdateOrUpsert) {
+      if (name === "update") {
         // Mutate args but copy the original options object.
         var options = args[2] = _.clone(args[2]) || {};
-        if (isUpsert) {
+        if (options && typeof options !== "function" && options.upsert) {
           // set `insertedId` if absent.  `insertedId` is a Meteor extension.
           if (options.insertedId) {
             if (!(typeof options.insertedId === 'string'
@@ -461,6 +457,18 @@ _.each(["insert", "update", "remove", "upsert"], function (name) {
   };
 });
 
+Meteor.Collection.prototype.upsert = function (selector, modifier,
+                                               options, callback) {
+  var self = this;
+  if (! callback && typeof options === "function") {
+    callback = options;
+    options = {};
+  }
+  return self.update(selector, modifier,
+              _.extend({}, options, { _returnObject: true, upsert: true }),
+              callback);
+};
+
 // We'll actually design an index API later. For now, we just pass through to
 // Mongo's, but make it synchronous.
 Meteor.Collection.prototype._ensureIndex = function (index, options) {
@@ -596,7 +604,7 @@ Meteor.Collection.prototype._defineMutationMethods = function() {
   if (self._connection) {
     var m = {};
 
-    _.each(['insert', 'update', 'remove', 'upsert'], function (method) {
+    _.each(['insert', 'update', 'remove'], function (method) {
       m[self._prefix + method] = function (/* ... */) {
         // All the methods do their own validation, instead of using check().
         check(arguments, [Match.Any]);
@@ -611,9 +619,6 @@ Meteor.Collection.prototype._defineMutationMethods = function() {
 
           // This is the server receiving a method call from the client.
 
-          if (method === 'upsert' && ! self._isInsecure())
-            throw new Meteor.Error(403, "Not permitted.  Untrusted code may not upsert (not supported by allow/deny).  Upsert from a method instead.");
-
           // We don't allow arbitrary selectors in mutations from the client: only
           // single-ID selectors.
           if (method !== 'insert')
diff --git a/packages/mongo-livedata/mongo_driver.js b/packages/mongo-livedata/mongo_driver.js
index c7acecb048..45ca3747da 100644
--- a/packages/mongo-livedata/mongo_driver.js
+++ b/packages/mongo-livedata/mongo_driver.js
@@ -351,7 +351,7 @@ MongoConnection.prototype._update = function (collection_name, selector, mod,
                                      // object. Otherwise, we should just return
                                      // the number of affected docs to match the
                                      // mongo API.
-                                     if (result && ! options.returnObject)
+                                     if (result && ! options._returnObject)
                                        callback(err, result.numberAffected);
                                      else
                                        callback(err, result);
@@ -364,7 +364,7 @@ MongoConnection.prototype._update = function (collection_name, selector, mod,
                                 knownId) {
                               result.insertedId = knownId;
                             }
-                            if (result && ! options.returnObject)
+                            if (result && ! options._returnObject)
                               result = result.numberAffected;
                           }
                           callback(err, result);
@@ -396,7 +396,7 @@ var simulateUpsertWithInsertedId = function (collection, selector, mod,
                                              isModify, options, callback) {
   var insertedId = options.insertedId; // must exist
 
-  var mongoOptsForUpdate = _.extend({}, options, { returnObject: true });
+  var mongoOptsForUpdate = _.extend({}, options, { _returnObject: true });
   delete mongoOptsForUpdate.insertedId;
   delete mongoOptsForUpdate.upsert;
 
@@ -452,7 +452,7 @@ var simulateUpsertWithInsertedId = function (collection, selector, mod,
     newDoc = mod;
   }
 
-  var mongoOptsForInsert = _.extend({}, options, { returnObject: true });
+  var mongoOptsForInsert = _.extend({}, options, { _returnObject: true });
   delete mongoOptsForUpdate.insertedId;
   mongoOptsForInsert.upsert = true;
   delete mongoOptsForInsert.multi;
@@ -501,7 +501,7 @@ MongoConnection.prototype.upsert = function (collectionName, selector, mod,
   return self.update(collectionName, selector, mod,
                      _.extend({}, options, {
                        upsert: true,
-                       returnObject: true
+                       _returnObject: true
                      }, callback));
 };
 

From 6ae90f4d6730b998dfc3c36dcb8449d98e245a84 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Tue, 1 Oct 2013 19:02:05 -0700
Subject: [PATCH 156/335] Rename onInsert to isInsert

---
 packages/minimongo/modify.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/minimongo/modify.js b/packages/minimongo/modify.js
index dc9fda5964..22e055f126 100644
--- a/packages/minimongo/modify.js
+++ b/packages/minimongo/modify.js
@@ -5,7 +5,7 @@
 //
 // XXX atomicity: if one modification fails, do we roll back the whole
 // change?
-LocalCollection._modify = function (doc, mod, onInsert) {
+LocalCollection._modify = function (doc, mod, isInsert) {
   var is_modifier = false;
   for (var k in mod) {
     // IE7 doesn't support indexing into strings (eg, k[0]), so use substr.
@@ -35,7 +35,7 @@ LocalCollection._modify = function (doc, mod, onInsert) {
 
     for (var op in mod) {
       var mod_func = LocalCollection._modifiers[op];
-      if (onInsert && op === '$setOnInsert')
+      if (isInsert && op === '$setOnInsert')
         mod_func = LocalCollection._modifiers['$set'];
       if (!mod_func)
         throw Error("Invalid modifier specified " + op);
@@ -63,10 +63,10 @@ LocalCollection._modify = function (doc, mod, onInsert) {
     // work right in Opera. Deleting from a doc while iterating over it
     // would sometimes cause opera to skip some keys.
 
-    // onInsert: if we're constructing a document to insert (via upsert)
+    // isInsert: if we're constructing a document to insert (via upsert)
     // and we're in replacement mode, not modify mode, DON'T take the
     // _id from the query.  This matches mongo's behavior.
-    if (k !== '_id' || onInsert)
+    if (k !== '_id' || isInsert)
       delete doc[k];
   });
   for (var k in new_doc) {

From f9fda934ec9ff633ec535ae412429c6e76729d61 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Tue, 1 Oct 2013 22:16:32 -0700
Subject: [PATCH 157/335] Add some comments to minimongo upsert code

---
 packages/minimongo/minimongo.js | 9 +++++++++
 packages/minimongo/modify.js    | 5 +++++
 2 files changed, 14 insertions(+)

diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index 1f3443ea71..2fae504cea 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -591,6 +591,9 @@ LocalCollection.prototype.update = function (selector, mod, options, callback) {
   });
   self._observeQueue.drain();
 
+  // If we are doing an upsert, and we didn't modify any documents yet, then
+  // it's time to do an insert. Figure out what document we are inserting, and
+  // generate an id for it.
   var insertedId;
   if (updateCount === 0 && options.upsert) {
     var newDoc = _.clone(selector);
@@ -601,6 +604,9 @@ LocalCollection.prototype.update = function (selector, mod, options, callback) {
     updateCount = 1;
   }
 
+  // Return the number of affected documents, or in the upsert case, an object
+  // containing the number of affected docs and the id of the doc that was
+  // inserted, if any.
   var result;
   if (options._returnObject) {
     result = {
@@ -619,6 +625,9 @@ LocalCollection.prototype.update = function (selector, mod, options, callback) {
   return result;
 };
 
+// A convenience wrapper on update. LocalCollection.upsert(sel, mod) is
+// equivalent to LocalCollection.update(sel, mod, { upsert: true, _returnObject:
+// true }).
 LocalCollection.prototype.upsert = function (selector, mod, options, callback) {
   var self = this;
   if (! callback && typeof options === "function") {
diff --git a/packages/minimongo/modify.js b/packages/minimongo/modify.js
index 22e055f126..295b9c8d6b 100644
--- a/packages/minimongo/modify.js
+++ b/packages/minimongo/modify.js
@@ -5,6 +5,10 @@
 //
 // XXX atomicity: if one modification fails, do we roll back the whole
 // change?
+//
+// isInsert is set when _modify is being called to compute the document to
+// insert as part of an upsert operation. We use this primarily to figure out
+// when to set the fields in $setOnInsert, if present.
 LocalCollection._modify = function (doc, mod, isInsert) {
   var is_modifier = false;
   for (var k in mod) {
@@ -35,6 +39,7 @@ LocalCollection._modify = function (doc, mod, isInsert) {
 
     for (var op in mod) {
       var mod_func = LocalCollection._modifiers[op];
+      // Treat $setOnInsert as $set if this is an insert.
       if (isInsert && op === '$setOnInsert')
         mod_func = LocalCollection._modifiers['$set'];
       if (!mod_func)

From 47b6af30a5b773b8ac6d082356adad53a319382f Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Wed, 2 Oct 2013 10:31:30 -0700
Subject: [PATCH 158/335] Factor out the bindEnvironment part of writeCallback.

Get rid of numberAffectedCallback; instead, choose the right return value at
every place where we were using numberAffectedCallback and then pass through
bindEnvironmentForWrite. This cleans up a couple places where we were going
through numberAffectedCallback to wrap a result in an object, and then sometimes
getting the numberAffected out of that object and just returning that. Also
ensures that all callbacks for write get passed through Meteor.bindEnvironment
with the same onException function.
---
 packages/mongo-livedata/mongo_driver.js | 74 +++++++++++++------------
 1 file changed, 40 insertions(+), 34 deletions(-)

diff --git a/packages/mongo-livedata/mongo_driver.js b/packages/mongo-livedata/mongo_driver.js
index 45ca3747da..7ee8fc4477 100644
--- a/packages/mongo-livedata/mongo_driver.js
+++ b/packages/mongo-livedata/mongo_driver.js
@@ -196,7 +196,7 @@ MongoConnection.prototype._maybeBeginWrite = function () {
 // observer "has been notified" if its callback has returned.
 
 var writeCallback = function (write, refresh, callback) {
-  return Meteor.bindEnvironment(function (err, result) {
+  return function (err, result) {
     if (! err) {
       // XXX We don't have to run this on error, right?
       refresh();
@@ -206,7 +206,11 @@ var writeCallback = function (write, refresh, callback) {
       callback(err, result);
     else if (err)
       throw err;
-  }, function (err) {
+  };
+};
+
+var bindEnvironmentForWrite = function (callback) {
+  return Meteor.bindEnvironment(callback, function (err) {
     Meteor._debug("Error in Mongo write:", err.stack);
   });
 };
@@ -227,7 +231,7 @@ MongoConnection.prototype._insert = function (collection_name, document,
   var refresh = function () {
     Meteor.refresh({ collection: collection_name, id: document._id });
   };
-  callback = writeCallback(write, refresh, callback);
+  callback = bindEnvironmentForWrite(writeCallback(write, refresh, callback));
   try {
     var collection = self._getCollection(collection_name);
     collection.insert(replaceTypes(document, replaceMeteorAtomWithMongo),
@@ -257,16 +261,6 @@ MongoConnection.prototype._refresh = function (collectionName, selector) {
   }
 };
 
-var numberAffectedCallback = function (callback) {
-  return Meteor.bindEnvironment(function (err, numberAffected, extraInfo) {
-    callback && callback(err, ! err && {
-      numberAffected: numberAffected
-    }, extraInfo);
-  }, function (err) {
-    Meteor._debug("Error in Mongo write:", err.stack);
-  });
-};
-
 MongoConnection.prototype._remove = function (collection_name, selector,
                                               callback) {
   var self = this;
@@ -284,7 +278,7 @@ MongoConnection.prototype._remove = function (collection_name, selector,
   var refresh = function () {
     self._refresh(collection_name, selector);
   };
-  callback = writeCallback(write, refresh, callback);
+  callback = bindEnvironmentForWrite(writeCallback(write, refresh, callback));
 
   try {
     var collection = self._getCollection(collection_name);
@@ -328,7 +322,7 @@ MongoConnection.prototype._update = function (collection_name, selector, mod,
   var refresh = function () {
     self._refresh(collection_name, selector);
   };
-  callback = writeCallback(write, refresh, callback);
+  callback = bindEnvironmentForWrite(writeCallback(write, refresh, callback));
   try {
     var collection = self._getCollection(collection_name);
     var mongoOpts = {safe: true};
@@ -345,9 +339,16 @@ MongoConnection.prototype._update = function (collection_name, selector, mod,
     if (options.upsert && (! knownId) && options.insertedId) {
       mongoOpts.insertedId = options.insertedId;
       simulateUpsertWithInsertedId(collection, mongoSelector, mongoMod,
-                                   isModify, mongoOpts, function (err, result) {
+                                   isModify, mongoOpts,
+                                   // This callback does not need to be
+                                   // bindEnvironment'ed because
+                                   // simulateUpsertWithInsertedId() wraps it
+                                   // and then passes it through
+                                   // bindEnvironmentForWrite.
+                                   function (err, result) {
                                      // If we got here via a upsert() call, then
-                                     // we should return the whole
+                                     // options._returnObject will be set and we
+                                     // should return the whole
                                      // object. Otherwise, we should just return
                                      // the number of affected docs to match the
                                      // mongo API.
@@ -358,14 +359,17 @@ MongoConnection.prototype._update = function (collection_name, selector, mod,
                                    });
     } else {
       collection.update(mongoSelector, mongoMod, mongoOpts,
-                        numberAffectedCallback(function (err, result, extra) {
+                        bindEnvironmentForWrite(function (err, result, extra) {
                           if (! err) {
-                            if (options.upsert && (! extra.updatedExisting) &&
-                                knownId) {
-                              result.insertedId = knownId;
+                            if (result && options._returnObject) {
+                              result = { numberAffected: result };
+                              // If this was an upsert() call, and we ended up
+                              // inserting a new doc and we know its id, then
+                              // return that id as well.
+                              if (options.upsert && knownId &&
+                                  ! extra.updatedExisting)
+                                result.insertedId = knownId;
                             }
-                            if (result && ! options._returnObject)
-                              result = result.numberAffected;
                           }
                           callback(err, result);
                         }));
@@ -396,7 +400,7 @@ var simulateUpsertWithInsertedId = function (collection, selector, mod,
                                              isModify, options, callback) {
   var insertedId = options.insertedId; // must exist
 
-  var mongoOptsForUpdate = _.extend({}, options, { _returnObject: true });
+  var mongoOptsForUpdate = _.extend({}, options);
   delete mongoOptsForUpdate.insertedId;
   delete mongoOptsForUpdate.upsert;
 
@@ -422,14 +426,15 @@ var simulateUpsertWithInsertedId = function (collection, selector, mod,
       callback(new Error("Upsert failed after " + NUM_OPTIMISTIC_TRIES + " tries."));
     } else {
       collection.update(selector, mod, mongoOptsForUpdate,
-                        numberAffectedCallback(function (err, result) {
-                          if (err) {
+                        bindEnvironmentForWrite(function (err, result) {
+                          if (err)
                             callback(err);
-                          } else if (result.numberAffected) {
-                            callback(null, result);
-                          } else {
+                          else if (result)
+                            callback(null, {
+                              numberAffected: result
+                            });
+                          else
                             doConditionalInsert();
-                          }
                         }));
     }
   };
@@ -452,7 +457,7 @@ var simulateUpsertWithInsertedId = function (collection, selector, mod,
     newDoc = mod;
   }
 
-  var mongoOptsForInsert = _.extend({}, options, { _returnObject: true });
+  var mongoOptsForInsert = _.extend({}, options);
   delete mongoOptsForUpdate.insertedId;
   mongoOptsForInsert.upsert = true;
   delete mongoOptsForInsert.multi;
@@ -462,7 +467,7 @@ var simulateUpsertWithInsertedId = function (collection, selector, mod,
       replaceTypes({_id: insertedId}, replaceMeteorAtomWithMongo),
       newDoc);
     collection.update(selector, replacementWithId, mongoOptsForInsert,
-                      numberAffectedCallback(function (err, result) {
+                      bindEnvironmentForWrite(function (err, result) {
                         if (err) {
                           // figure out if this is a
                           // "cannot change _id of document" error, and
@@ -473,9 +478,10 @@ var simulateUpsertWithInsertedId = function (collection, selector, mod,
                             callback(err);
                           }
                         } else {
-                          callback(null, _.extend(result, {
+                          callback(null, {
+                            numberAffected: result,
                             insertedId: insertedId
-                          }));
+                          });
                         }
                       }));
   };

From 44d399456ea5ee326deefc1cd6b0a32efd5ebd0a Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Wed, 2 Oct 2013 10:51:14 -0700
Subject: [PATCH 159/335] Clean up some comments and names for upsert.

---
 packages/mongo-livedata/allow_tests.js        |  2 +-
 packages/mongo-livedata/collection.js         | 32 +++++++++++--------
 .../remote_collection_driver.js               |  4 +--
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/packages/mongo-livedata/allow_tests.js b/packages/mongo-livedata/allow_tests.js
index 3a085c2ece..bc1bd941f3 100644
--- a/packages/mongo-livedata/allow_tests.js
+++ b/packages/mongo-livedata/allow_tests.js
@@ -439,7 +439,7 @@ if (Meteor.isClient) {
             { upsert: true },
             expect(function (err, res) {
               test.equal(err.error, 403);
-              test.matches(err.reason, /In a restricted/);
+              test.matches(err.reason, /in a restricted/);
               test.equal(collection.find({ upserted: true }).count(), 0);
             }));
         },
diff --git a/packages/mongo-livedata/collection.js b/packages/mongo-livedata/collection.js
index d60a77a273..80694a532c 100644
--- a/packages/mongo-livedata/collection.js
+++ b/packages/mongo-livedata/collection.js
@@ -347,6 +347,7 @@ _.each(["insert", "update", "remove"], function (name) {
     var self = this;
     var args = _.toArray(arguments);
     var callback;
+    var insertId;
     var ret;
 
     if (args.length && args[args.length - 1] instanceof Function)
@@ -358,18 +359,21 @@ _.each(["insert", "update", "remove"], function (name) {
       // shallow-copy the document and generate an ID
       args[0] = _.extend({}, args[0]);
       if ('_id' in args[0]) {
-        ret = args[0]._id;
-        if (!ret || !(typeof ret === 'string'
-              || ret instanceof Meteor.Collection.ObjectID))
+        insertId = args[0]._id;
+        if (!insertId || !(typeof insertId === 'string'
+              || insertId instanceof Meteor.Collection.ObjectID))
           throw new Error("Meteor requires document _id fields to be non-empty strings or ObjectIDs");
       } else {
-        ret = args[0]._id = self._makeNewID();
+        insertId = args[0]._id = self._makeNewID();
       }
     } else {
       args[0] = Meteor.Collection._rewriteSelector(args[0]);
 
       if (name === "update") {
-        // Mutate args but copy the original options object.
+        // Mutate args but copy the original options object. We need to add
+        // insertedId to options, but don't want to mutate the caller's options
+        // object. We need to mutate `args` because we pass `args` into the
+        // driver below.
         var options = args[2] = _.clone(args[2]) || {};
         if (options && typeof options !== "function" && options.upsert) {
           // set `insertedId` if absent.  `insertedId` is a Meteor extension.
@@ -386,9 +390,9 @@ _.each(["insert", "update", "remove"], function (name) {
 
     // On inserts, always return the id that we generated; on all other
     // operations, just return the result from the collection.
-    var transformResultFromCollection = function (result) {
+    var chooseReturnValueFromCollectionResult = function (result) {
       if (name === "insert")
-        return ret;
+        return insertId;
       else
         return result;
     };
@@ -396,7 +400,7 @@ _.each(["insert", "update", "remove"], function (name) {
     var wrappedCallback;
     if (callback) {
       wrappedCallback = function (error, result) {
-        callback(error, ! error && transformResultFromCollection(result));
+        callback(error, ! error && chooseReturnValueFromCollectionResult(result));
       };
     }
 
@@ -429,7 +433,7 @@ _.each(["insert", "update", "remove"], function (name) {
         throwIfSelectorIsNotId(args[0], name);
       }
 
-      ret = transformResultFromCollection(
+      ret = chooseReturnValueFromCollectionResult(
         self._connection.apply(self._prefix + name, args, wrappedCallback)
       );
 
@@ -438,9 +442,11 @@ _.each(["insert", "update", "remove"], function (name) {
       // and propagate any exception.
       args.push(wrappedCallback);
       try {
-        // If the user provided a callback, then we expect queryRet to be undefined.
+        // If the user provided a callback and the collection implements this
+        // operation asynchronously, then queryRet will be undefined, and the
+        // result will be returned through the callback instead.
         var queryRet = self._collection[name].apply(self._collection, args);
-        ret = transformResultFromCollection(queryRet);
+        ret = chooseReturnValueFromCollectionResult(queryRet);
       } catch (e) {
         if (callback) {
           callback(e);
@@ -731,8 +737,8 @@ Meteor.Collection.prototype._validatedUpdate = function(
     throw new Error("validated update should be of a single ID");
 
   if (options.upsert)
-    throw new Meteor.Error(403, "Access denied. In a restricted collection " +
-                           "you cannot do upserts.");
+    throw new Meteor.Error(403, "Access denied. Upserts not " +
+                           "allowed in a restricted collection.");
 
   // compute modified fields
   var fields = [];
diff --git a/packages/mongo-livedata/remote_collection_driver.js b/packages/mongo-livedata/remote_collection_driver.js
index b32f82b0d3..41502c17eb 100644
--- a/packages/mongo-livedata/remote_collection_driver.js
+++ b/packages/mongo-livedata/remote_collection_driver.js
@@ -8,8 +8,8 @@ _.extend(MongoInternals.RemoteCollectionDriver.prototype, {
     var self = this;
     var ret = {};
     _.each(
-      ['find', 'findOne', 'insert', 'update', 'remove', '_ensureIndex',
-       '_dropIndex', '_createCappedCollection', 'upsert'],
+      ['find', 'findOne', 'insert', 'update', , 'upsert',
+       'remove', '_ensureIndex', '_dropIndex', '_createCappedCollection'],
       function (m) {
         ret[m] = _.bind(self.mongo[m], self.mongo, name);
       });

From b29a31746fb56414d0c12e0163e7056b36b0d76c Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Wed, 2 Oct 2013 10:55:12 -0700
Subject: [PATCH 160/335] Rearrange simulateUpsertWithInsertedId() for
 readability

---
 packages/mongo-livedata/mongo_driver.js | 53 ++++++++++++-------------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/packages/mongo-livedata/mongo_driver.js b/packages/mongo-livedata/mongo_driver.js
index 7ee8fc4477..95e92ce5e0 100644
--- a/packages/mongo-livedata/mongo_driver.js
+++ b/packages/mongo-livedata/mongo_driver.js
@@ -398,14 +398,6 @@ MongoConnection._isCannotChangeIdError = function (err) {
 
 var simulateUpsertWithInsertedId = function (collection, selector, mod,
                                              isModify, options, callback) {
-  var insertedId = options.insertedId; // must exist
-
-  var mongoOptsForUpdate = _.extend({}, options);
-  delete mongoOptsForUpdate.insertedId;
-  delete mongoOptsForUpdate.upsert;
-
-  var tries = NUM_OPTIMISTIC_TRIES;
-
   // STRATEGY:  First try doing a plain update.  If it affected 0 documents,
   // then without affecting the database, we know we should probably do an
   // insert.  We then do a *conditional* insert that will fail in the case
@@ -420,25 +412,6 @@ var simulateUpsertWithInsertedId = function (collection, selector, mod,
   // disagreeing on the existence of an object will cause writes to fail
   // in theory).
 
-  var doUpdate = function () {
-    tries--;
-    if (! tries) {
-      callback(new Error("Upsert failed after " + NUM_OPTIMISTIC_TRIES + " tries."));
-    } else {
-      collection.update(selector, mod, mongoOptsForUpdate,
-                        bindEnvironmentForWrite(function (err, result) {
-                          if (err)
-                            callback(err);
-                          else if (result)
-                            callback(null, {
-                              numberAffected: result
-                            });
-                          else
-                            doConditionalInsert();
-                        }));
-    }
-  };
-
   var newDoc;
   // Run this code up front so that it fails fast if someone uses
   // a Mongo update operator we don't support.
@@ -457,11 +430,37 @@ var simulateUpsertWithInsertedId = function (collection, selector, mod,
     newDoc = mod;
   }
 
+  var insertedId = options.insertedId; // must exist
+  var mongoOptsForUpdate = _.extend({}, options);
+  delete mongoOptsForUpdate.insertedId;
+  delete mongoOptsForUpdate.upsert;
+
   var mongoOptsForInsert = _.extend({}, options);
   delete mongoOptsForUpdate.insertedId;
   mongoOptsForInsert.upsert = true;
   delete mongoOptsForInsert.multi;
 
+  var tries = NUM_OPTIMISTIC_TRIES;
+
+  var doUpdate = function () {
+    tries--;
+    if (! tries) {
+      callback(new Error("Upsert failed after " + NUM_OPTIMISTIC_TRIES + " tries."));
+    } else {
+      collection.update(selector, mod, mongoOptsForUpdate,
+                        bindEnvironmentForWrite(function (err, result) {
+                          if (err)
+                            callback(err);
+                          else if (result)
+                            callback(null, {
+                              numberAffected: result
+                            });
+                          else
+                            doConditionalInsert();
+                        }));
+    }
+  };
+
   var doConditionalInsert = function () {
     var replacementWithId = _.extend(
       replaceTypes({_id: insertedId}, replaceMeteorAtomWithMongo),

From d0af2d8c918f203a0c5d332e5c5280f7cb74873c Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Wed, 2 Oct 2013 11:07:41 -0700
Subject: [PATCH 161/335] Add comment about lack of allow/deny rules for
 upserts

---
 packages/mongo-livedata/collection.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/mongo-livedata/collection.js b/packages/mongo-livedata/collection.js
index 80694a532c..3ce91b36c8 100644
--- a/packages/mongo-livedata/collection.js
+++ b/packages/mongo-livedata/collection.js
@@ -736,6 +736,8 @@ Meteor.Collection.prototype._validatedUpdate = function(
   if (!LocalCollection._selectorIsIdPerhapsAsObject(selector))
     throw new Error("validated update should be of a single ID");
 
+  // We don't support upserts because they don't fit nicely into allow/deny
+  // rules.
   if (options.upsert)
     throw new Meteor.Error(403, "Access denied. Upserts not " +
                            "allowed in a restricted collection.");

From e8c8252b2a34d0167110d4d898dc25c17ea8b864 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Wed, 2 Oct 2013 11:15:00 -0700
Subject: [PATCH 162/335] Remove unnecessary bindEnvironmentForWrite

---
 packages/mongo-livedata/mongo_driver.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/mongo-livedata/mongo_driver.js b/packages/mongo-livedata/mongo_driver.js
index 95e92ce5e0..1e5d3f3e93 100644
--- a/packages/mongo-livedata/mongo_driver.js
+++ b/packages/mongo-livedata/mongo_driver.js
@@ -322,7 +322,7 @@ MongoConnection.prototype._update = function (collection_name, selector, mod,
   var refresh = function () {
     self._refresh(collection_name, selector);
   };
-  callback = bindEnvironmentForWrite(writeCallback(write, refresh, callback));
+  callback = writeCallback(write, refresh, callback);
   try {
     var collection = self._getCollection(collection_name);
     var mongoOpts = {safe: true};

From 5c08d1c70e0d5588578ddaf8dbed850c4b1aa5b8 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Fri, 20 Sep 2013 12:28:51 -0700
Subject: [PATCH 163/335] Rename and remove some token deletion config flags.

---
 packages/accounts-base/accounts_common.js | 53 +++++++++++++----------
 packages/accounts-base/accounts_server.js | 31 ++++++-------
 2 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/packages/accounts-base/accounts_common.js b/packages/accounts-base/accounts_common.js
index 208a03f85d..ab8c53f7c3 100644
--- a/packages/accounts-base/accounts_common.js
+++ b/packages/accounts-base/accounts_common.js
@@ -4,6 +4,18 @@ Accounts = {};
 // and accounts-ui-unstyled.
 Accounts._options = {};
 
+// how long (in days) until a login token expires
+var DEFAULT_LOGIN_EXPIRATION_DAYS = 90;
+// Clients don't try to auto-login with a token that is going to expire within
+// .1 * DEFAULT_LOGIN_EXPIRATION_DAYS, capped at MIN_TOKEN_LIFETIME_CAP_SECS.
+// Tries to avoid abrupt disconnects from expiring tokens.
+var MIN_TOKEN_LIFETIME_CAP_SECS = 3600; // one hour
+// how often (in milliseconds) we check for expired tokens
+EXPIRE_TOKENS_INTERVAL_MS = 600 * 1000; // 10 minutes
+// how long we wait before logging out clients when Meteor.logoutOtherClients is
+// called
+DEFAULT_CONNECTION_CLOSE_DELAY_SECS = 10;
+
 // Set up config for the accounts system. Call this on both the client
 // and the server.
 //
@@ -19,13 +31,9 @@ Accounts._options = {};
 //     client signups.
 // - forbidClientAccountCreation {Boolean}
 //     Do not allow clients to create accounts directly.
-// - _tokenLifetimeSecs {Number}
-//     Seconds until a login token expires.
-// - _tokenExpirationIntervalSecs {Number}
-//     How often (in seconds) to check for expired tokens
-// - _minTokenLifetimeSecs {Number}
-//     The minimum number of seconds until a token expires in order for the
-//     client to be willing to connect with that token.
+// - loginExpirationInDays {Number}
+//     Number of days since login until a user is logged out (login token
+//     expires).
 // - _connectionCloseDelaySecs {Number}
 //     The number of seconds to wait before closing connections that when a user
 //     is logged out by the server. Defaults to 10, to allow clients to store a
@@ -34,8 +42,7 @@ Accounts._options = {};
 Accounts.config = function(options) {
   // validate option keys
   var VALID_KEYS = ["sendVerificationEmail", "forbidClientAccountCreation",
-                    "restrictCreationByEmailDomain", "_tokenLifetimeSecs",
-                    "_tokenExpirationIntervalSecs", "_minTokenLifetimeSecs",
+                    "restrictCreationByEmailDomain", "loginExpirationInDays",
                     "_connectionCloseDelaySecs"];
   _.each(_.keys(options), function (key) {
     if (!_.contains(VALID_KEYS, key)) {
@@ -50,11 +57,14 @@ Accounts.config = function(options) {
         throw new Error("Can't set `" + key + "` more than once");
       } else {
         Accounts._options[key] = options[key];
-        if (key === "_tokenExpirationInterval" && Meteor.isServer)
-          initExpireTokenInterval();
       }
     }
   });
+
+  // If the user set loginExpirationInDays to null, then we need to clear the
+  // timer that periodically expires tokens.
+  if (Meteor.isServer)
+    maybeStopExpireTokensInterval();
 };
 
 // Users table. Don't use the normal autopublish, since we want to hide
@@ -82,20 +92,19 @@ Accounts.LoginCancelledError.numericError = 0x8acdc2f;
 Accounts.LoginCancelledError.prototype = new Error();
 Accounts.LoginCancelledError.prototype.name = 'Accounts.LoginCancelledError';
 
-// how long (in seconds) until a login token expires
-DEFAULT_TOKEN_LIFETIME_SECS = 604800; // one week
-// We don't try to auto-login with a token that is going to expire within
-// MIN_TOKEN_LIFETIME seconds, to avoid abrupt disconnects from expiring tokens.
-var DEFAULT_MIN_TOKEN_LIFETIME_SECS = 3600; // one hour
+getTokenLifetimeMs = function () {
+  return (Accounts._options.loginExpirationInDays ||
+          DEFAULT_LOGIN_EXPIRATION_DAYS) * 24 * 60 * 60 * 1000;
+};
 
 Accounts._tokenExpiration = function (when) {
-  var tokenLifetimeSecs = Accounts._options._tokenLifetimeSecs ||
-        DEFAULT_TOKEN_LIFETIME_SECS;
-  return new Date(when.getTime() + tokenLifetimeSecs * 1000);
+  return new Date(when.getTime() + getTokenLifetimeMs());
 };
 
 Accounts._tokenExpiresSoon = function (when) {
-  var minLifetimeSecs = Accounts._options._minTokenLifetimeSecs ||
-        DEFAULT_MIN_TOKEN_LIFETIME_SECS;
-  return new Date() > (new Date(when) - minLifetimeSecs * 1000);
+  var minLifetimeMs = .1 * getTokenLifetimeMs();
+  var minLifetimeCapMs = MIN_TOKEN_LIFETIME_CAP_SECS * 1000;
+  if (minLifetimeMs > minLifetimeCapMs)
+    minLifetimeMs = minLifetimeCapMs
+  return new Date() > (new Date(when) - minLifetimeMs);
 };
diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index ba2237701a..a722b2548c 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -127,9 +127,6 @@ Meteor.methods({
 ///
 /// support reconnecting using a meteor login token
 
-// how often (in seconds) we check for expired tokens
-var DEFAULT_EXPIRE_TOKENS_INTERVAL_SECS = 600; // 10 minutes
-
 // Login handler for resume tokens.
 Accounts.registerLoginHandler(function(options) {
   if (!options.resume)
@@ -183,12 +180,13 @@ var removeLoginToken = function (userId, loginToken) {
 var expireTokenInterval;
 
 // Deletes expired tokens from the database and closes all open connections
-// associated with these tokens. Exported for tests.
+// associated with these tokens. Exported for tests. oldestValidDate is used
+// only by tests to simulate expiring tokens without waiting for them to
+// actually expire.
 var expireTokens = Accounts._expireTokens = function (oldestValidDate) {
-  var tokenLifetimeSecs = Accounts._options._tokenLifetimeSecs ||
-        DEFAULT_TOKEN_LIFETIME_SECS;
+  var tokenLifetimeMs = getTokenLifetimeMs();
   oldestValidDate = oldestValidDate ||
-    (new Date(new Date() - tokenLifetimeSecs * 1000));
+    (new Date(new Date() - tokenLifetimeMs));
 
   Meteor.users.update({
     "services.resume.loginTokens.when": { $lt: oldestValidDate }
@@ -203,16 +201,15 @@ var expireTokens = Accounts._expireTokens = function (oldestValidDate) {
   // expired tokens.
 };
 
-Meteor.users._ensureIndex("services.resume.loginTokens.when", { sparse: true });
-
-initExpireTokenInterval = function () {
-  if (expireTokenInterval)
+maybeStopExpireTokensInterval = function () {
+  if (_.has(Accounts._options, "loginExpirationInDays") &&
+      Accounts._options.loginExpirationInDays === null &&
+      expireTokenInterval)
     Meteor.clearInterval(expireTokenInterval);
-  var expirePeriodSecs = Accounts._options._tokenExpirationIntervalSecs ||
-        DEFAULT_EXPIRE_TOKENS_INTERVAL_SECS;
-  expireTokenInterval = Meteor.setInterval(expireTokens, expirePeriodSecs * 1000);
 };
-initExpireTokenInterval();
+
+expireTokenInterval = Meteor.setInterval(expireTokens,
+                                         EXPIRE_TOKENS_INTERVAL_MS);
 
 ///
 /// CREATE USER HOOKS
@@ -561,13 +558,13 @@ Meteor.users._ensureIndex('username', {unique: 1, sparse: 1});
 Meteor.users._ensureIndex('emails.address', {unique: 1, sparse: 1});
 Meteor.users._ensureIndex('services.resume.loginTokens.token',
                           {unique: 1, sparse: 1});
+// For expiring login tokens
+Meteor.users._ensureIndex("services.resume.loginTokens.when", { sparse: 1 });
 
 ///
 /// LOGGING OUT DELETED USERS
 ///
 
-var DEFAULT_CONNECTION_CLOSE_DELAY_SECS = 10;
-
 // By default, connections are closed with a 10 second delay, to give other
 // clients a chance to find a new token in localStorage before
 // reconnecting. Delay can be configured with Accounts.config.

From e69cb036d01712808975f8630a1a8bb7a6757e69 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Fri, 20 Sep 2013 12:37:46 -0700
Subject: [PATCH 164/335] Add fields to user/token deletion observe

---
 packages/accounts-base/accounts_server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index a722b2548c..3939b7e3c9 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -579,7 +579,7 @@ var closeTokensForUser = function (userTokens) {
   }, delaySecs * 1000);
 };
 
-Meteor.users.find().observe({
+Meteor.users.find({}, {"services.resume": 1}).observe({
   changed: function (newUser, oldUser) {
     var removedTokens = [];
     if (newUser.services && newUser.services.resume &&

From be8ac4387fa7ffea3a5f8d2047b10dffb80b0818 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Mon, 23 Sep 2013 10:04:41 -0700
Subject: [PATCH 165/335] Rename _logoutAllOthers to logoutOtherClients

---
 History.md                                   | 2 +-
 packages/accounts-base/accounts_client.js    | 4 ++--
 packages/accounts-base/accounts_common.js    | 2 +-
 packages/accounts-base/accounts_server.js    | 9 +++++----
 packages/accounts-password/password_tests.js | 4 ++--
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/History.md b/History.md
index 7bfac81582..61bd2f93b1 100644
--- a/History.md
+++ b/History.md
@@ -46,7 +46,7 @@ ACCOUNTS
   existing data can be converted by passing it through `new Date()`. #1228
 
 * Login token deletion: Expire login tokens periodically. Add
-  Meteor._logoutAllOthers() for logging out other connections logged in as the
+  Meteor.logoutOtherClients() for logging out other connections logged in as the
   current user. Log out and close connections for deleted users and tokens.
 
 * Support OAuth1 services that require request token secrets as well as
diff --git a/packages/accounts-base/accounts_client.js b/packages/accounts-base/accounts_client.js
index 9aef4bdc97..5a7f293468 100644
--- a/packages/accounts-base/accounts_client.js
+++ b/packages/accounts-base/accounts_client.js
@@ -188,7 +188,7 @@ Meteor.logout = function (callback) {
   });
 };
 
-Meteor._logoutAllOthers = function (callback) {
+Meteor.logoutOtherClients = function (callback) {
   // Our connection is going to be closed, but we don't want to call the
   // onReconnect handler until the result comes back for this method, because
   // the token will have been deleted on the server. Instead, wait until we get
@@ -198,7 +198,7 @@ Meteor._logoutAllOthers = function (callback) {
   var origOnReconnect = Meteor.connection.onReconnect;
   var userId = Meteor.userId();
   Meteor.connection.onReconnect = null;
-  Meteor.apply('_logoutAllOthers', [], { wait: true },
+  Meteor.apply('logoutOtherClients', [], { wait: true },
                function (error, result) {
                  Meteor.connection.onReconnect = origOnReconnect;
                  if (! error)
diff --git a/packages/accounts-base/accounts_common.js b/packages/accounts-base/accounts_common.js
index ab8c53f7c3..d0c7c766f5 100644
--- a/packages/accounts-base/accounts_common.js
+++ b/packages/accounts-base/accounts_common.js
@@ -37,7 +37,7 @@ DEFAULT_CONNECTION_CLOSE_DELAY_SECS = 10;
 // - _connectionCloseDelaySecs {Number}
 //     The number of seconds to wait before closing connections that when a user
 //     is logged out by the server. Defaults to 10, to allow clients to store a
-//     fresh token in localStorage when calling _logoutAllOthers.
+//     fresh token in localStorage when calling logoutOtherClients.
 //
 Accounts.config = function(options) {
   // validate option keys
diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index 3939b7e3c9..7627cac8d5 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -91,10 +91,11 @@ Meteor.methods({
     this.setUserId(null);
   },
 
-  // Nuke everything: delete all the current user's tokens and close all open
-  // connections logged in as this user. Returns a fresh new login token that
-  // this client can use.
-  _logoutAllOthers: function () {
+  // Delete all the current user's tokens and close all open connections logged
+  // in as this user. Returns a fresh new login token that this client can use.
+  //
+  // @returns {Object} Object with token and tokenExpires keys.
+  logoutOtherClients: function () {
     var self = this;
     var user = Meteor.users.findOne(self.userId, {
       fields: {
diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index 00b525f966..5107683e4d 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -307,7 +307,7 @@ if (Meteor.isClient) (function () {
           ddpUrl = __meteor_runtime_config__.DDP_DEFAULT_CONNECTION_URL;
       }
 
-      // Test that Meteor._logoutAllOthers logs out a second authenticated
+      // Test that Meteor.logoutOtherClients logs out a second authenticated
       // connection while leaving Meteor.connection logged in.
       var token;
       var secondConn = DDP.connect(ddpUrl);
@@ -329,7 +329,7 @@ if (Meteor.isClient) (function () {
         secondConn.onReconnect = function () {
           secondConn.call("login", { resume: token }, expectLoginError);
         };
-        Meteor.call("_logoutAllOthers", expectLoggedIn);
+        Meteor.call("logoutOtherClients", expectLoggedIn);
       });
 
       Meteor.loginWithPassword(username, password2, function (err) {

From d123e731ccf2e84fe4f1092f8e18532015838dd2 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Mon, 23 Sep 2013 10:46:03 -0700
Subject: [PATCH 166/335] Get rid of connectionCloseDelaySecs

---
 packages/accounts-base/accounts_common.js    |  9 +--
 packages/accounts-base/accounts_server.js    | 77 ++++++++++++++++----
 packages/accounts-password/password_tests.js |  4 +-
 3 files changed, 65 insertions(+), 25 deletions(-)

diff --git a/packages/accounts-base/accounts_common.js b/packages/accounts-base/accounts_common.js
index d0c7c766f5..cd7eb41441 100644
--- a/packages/accounts-base/accounts_common.js
+++ b/packages/accounts-base/accounts_common.js
@@ -14,7 +14,7 @@ var MIN_TOKEN_LIFETIME_CAP_SECS = 3600; // one hour
 EXPIRE_TOKENS_INTERVAL_MS = 600 * 1000; // 10 minutes
 // how long we wait before logging out clients when Meteor.logoutOtherClients is
 // called
-DEFAULT_CONNECTION_CLOSE_DELAY_SECS = 10;
+CONNECTION_CLOSE_DELAY_MS = 10 * 1000;
 
 // Set up config for the accounts system. Call this on both the client
 // and the server.
@@ -34,16 +34,11 @@ DEFAULT_CONNECTION_CLOSE_DELAY_SECS = 10;
 // - loginExpirationInDays {Number}
 //     Number of days since login until a user is logged out (login token
 //     expires).
-// - _connectionCloseDelaySecs {Number}
-//     The number of seconds to wait before closing connections that when a user
-//     is logged out by the server. Defaults to 10, to allow clients to store a
-//     fresh token in localStorage when calling logoutOtherClients.
 //
 Accounts.config = function(options) {
   // validate option keys
   var VALID_KEYS = ["sendVerificationEmail", "forbidClientAccountCreation",
-                    "restrictCreationByEmailDomain", "loginExpirationInDays",
-                    "_connectionCloseDelaySecs"];
+                    "restrictCreationByEmailDomain", "loginExpirationInDays"];
   _.each(_.keys(options), function (key) {
     if (!_.contains(VALID_KEYS, key)) {
       throw new Error("Accounts.config: Invalid key: " + key);
diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index 7627cac8d5..96b98dc987 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -92,7 +92,9 @@ Meteor.methods({
   },
 
   // Delete all the current user's tokens and close all open connections logged
-  // in as this user. Returns a fresh new login token that this client can use.
+  // in as this user. Returns a fresh new login token that this client can
+  // use. Tests set Accounts._noConnectionCloseDelayForTest to delete tokens
+  // immediately instead of using a delay.
   //
   // @returns {Object} Object with token and tokenExpires keys.
   logoutOtherClients: function () {
@@ -103,13 +105,27 @@ Meteor.methods({
       }
     });
     if (user) {
+      // Save the current tokens in the database to be deleted in
+      // CONNECTION_CLOSE_DELAY_MS ms. This gives other connections in the
+      // caller's browser time to find the fresh token in localStorage. We save
+      // the tokens in the database in case we crash before actually deleting
+      // them.
       var tokens = user.services.resume.loginTokens;
       var newToken = Accounts._generateStampedLoginToken();
+      var userId = self.userId;
       Meteor.users.update(self.userId, {
         $set: {
-          "services.resume.loginTokens": [newToken]
-        }
+          "services.resume.loginTokensToDelete": tokens,
+          "services.resume.haveLoginTokensToDelete": true
+        },
+        $push: { "services.resume.loginTokens": newToken }
       });
+      Meteor.setTimeout(function () {
+        // The observe on Meteor.users will take care of closing the connections
+        // associated with `tokens`.
+        deleteSavedTokens(userId, tokens);
+      }, Accounts._noConnectionCloseDelayForTest ? 0 :
+                        CONNECTION_CLOSE_DELAY_MS);
       // We do not set the login token on this connection, but instead the
       // observe closes the connection and the client will reconnect with the
       // new token.
@@ -559,28 +575,59 @@ Meteor.users._ensureIndex('username', {unique: 1, sparse: 1});
 Meteor.users._ensureIndex('emails.address', {unique: 1, sparse: 1});
 Meteor.users._ensureIndex('services.resume.loginTokens.token',
                           {unique: 1, sparse: 1});
+// For taking care of logoutOtherClients calls that crashed before the tokens
+// were deleted.
+Meteor.users._ensureIndex('services.resume.haveLoginTokensToDelete',
+                          { sparse: 1 });
 // For expiring login tokens
 Meteor.users._ensureIndex("services.resume.loginTokens.when", { sparse: 1 });
 
+///
+/// CLEAN UP FOR `logoutOtherClients`
+///
+
+var deleteSavedTokens = function (userId, tokensToDelete) {
+  if (tokensToDelete) {
+    Meteor.users.update(userId, {
+      $unset: {
+        "services.resume.haveLoginTokensToDelete": 1,
+        "services.resume.loginTokensToDelete": 1
+      },
+      $pullAll: {
+        "services.resume.loginTokens": tokensToDelete
+      }
+    });
+  }
+};
+
+Meteor.startup(function () {
+  // If we find users who have saved tokens to delete on startup, delete them
+  // now. It's possible that the server could have crashed and come back up
+  // before new tokens are found in localStorage, but this shouldn't happen very
+  // often. We shouldn't put a delay here because that would give a lot of power
+  // to an attacker with a stolen login token and the ability to crash the
+  // server.
+  var users = Meteor.users.find({
+    "services.resume.haveLoginTokensToDelete": true
+  }, {
+    "services.resume.loginTokensToDelete": 1
+  });
+  users.forEach(function (user) {
+    deleteSavedTokens(user._id, user.services.resume.loginTokensToDelete);
+  });
+});
+
 ///
 /// LOGGING OUT DELETED USERS
 ///
 
-// By default, connections are closed with a 10 second delay, to give other
-// clients a chance to find a new token in localStorage before
-// reconnecting. Delay can be configured with Accounts.config.
 var closeTokensForUser = function (userTokens) {
-  var delaySecs = DEFAULT_CONNECTION_CLOSE_DELAY_SECS;
-  if (_.has(Accounts._options, "_connectionCloseDelaySecs"))
-    delaySecs = Accounts._options._connectionCloseDelaySecs;
-  Meteor.setTimeout(function () {
-    Meteor.server._closeAllForTokens(_.map(userTokens, function (token) {
-      return token.token;
-    }));
-  }, delaySecs * 1000);
+  Meteor.server._closeAllForTokens(_.map(userTokens, function (token) {
+    return token.token;
+  }));
 };
 
-Meteor.users.find({}, {"services.resume": 1}).observe({
+Meteor.users.find({}, { "services.resume": 1 }).observe({
   changed: function (newUser, oldUser) {
     var removedTokens = [];
     if (newUser.services && newUser.services.resume &&
diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index 5107683e4d..110a37448d 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -1,6 +1,4 @@
-Accounts.config({
-  _connectionCloseDelaySecs: 0
-});
+Accounts._noConnectionCloseDelayForTest = true;
 
 if (Meteor.isClient) (function () {
 

From 7782d7c95f413b5aec5988fded0f0698371e3662 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Tue, 24 Sep 2013 20:34:48 -0700
Subject: [PATCH 167/335] Make token expiration backwards compatible with
 numeric `when`.

---
 packages/accounts-base/accounts_common.js |  6 +++--
 packages/accounts-base/accounts_server.js | 10 ++++++--
 packages/accounts-base/accounts_tests.js  | 30 +++++++++++++++++++++++
 3 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/packages/accounts-base/accounts_common.js b/packages/accounts-base/accounts_common.js
index cd7eb41441..704924ac28 100644
--- a/packages/accounts-base/accounts_common.js
+++ b/packages/accounts-base/accounts_common.js
@@ -93,13 +93,15 @@ getTokenLifetimeMs = function () {
 };
 
 Accounts._tokenExpiration = function (when) {
-  return new Date(when.getTime() + getTokenLifetimeMs());
+  // We pass when through the Date constructor for backwards compatibility;
+  // `when` used to be a number.
+  return new Date((new Date(when)).getTime() + getTokenLifetimeMs());
 };
 
 Accounts._tokenExpiresSoon = function (when) {
   var minLifetimeMs = .1 * getTokenLifetimeMs();
   var minLifetimeCapMs = MIN_TOKEN_LIFETIME_CAP_SECS * 1000;
   if (minLifetimeMs > minLifetimeCapMs)
-    minLifetimeMs = minLifetimeCapMs
+    minLifetimeMs = minLifetimeCapMs;
   return new Date() > (new Date(when) - minLifetimeMs);
 };
diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index 96b98dc987..e8d854ff5b 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -206,11 +206,17 @@ var expireTokens = Accounts._expireTokens = function (oldestValidDate) {
     (new Date(new Date() - tokenLifetimeMs));
 
   Meteor.users.update({
-    "services.resume.loginTokens.when": { $lt: oldestValidDate }
+    $or: [
+      { "services.resume.loginTokens.when": { $lt: oldestValidDate } },
+      { "services.resume.loginTokens.when": { $lt: +oldestValidDate } }
+    ]
   }, {
     $pull: {
       "services.resume.loginTokens": {
-        when: { $lt: oldestValidDate }
+        $or: [
+          { when: { $lt: oldestValidDate } },
+          { when: { $lt: +oldestValidDate } }
+        ]
       }
     }
   }, { multi: true });
diff --git a/packages/accounts-base/accounts_tests.js b/packages/accounts-base/accounts_tests.js
index 82cf135fa1..9e33faa7bb 100644
--- a/packages/accounts-base/accounts_tests.js
+++ b/packages/accounts-base/accounts_tests.js
@@ -178,3 +178,33 @@ Tinytest.add('accounts - insertUserDoc email', function (test) {
   Meteor.users.remove(result.id);
   Meteor.users.remove(result3.id);
 });
+
+// More token expiration tests are in accounts-password
+Tinytest.addAsync('accounts - expire numeric token', function (test, onComplete) {
+  var userIn = { username: Random.id() };
+  var result = Accounts.insertUserDoc({ profile: {
+    name: 'Foo Bar'
+  } }, userIn);
+  var date = new Date(new Date() - 5000);
+  Meteor.users.update(result.id, {
+    $set: {
+      "services.resume.loginTokens": [{
+        token: Random.id(),
+        when: date
+      }, {
+        token: Random.id(),
+        when: +date
+      }]
+    }
+  });
+  var observe = Meteor.users.find(result.id).observe({
+    changed: function (newUser) {
+      if (newUser.services && newUser.services.resume &&
+          _.isEmpty(newUser.services.resume.loginTokens)) {
+        observe.stop();
+        onComplete();
+      }
+    }
+  });
+  Accounts._expireTokens(new Date());
+});

From f67cf78b2d3d2b576e7c0e2c90f02659f169c9a9 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Sat, 28 Sep 2013 20:58:03 -0700
Subject: [PATCH 168/335] Add docs for loginExpirationInDays and
 logoutOtherClients()

---
 docs/client/api.html |  6 ++++++
 docs/client/api.js   | 19 +++++++++++++++++++
 docs/client/docs.js  |  1 +
 3 files changed, 26 insertions(+)

diff --git a/docs/client/api.html b/docs/client/api.html
index 0554538882..546f1eba44 100644
--- a/docs/client/api.html
+++ b/docs/client/api.html
@@ -1500,6 +1500,12 @@ animation while the login request is being processed.
 
 {{> api_box logout}}
 
+{{> api_box logoutOtherClients}}
+
+For example, when called in a user's browser, connections in that browser
+remains logged in, but any other browsers or DDP clients logged in as that user
+will be logged out.
+
 {{> api_box loginWithPassword}}
 
 This function is provided by the `accounts-password` package. See the
diff --git a/docs/client/api.js b/docs/client/api.js
index ea23fe290e..587d2a9f8e 100644
--- a/docs/client/api.js
+++ b/docs/client/api.js
@@ -1032,6 +1032,20 @@ Template.api.logout = {
   ]
 };
 
+Template.api.logoutOtherClients = {
+  id: "meteor_logout_other_clients",
+  name: "Meteor.logoutOtherClients([callback])",
+  locus: "Client",
+  descr: ["Log out other clients logged in as the current user, but does not log out the client that calls this function."],
+  args: [
+    {
+      name: "callback",
+      type: "Function",
+      descr: "Optional callback. Called with no arguments on success, or with a single `Error` argument on failure."
+    }
+  ]
+};
+
 
 Template.api.loginWithPassword = {
   id: "meteor_loginwithpassword",
@@ -1111,6 +1125,11 @@ Template.api.accounts_config = {
       name: "restrictCreationByEmailDomain",
       type: "String Or Function",
       descr: "If set, only allow new users with an email in the specified domain or if the predicate function returns true. Works with password-based sign-in and external services that expose email addresses (Google, Facebook, GitHub). All existing users still can log in after enabling this option. Example: `Accounts.config({ restrictCreationByEmailDomain: 'school.edu' })`."
+    },
+    {
+      name: "loginExpirationInDays",
+      type: "Number",
+      descr: "The number of days from when a user logs in until their token expires and they are logged out. Defaults to 90. Set to `null` to disable login expiration."
     }
   ]
 };
diff --git a/docs/client/docs.js b/docs/client/docs.js
index 3ac001e554..c17e377868 100644
--- a/docs/client/docs.js
+++ b/docs/client/docs.js
@@ -191,6 +191,7 @@ var toc = [
       "Meteor.users",
       "Meteor.loggingIn",
       "Meteor.logout",
+      "Meteor.logoutOtherClients",
       "Meteor.loginWithPassword",
       {name: "Meteor.loginWithFacebook", id: "meteor_loginwithexternalservice"},
       {name: "Meteor.loginWithGithub", id: "meteor_loginwithexternalservice"},

From ae6ab2d77503be44724227e1d7a288b8e70f66af Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Mon, 30 Sep 2013 10:36:17 -0700
Subject: [PATCH 169/335] Fix logoutOtherClients docs typos

---
 docs/client/api.html | 2 +-
 docs/client/api.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/client/api.html b/docs/client/api.html
index 546f1eba44..97d8ac643c 100644
--- a/docs/client/api.html
+++ b/docs/client/api.html
@@ -1503,7 +1503,7 @@ animation while the login request is being processed.
 {{> api_box logoutOtherClients}}
 
 For example, when called in a user's browser, connections in that browser
-remains logged in, but any other browsers or DDP clients logged in as that user
+remain logged in, but any other browsers or DDP clients logged in as that user
 will be logged out.
 
 {{> api_box loginWithPassword}}
diff --git a/docs/client/api.js b/docs/client/api.js
index 587d2a9f8e..4be53c40f7 100644
--- a/docs/client/api.js
+++ b/docs/client/api.js
@@ -1033,7 +1033,7 @@ Template.api.logout = {
 };
 
 Template.api.logoutOtherClients = {
-  id: "meteor_logout_other_clients",
+  id: "meteor_logoutotherclients",
   name: "Meteor.logoutOtherClients([callback])",
   locus: "Client",
   descr: ["Log out other clients logged in as the current user, but does not log out the client that calls this function."],

From e6e4c8a94edeae62732857f38c0afeaa716a57d7 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Wed, 2 Oct 2013 11:34:17 -0700
Subject: [PATCH 170/335] Minor token deletion cleanup and comments

---
 packages/accounts-base/accounts_server.js |  8 ++++++--
 packages/livedata/livedata_server.js      | 19 ++++++++++++-------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index e8d854ff5b..397e4b84a9 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -205,6 +205,8 @@ var expireTokens = Accounts._expireTokens = function (oldestValidDate) {
   oldestValidDate = oldestValidDate ||
     (new Date(new Date() - tokenLifetimeMs));
 
+  // Backwards compatible with older versions of meteor that stored login token
+  // timestamps as numbers.
   Meteor.users.update({
     $or: [
       { "services.resume.loginTokens.when": { $lt: oldestValidDate } },
@@ -227,8 +229,10 @@ var expireTokens = Accounts._expireTokens = function (oldestValidDate) {
 maybeStopExpireTokensInterval = function () {
   if (_.has(Accounts._options, "loginExpirationInDays") &&
       Accounts._options.loginExpirationInDays === null &&
-      expireTokenInterval)
+      expireTokenInterval) {
     Meteor.clearInterval(expireTokenInterval);
+    expireTokenInterval = null;
+  }
 };
 
 expireTokenInterval = Meteor.setInterval(expireTokens,
@@ -633,7 +637,7 @@ var closeTokensForUser = function (userTokens) {
   }));
 };
 
-Meteor.users.find({}, { "services.resume": 1 }).observe({
+Meteor.users.find({}, { fields: { "services.resume": 1 }}).observe({
   changed: function (newUser, oldUser) {
     var removedTokens = [];
     if (newUser.services && newUser.services.resume &&
diff --git a/packages/livedata/livedata_server.js b/packages/livedata/livedata_server.js
index b675dc40d6..6f436fc852 100644
--- a/packages/livedata/livedata_server.js
+++ b/packages/livedata/livedata_server.js
@@ -583,6 +583,12 @@ _.extend(Session.prototype, {
     });
   },
 
+  // XXX This mixes accounts concerns (login tokens) into livedata, which is not
+  // ideal. Eventually we'll have an API that allows accounts to keep track of
+  // which connections are associated with tokens and close them when necessary,
+  // rather than the current state of things where accounts tells livedata which
+  // connections are associated with which tokens, and when to close connections
+  // associated with a given token.
   _setLoginToken: function (newToken) {
     var self = this;
     var oldToken = self.sessionData.loginToken;
@@ -652,13 +658,6 @@ _.extend(Session.prototype, {
         self._pendingReady = [];
       }
     });
-
-
-    // XXX figure out the login token that was just used, and set up an observe
-    // on the user doc so that deleting the user or the login token disconnects
-    // the session. For now, if you want to make sure that your deleted users
-    // don't have any continuing sessions, you can restart the server, but we
-    // should make it automatic.
   },
 
   _startSubscription: function (handler, subId, params, name) {
@@ -969,6 +968,12 @@ Server = function () {
   // Keeps track of the open connections associated with particular login
   // tokens. Used for logging out all a user's open connections, expiring login
   // tokens, etc.
+  // XXX This mixes accounts concerns (login tokens) into livedata, which is not
+  // ideal. Eventually we'll have an API that allows accounts to keep track of
+  // which connections are associated with tokens and close them when necessary,
+  // rather than the current state of things where accounts tells livedata which
+  // connections are associated with which tokens, and when to close connections
+  // associated with a given token.
   self.sessionsByLoginToken = {};
 
 

From 8d9f97f358f650f37324c0c867272a019fd91787 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Wed, 2 Oct 2013 11:43:16 -0700
Subject: [PATCH 171/335] Use a hardcoded example for Meteor.release, for now.

---
 docs/client/api.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/client/api.js b/docs/client/api.js
index 4be53c40f7..fe81140acd 100644
--- a/docs/client/api.js
+++ b/docs/client/api.js
@@ -74,7 +74,10 @@ Template.api.release = {
           "[release](#meteorupdate) with which the project was built (for " +
           "example, `\"" +
           // Put the current release in the docs as the example)
-          (Meteor.release ? Meteor.release : '0.6.0') +
+          // XXX for now this is hard-coded because galaxy apps are on a
+          // different meteor release
+          //         (Meteor.release ? Meteor.release : '0.6.0') +
+          "0.6.5.1" +
           "\"`). It is `undefined` if the project was built using a git " +
           "checkout of Meteor."]
 };

From da6bc1d835583871db99f1e92ef1f128d8e2fd31 Mon Sep 17 00:00:00 2001
From: Andrew Wilcox <andrew.wilcox@gmail.com>
Date: Sat, 8 Jun 2013 16:20:06 -0400
Subject: [PATCH 172/335] EJSON.stringify objects in sorted key order.

Thus if two objects are EJSON.equals, their serialization strings will
be equal also.

(This should mean that reactive-dict could now allow objects to be
used as the key for `equal`).

Note this change does not affect livedata because livedata uses the
EJSON adjust functions to convert between JSON and EJSON (not
stringify).

Adds a couple options to EJSON.stringify:

* keyOrderSensitive: in parallel with EJSON.equals, outputs objects in
  native key order (the old behavior).

* indent: pretty-prints the output.

The serialization code is based json2, which makes it easy to preserve
the indentation functionality provided by JSON.stringify.  Only enough
code is included to serialize arrays and objects; serializing
primitive values such as strings is delegated to the native
JSON.stringify to reduce code and in case the native implementation is
more efficient.

Include underscore as an explicit dependency in package.js.

Document options to EJSON.equals and EJSON.stringify.
---
 docs/client/api.js           |  17 +++-
 packages/ejson/ejson.js      |  12 ++-
 packages/ejson/ejson_test.js |  75 ++++++++++++++
 packages/ejson/package.js    |   1 +
 packages/ejson/stringify.js  | 188 +++++++++++++++++++++++++++++++++++
 5 files changed, 289 insertions(+), 4 deletions(-)
 create mode 100644 packages/ejson/stringify.js

diff --git a/docs/client/api.js b/docs/client/api.js
index 4a7402824a..80b870158f 100644
--- a/docs/client/api.js
+++ b/docs/client/api.js
@@ -89,9 +89,17 @@ Template.api.ejsonParse = {
 
 Template.api.ejsonStringify = {
   id: "ejson_stringify",
-  name: "EJSON.stringify(val)",
+  name: "EJSON.stringify(val, [options])",
   locus: "Anywhere",
   args: [ {name: "val", type: "EJSON-compatible value", descr: "A value to stringify."} ],
+  options: [
+    {name: "indent",
+     type: "Boolean, Integer, or String",
+     descr: "Indents objects and arrays for easy readability.  When `true`, indents by 2 spaces; when an integer, indents by that number of spaces; and when a string, uses the string as the indentation pattern."},
+    {name: "keyOrderSensitive",
+     type: "Boolean",
+     descr: "Stringifies in key sensitive order, when supported by the JavaScript implementation.  Without this option, object keys are emitted in sorted order."}
+  ],
   descr: ["Serialize a value to a string.\n\nFor EJSON values, the serialization " +
           "fully represents the value. For non-EJSON values, serializes the " +
           "same way as `JSON.stringify`."]
@@ -116,10 +124,15 @@ Template.api.ejsonToJSONValue = {
 
 Template.api.ejsonEquals = {
   id: "ejson_equals",
-  name: "EJSON.equals(a, b)", //doc options?
+  name: "EJSON.equals(a, b, [options])",
   locus: "Anywhere",
   args: [ {name: "a", type: "EJSON-compatible object"},
           {name: "b", type: "EJSON-compatible object"} ],
+  options: [
+    {name: "keyOrderSensitive",
+     type: "Boolean",
+     descr: "Compare in key sensitive order, if supported by the JavaScript implementation.  For example, `{a: 1, b: 2}` is not equal to `{b: 2, a: 1}` with this option, but they are equal when this option is not specified."}
+  ],
   descr: ["Return true if `a` and `b` are equal to each other.  Return false otherwise." +
           "  Uses the `equals` method on `a` if present, otherwise performs a deep comparison."]
 },
diff --git a/packages/ejson/ejson.js b/packages/ejson/ejson.js
index 222a289e50..3d7d3160d0 100644
--- a/packages/ejson/ejson.js
+++ b/packages/ejson/ejson.js
@@ -206,8 +206,16 @@ EJSON.fromJSONValue = function (item) {
   }
 };
 
-EJSON.stringify = function (item) {
-  return JSON.stringify(EJSON.toJSONValue(item));
+EJSON.stringify = function (item, options) {
+  var keyOrderSensitive = !!(options && options.keyOrderSensitive);
+  var indent = options && options.indent || null;
+  if (indent === true)
+    indent = 2;
+  var json = EJSON.toJSONValue(item);
+  if (keyOrderSensitive)
+    return JSON.stringify(json, null, indent);
+  else
+    return EJSON._canonicalStringify(json, null, indent);
 };
 
 EJSON.parse = function (item) {
diff --git a/packages/ejson/ejson_test.js b/packages/ejson/ejson_test.js
index 27c39d6085..ed438caa99 100644
--- a/packages/ejson/ejson_test.js
+++ b/packages/ejson/ejson_test.js
@@ -73,6 +73,81 @@ Tinytest.add("ejson - clone", function (test) {
   testCloneArgs(1, 2, "foo", [4]);
 });
 
+Tinytest.add("ejson - stringify", function (test) {
+  test.equal(EJSON.stringify(null), "null");
+  test.equal(EJSON.stringify(true), "true");
+  test.equal(EJSON.stringify(false), "false");
+  test.equal(EJSON.stringify(123), "123");
+  test.equal(EJSON.stringify("abc"), "\"abc\"");
+
+  test.equal(EJSON.stringify([1, 2, 3]),
+     "[1,2,3]"
+  );
+  test.equal(EJSON.stringify([1, 2, 3], {indent: true}),
+    "[\n  1,\n  2,\n  3\n]"
+  );
+  test.equal(EJSON.stringify([1, 2, 3], {keyOrderSensitive: true}),
+    "[1,2,3]"
+  );
+  test.equal(EJSON.stringify([1, 2, 3], {indent: true, keyOrderSensitive: true}),
+    "[\n  1,\n  2,\n  3\n]"
+  );
+
+  test.equal(EJSON.stringify([1, 2, 3], {indent: 4}),
+    "[\n    1,\n    2,\n    3\n]"
+  );
+  test.equal(EJSON.stringify([1, 2, 3], {indent: '--'}),
+    "[\n--1,\n--2,\n--3\n]"
+  );
+
+  test.equal(
+    EJSON.stringify(
+      {b: [2, {d: 4, c: 3}], a: 1}
+    ),
+    "{\"a\":1,\"b\":[2,{\"c\":3,\"d\":4}]}"
+  );
+  test.equal(
+    EJSON.stringify(
+      {b: [2, {d: 4, c: 3}], a: 1},
+      {indent: true}
+    ),
+    "{\n" +
+    "  \"a\": 1,\n" +
+    "  \"b\": [\n" +
+    "    2,\n" +
+    "    {\n" +
+    "      \"c\": 3,\n" +
+    "      \"d\": 4\n" +
+    "    }\n" +
+    "  ]\n" +
+    "}"
+  );
+  test.equal(
+    EJSON.stringify(
+      {b: [2, {d: 4, c: 3}], a: 1},
+      {keyOrderSensitive: true}
+    ),
+    "{\"b\":[2,{\"d\":4,\"c\":3}],\"a\":1}"
+  );
+  test.equal(
+    EJSON.stringify(
+      {b: [2, {d: 4, c: 3}], a: 1},
+      {indent: true, keyOrderSensitive: true}
+    ),
+    "{\n" +
+    "  \"b\": [\n" +
+    "    2,\n" +
+    "    {\n" +
+    "      \"d\": 4,\n" +
+    "      \"c\": 3\n" +
+    "    }\n" +
+    "  ],\n" +
+    "  \"a\": 1\n" +
+    "}"
+
+  );
+});
+
 Tinytest.add("ejson - parse", function (test) {
   test.equal(EJSON.parse("[1,2,3]"), [1,2,3]);
   test.throws(
diff --git a/packages/ejson/package.js b/packages/ejson/package.js
index f3b93dbc2b..400f1b25e6 100644
--- a/packages/ejson/package.js
+++ b/packages/ejson/package.js
@@ -9,6 +9,7 @@ Package.on_use(function (api) {
   api.export('EJSONTest', {testOnly: true});
   api.add_files('ejson.js', ['client', 'server']);
   api.add_files('base64.js', ['client', 'server']);
+  api.add_files('stringify.js', ['client', 'server']);
 });
 
 Package.on_test(function (api) {
diff --git a/packages/ejson/stringify.js b/packages/ejson/stringify.js
new file mode 100644
index 0000000000..b82880200e
--- /dev/null
+++ b/packages/ejson/stringify.js
@@ -0,0 +1,188 @@
+// Based on json2.js from https://github.com/douglascrockford/JSON-js
+//
+//    json2.js
+//    2012-10-08
+//
+//    Public Domain.
+//
+//    NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
+
+EJSON = {}; // Global!
+
+function quote(string) {
+  return JSON.stringify(string);
+}
+
+var rep, gap, indent;
+
+function str(key, holder) {
+
+// Produce a string from holder[key].
+
+    var i,          // The loop counter.
+        k,          // The member key.
+        v,          // The member value.
+        length,
+        mind = gap,
+        partial,
+        value = holder[key];
+
+// If the value has a toJSON method, call it to obtain a replacement value.
+
+    if (value && typeof value === 'object' &&
+            typeof value.toJSON === 'function') {
+        value = value.toJSON(key);
+    }
+
+// If we were called with a replacer function, then call the replacer to
+// obtain a replacement value.
+
+    if (typeof rep === 'function') {
+        value = rep.call(holder, key, value);
+    }
+
+// What happens next depends on the value's type.
+
+    switch (typeof value) {
+    case 'string':
+        return quote(value);
+
+    case 'number':
+
+// JSON numbers must be finite. Encode non-finite numbers as null.
+
+        return isFinite(value) ? String(value) : 'null';
+
+    case 'boolean':
+    case 'null':
+
+// If the value is a boolean or null, convert it to a string. Note:
+// typeof null does not produce 'null'. The case is included here in
+// the remote chance that this gets fixed someday.
+
+        return String(value);
+
+// If the type is 'object', we might be dealing with an object or an array or
+// null.
+
+    case 'object':
+
+// Due to a specification blunder in ECMAScript, typeof null is 'object',
+// so watch out for that case.
+
+        if (!value) {
+            return 'null';
+        }
+
+// Make an array to hold the partial results of stringifying this object value.
+
+        gap += indent;
+        partial = [];
+
+// Is the value an array?
+
+        if (Object.prototype.toString.apply(value) === '[object Array]') {
+
+// The value is an array. Stringify every element. Use null as a placeholder
+// for non-JSON values.
+
+            length = value.length;
+            for (i = 0; i < length; i += 1) {
+                partial[i] = str(i, value) || 'null';
+            }
+
+// Join all of the elements together, separated with commas, and wrap them in
+// brackets.
+
+            v = partial.length === 0
+                ? '[]'
+                : gap
+                ? '[\n' + gap + partial.join(',\n' + gap) + '\n' + mind + ']'
+                : '[' + partial.join(',') + ']';
+            gap = mind;
+            return v;
+        }
+
+// If the replacer is an array, use it to select the members to be stringified.
+
+        if (rep && typeof rep === 'object') {
+            length = rep.length;
+            for (i = 0; i < length; i += 1) {
+                if (typeof rep[i] === 'string') {
+                    k = rep[i];
+                    v = str(k, value);
+                    if (v) {
+                        partial.push(quote(k) + (gap ? ': ' : ':') + v);
+                    }
+                }
+            }
+        } else {
+
+// Otherwise, iterate through all of the keys in the object.
+
+            _.each(_.keys(value).sort(), function (k) {
+                v = str(k, value);
+                if (v) {
+                    partial.push(quote(k) + (gap ? ': ' : ':') + v);
+                }
+            });
+        }
+
+// Join all of the member texts together, separated with commas,
+// and wrap them in braces.
+
+        v = partial.length === 0
+            ? '{}'
+            : gap
+            ? '{\n' + gap + partial.join(',\n' + gap) + '\n' + mind + '}'
+            : '{' + partial.join(',') + '}';
+        gap = mind;
+        return v;
+    }
+}
+
+// If the JSON object does not yet have a stringify method, give it one.
+
+function stringify(value, replacer, space) {
+
+// The stringify method takes a value and an optional replacer, and an optional
+// space parameter, and returns a JSON text. The replacer can be a function
+// that can replace values, or an array of strings that will select the keys.
+// A default replacer method can be provided. Use of the space parameter can
+// produce text that is more easily readable.
+
+            var i;
+            gap = '';
+            indent = '';
+
+// If the space parameter is a number, make an indent string containing that
+// many spaces.
+
+            if (typeof space === 'number') {
+                for (i = 0; i < space; i += 1) {
+                    indent += ' ';
+                }
+
+// If the space parameter is a string, it will be used as the indent string.
+
+            } else if (typeof space === 'string') {
+                indent = space;
+            }
+
+// If there is a replacer, it must be a function or an array.
+// Otherwise, throw an error.
+
+            rep = replacer;
+            if (replacer && typeof replacer !== 'function' &&
+                    (typeof replacer !== 'object' ||
+                    typeof replacer.length !== 'number')) {
+                throw new Error('JSON.stringify');
+            }
+
+// Make a fake root object containing our value under the key of ''.
+// Return the result of stringifying the value.
+
+            return str('', {'': value});
+        }
+
+EJSON._canonicalStringify = stringify;

From 0d8bfbae8a6db367d1975e744ef7e54ffa296571 Mon Sep 17 00:00:00 2001
From: Naomi Seyfer <naomi@meteor.com>
Date: Tue, 1 Oct 2013 11:57:53 -0700
Subject: [PATCH 173/335] fix tests, rename option, more style fixes

---
 packages/ejson/ejson.js      |  14 +-
 packages/ejson/ejson_test.js |  16 ++-
 packages/ejson/package.js    |   2 +-
 packages/ejson/stringify.js  | 254 +++++++++++++----------------------
 4 files changed, 109 insertions(+), 177 deletions(-)

diff --git a/packages/ejson/ejson.js b/packages/ejson/ejson.js
index 3d7d3160d0..af601fbca9 100644
--- a/packages/ejson/ejson.js
+++ b/packages/ejson/ejson.js
@@ -207,15 +207,12 @@ EJSON.fromJSONValue = function (item) {
 };
 
 EJSON.stringify = function (item, options) {
-  var keyOrderSensitive = !!(options && options.keyOrderSensitive);
-  var indent = options && options.indent || null;
-  if (indent === true)
-    indent = 2;
   var json = EJSON.toJSONValue(item);
-  if (keyOrderSensitive)
-    return JSON.stringify(json, null, indent);
-  else
-    return EJSON._canonicalStringify(json, null, indent);
+  if (options && (options.canonical || options.indent)) {
+    return EJSON._canonicalStringify(json, options);
+  } else {
+    return JSON.stringify(json);
+  }
 };
 
 EJSON.parse = function (item) {
@@ -315,6 +312,7 @@ EJSON.clone = function (v) {
     }
     return ret;
   }
+  // XXX: Use something better than underscore's isArray
   if (_.isArray(v) || _.isArguments(v)) {
     // For some reason, _.map doesn't work in this context on Opera (weird test
     // failures).
diff --git a/packages/ejson/ejson_test.js b/packages/ejson/ejson_test.js
index ed438caa99..c71684e82f 100644
--- a/packages/ejson/ejson_test.js
+++ b/packages/ejson/ejson_test.js
@@ -86,10 +86,10 @@ Tinytest.add("ejson - stringify", function (test) {
   test.equal(EJSON.stringify([1, 2, 3], {indent: true}),
     "[\n  1,\n  2,\n  3\n]"
   );
-  test.equal(EJSON.stringify([1, 2, 3], {keyOrderSensitive: true}),
+  test.equal(EJSON.stringify([1, 2, 3], {canonical: false}),
     "[1,2,3]"
   );
-  test.equal(EJSON.stringify([1, 2, 3], {indent: true, keyOrderSensitive: true}),
+  test.equal(EJSON.stringify([1, 2, 3], {indent: true, canonical: false}),
     "[\n  1,\n  2,\n  3\n]"
   );
 
@@ -102,14 +102,18 @@ Tinytest.add("ejson - stringify", function (test) {
 
   test.equal(
     EJSON.stringify(
-      {b: [2, {d: 4, c: 3}], a: 1}
+      {b: [2, {d: 4, c: 3}], a: 1},
+      {canonical: true}
     ),
     "{\"a\":1,\"b\":[2,{\"c\":3,\"d\":4}]}"
   );
   test.equal(
     EJSON.stringify(
       {b: [2, {d: 4, c: 3}], a: 1},
-      {indent: true}
+      {
+        indent: true,
+        canonical: true
+      }
     ),
     "{\n" +
     "  \"a\": 1,\n" +
@@ -125,14 +129,14 @@ Tinytest.add("ejson - stringify", function (test) {
   test.equal(
     EJSON.stringify(
       {b: [2, {d: 4, c: 3}], a: 1},
-      {keyOrderSensitive: true}
+      {canonical: false}
     ),
     "{\"b\":[2,{\"d\":4,\"c\":3}],\"a\":1}"
   );
   test.equal(
     EJSON.stringify(
       {b: [2, {d: 4, c: 3}], a: 1},
-      {indent: true, keyOrderSensitive: true}
+      {indent: true, canonical: false}
     ),
     "{\n" +
     "  \"b\": [\n" +
diff --git a/packages/ejson/package.js b/packages/ejson/package.js
index 400f1b25e6..226c233baf 100644
--- a/packages/ejson/package.js
+++ b/packages/ejson/package.js
@@ -8,8 +8,8 @@ Package.on_use(function (api) {
   api.export('EJSON');
   api.export('EJSONTest', {testOnly: true});
   api.add_files('ejson.js', ['client', 'server']);
-  api.add_files('base64.js', ['client', 'server']);
   api.add_files('stringify.js', ['client', 'server']);
+  api.add_files('base64.js', ['client', 'server']);
 });
 
 Package.on_test(function (api) {
diff --git a/packages/ejson/stringify.js b/packages/ejson/stringify.js
index b82880200e..1ce9ad6baf 100644
--- a/packages/ejson/stringify.js
+++ b/packages/ejson/stringify.js
@@ -7,182 +7,112 @@
 //
 //    NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
 
-EJSON = {}; // Global!
-
 function quote(string) {
   return JSON.stringify(string);
 }
 
-var rep, gap, indent;
+var str = function (key, holder, singleIndent, outerIndent, canonical) {
 
-function str(key, holder) {
+  // Produce a string from holder[key].
 
-// Produce a string from holder[key].
+  var i;          // The loop counter.
+  var k;          // The member key.
+  var v;          // The member value.
+  var length;
+  var innerIndent = outerIndent;
+  var partial;
+  var value = holder[key];
 
-    var i,          // The loop counter.
-        k,          // The member key.
-        v,          // The member value.
-        length,
-        mind = gap,
-        partial,
-        value = holder[key];
+  // What happens next depends on the value's type.
 
-// If the value has a toJSON method, call it to obtain a replacement value.
+  switch (typeof value) {
+  case 'string':
+    return quote(value);
+  case 'number':
+    // JSON numbers must be finite. Encode non-finite numbers as null.
+    return isFinite(value) ? String(value) : 'null';
+  case 'boolean':
+    return String(value);
+  // If the type is 'object', we might be dealing with an object or an array or
+  // null.
+  case 'object':
+    // Due to a specification blunder in ECMAScript, typeof null is 'object',
+    // so watch out for that case.
+    if (!value) {
+      return 'null';
+    }
+    // Make an array to hold the partial results of stringifying this object value.
+    innerIndent = outerIndent + singleIndent;
+    partial = [];
 
-    if (value && typeof value === 'object' &&
-            typeof value.toJSON === 'function') {
-        value = value.toJSON(key);
+    // Is the value an array?
+    if (_.isArray(value) || _.isArguments(value)) {
+
+      // The value is an array. Stringify every element. Use null as a placeholder
+      // for non-JSON values.
+
+      length = value.length;
+      for (i = 0; i < length; i += 1) {
+        partial[i] = str(i, value, singleIndent, innerIndent, canonical) || 'null';
+      }
+
+      // Join all of the elements together, separated with commas, and wrap them in
+      // brackets.
+
+      if (partial.length === 0) {
+        v = '[]';
+      } else if (innerIndent) {
+        v = '[\n' + innerIndent + partial.join(',\n' + innerIndent) + '\n' + outerIndent + ']';
+      } else {
+        v = '[' + partial.join(',') + ']';
+      }
+      return v;
     }
 
-// If we were called with a replacer function, then call the replacer to
-// obtain a replacement value.
 
-    if (typeof rep === 'function') {
-        value = rep.call(holder, key, value);
-    }
-
-// What happens next depends on the value's type.
-
-    switch (typeof value) {
-    case 'string':
-        return quote(value);
-
-    case 'number':
-
-// JSON numbers must be finite. Encode non-finite numbers as null.
-
-        return isFinite(value) ? String(value) : 'null';
-
-    case 'boolean':
-    case 'null':
-
-// If the value is a boolean or null, convert it to a string. Note:
-// typeof null does not produce 'null'. The case is included here in
-// the remote chance that this gets fixed someday.
-
-        return String(value);
-
-// If the type is 'object', we might be dealing with an object or an array or
-// null.
-
-    case 'object':
-
-// Due to a specification blunder in ECMAScript, typeof null is 'object',
-// so watch out for that case.
-
-        if (!value) {
-            return 'null';
-        }
-
-// Make an array to hold the partial results of stringifying this object value.
-
-        gap += indent;
-        partial = [];
-
-// Is the value an array?
-
-        if (Object.prototype.toString.apply(value) === '[object Array]') {
-
-// The value is an array. Stringify every element. Use null as a placeholder
-// for non-JSON values.
-
-            length = value.length;
-            for (i = 0; i < length; i += 1) {
-                partial[i] = str(i, value) || 'null';
-            }
-
-// Join all of the elements together, separated with commas, and wrap them in
-// brackets.
-
-            v = partial.length === 0
-                ? '[]'
-                : gap
-                ? '[\n' + gap + partial.join(',\n' + gap) + '\n' + mind + ']'
-                : '[' + partial.join(',') + ']';
-            gap = mind;
-            return v;
-        }
-
-// If the replacer is an array, use it to select the members to be stringified.
-
-        if (rep && typeof rep === 'object') {
-            length = rep.length;
-            for (i = 0; i < length; i += 1) {
-                if (typeof rep[i] === 'string') {
-                    k = rep[i];
-                    v = str(k, value);
-                    if (v) {
-                        partial.push(quote(k) + (gap ? ': ' : ':') + v);
-                    }
-                }
-            }
-        } else {
-
-// Otherwise, iterate through all of the keys in the object.
-
-            _.each(_.keys(value).sort(), function (k) {
-                v = str(k, value);
-                if (v) {
-                    partial.push(quote(k) + (gap ? ': ' : ':') + v);
-                }
-            });
-        }
-
-// Join all of the member texts together, separated with commas,
-// and wrap them in braces.
-
-        v = partial.length === 0
-            ? '{}'
-            : gap
-            ? '{\n' + gap + partial.join(',\n' + gap) + '\n' + mind + '}'
-            : '{' + partial.join(',') + '}';
-        gap = mind;
-        return v;
+    // Iterate through all of the keys in the object.
+    var keys = _.keys(value);
+    if (canonical)
+      keys = keys.sort();
+    _.each(keys, function (k) {
+      v = str(k, value, singleIndent, innerIndent, canonical);
+      if (v) {
+        partial.push(quote(k) + (innerIndent ? ': ' : ':') + v);
+      }
+    });
+
+
+    // Join all of the member texts together, separated with commas,
+    // and wrap them in braces.
+
+    if (partial.length === 0) {
+      v = '{}';
+    } else if (innerIndent) {
+      v = '{\n' + innerIndent + partial.join(',\n' + innerIndent) + '\n' + outerIndent + '}';
+    } else {
+      v = '{' + partial.join(',') + '}';
     }
+    return v;
+  }
 }
 
 // If the JSON object does not yet have a stringify method, give it one.
 
-function stringify(value, replacer, space) {
-
-// The stringify method takes a value and an optional replacer, and an optional
-// space parameter, and returns a JSON text. The replacer can be a function
-// that can replace values, or an array of strings that will select the keys.
-// A default replacer method can be provided. Use of the space parameter can
-// produce text that is more easily readable.
-
-            var i;
-            gap = '';
-            indent = '';
-
-// If the space parameter is a number, make an indent string containing that
-// many spaces.
-
-            if (typeof space === 'number') {
-                for (i = 0; i < space; i += 1) {
-                    indent += ' ';
-                }
-
-// If the space parameter is a string, it will be used as the indent string.
-
-            } else if (typeof space === 'string') {
-                indent = space;
-            }
-
-// If there is a replacer, it must be a function or an array.
-// Otherwise, throw an error.
-
-            rep = replacer;
-            if (replacer && typeof replacer !== 'function' &&
-                    (typeof replacer !== 'object' ||
-                    typeof replacer.length !== 'number')) {
-                throw new Error('JSON.stringify');
-            }
-
-// Make a fake root object containing our value under the key of ''.
-// Return the result of stringifying the value.
-
-            return str('', {'': value});
-        }
-
-EJSON._canonicalStringify = stringify;
+EJSON._canonicalStringify = function (value, options) {
+  // Make a fake root object containing our value under the key of ''.
+  // Return the result of stringifying the value.
+  options = _.extend({
+    indent: "",
+    canonical: false
+  }, options);
+  if (options.indent === true) {
+    options.indent = "  ";
+  } else if (typeof options.indent === 'number') {
+    var newIndent = "";
+    for (var i = 0; i < options.indent; i++) {
+      newIndent += ' ';
+    }
+    options.indent = newIndent;
+  }
+  return str('', {'': value}, options.indent, "", options.canonical);
+};

From c3fb7741f6aa0d30deb9a941e495287b0f21ec12 Mon Sep 17 00:00:00 2001
From: Naomi Seyfer <naomi@meteor.com>
Date: Tue, 1 Oct 2013 14:21:35 -0700
Subject: [PATCH 174/335] Infinity and NaN in EJSON

---
 packages/ejson/ejson.js      | 33 +++++++++++++++++++++++++++++++++
 packages/ejson/ejson_test.js | 25 +++++++++++++++++++++++++
 2 files changed, 58 insertions(+)

diff --git a/packages/ejson/ejson.js b/packages/ejson/ejson.js
index af601fbca9..40bc2b22c7 100644
--- a/packages/ejson/ejson.js
+++ b/packages/ejson/ejson.js
@@ -33,6 +33,27 @@ var builtinConverters = [
       return new Date(obj.$date);
     }
   },
+  { //NaN, Inf, -Inf
+    matchJSONValue: function (obj) {
+      return _.has(obj, '$InfNaN') && _.size(obj) === 1;
+    },
+    matchObject: function (obj) {
+      return _.isNaN(obj) || obj === Infinity || obj === -Infinity;
+    },
+    toJSONValue: function (obj) {
+      var sign;
+      if (_.isNaN(obj))
+        sign = 0;
+      else if (obj === Infinity)
+        sign = 1;
+      else
+        sign = -1;
+      return {$InfNaN: sign};
+    },
+    fromJSONValue: function (obj) {
+      return obj.$InfNaN/0;
+    }
+  },
   { // Binary
     matchJSONValue: function (obj) {
       return _.has(obj, '$binary') && _.size(obj) === 1;
@@ -110,6 +131,15 @@ EJSON._adjustTypesToJSONValue = function (obj) {
   if (maybeChanged !== undefined)
     return maybeChanged;
   _.each(obj, function (value, key) {
+    if (typeof value === 'number') {
+      if (_.isNaN(value))
+        obj[key] = {$InfNaN: 0};
+      else if (value === Infinity)
+        obj[key] = {$InfNaN: 1};
+      else if (value === -Infinity)
+        obj[key] = {$InfNaN: -1};
+      return; // continue
+    }
     if (typeof value !== 'object' && value !== undefined)
       return; // continue
     var changed = toJSONValueHelper(value);
@@ -231,6 +261,9 @@ EJSON.equals = function (a, b, options) {
   var keyOrderSensitive = !!(options && options.keyOrderSensitive);
   if (a === b)
     return true;
+  if (_.isNaN(a) && _.isNaN(b))
+    return true; // This differs from the IEEE spec for NaN equality, b/c we don't want
+                 // anything ever with a NaN to be poisoned from becoming equal to anything.
   if (!a || !b) // if either one is falsy, they'd have to be === to be equal
     return false;
   if (!(typeof a === 'object' && typeof b === 'object'))
diff --git a/packages/ejson/ejson_test.js b/packages/ejson/ejson_test.js
index c71684e82f..a87c17cb17 100644
--- a/packages/ejson/ejson_test.js
+++ b/packages/ejson/ejson_test.js
@@ -52,6 +52,31 @@ Tinytest.add("ejson - equality and falsiness", function (test) {
   test.isFalse(EJSON.equals({foo: "foo"}, undefined));
 });
 
+Tinytest.add("ejson - NaN and Inf", function (test) {
+  test.equal(EJSON.parse("{\"$InfNaN\": 1}"), Infinity);
+  test.equal(EJSON.parse("{\"$InfNaN\": -1}"), -Infinity);
+  test.isTrue(_.isNaN(EJSON.parse("{\"$InfNaN\": 0}")));
+  test.equal(EJSON.parse(EJSON.stringify(Infinity)), Infinity);
+  test.equal(EJSON.parse(EJSON.stringify(-Infinity)), -Infinity);
+  test.isTrue(_.isNaN(EJSON.parse(EJSON.stringify(NaN))));
+  test.isTrue(EJSON.equals(NaN, NaN));
+  test.isTrue(EJSON.equals(Infinity, Infinity));
+  test.isTrue(EJSON.equals(-Infinity, -Infinity));
+  test.isFalse(EJSON.equals(Infinity, -Infinity));
+  test.isFalse(EJSON.equals(Infinity, NaN));
+  test.isFalse(EJSON.equals(Infinity, 0));
+  test.isFalse(EJSON.equals(NaN, 0));
+
+  test.isTrue(EJSON.equals(
+    EJSON.parse("{\"a\": {\"$InfNaN\": 1}}"),
+    {a: Infinity}
+  ));
+  test.isTrue(EJSON.equals(
+    EJSON.parse("{\"a\": {\"$InfNaN\": 0}}"),
+    {a: NaN}
+  ));
+});
+
 Tinytest.add("ejson - clone", function (test) {
   var cloneTest = function (x, identical) {
     var y = EJSON.clone(x);

From 937bce6e5d4cbb133bc5e0797171e7cf0c14fe85 Mon Sep 17 00:00:00 2001
From: Naomi Seyfer <naomi@meteor.com>
Date: Tue, 1 Oct 2013 14:30:37 -0700
Subject: [PATCH 175/335] Fix docs

---
 docs/client/api.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/client/api.js b/docs/client/api.js
index 80b870158f..a981e8fa02 100644
--- a/docs/client/api.js
+++ b/docs/client/api.js
@@ -96,9 +96,9 @@ Template.api.ejsonStringify = {
     {name: "indent",
      type: "Boolean, Integer, or String",
      descr: "Indents objects and arrays for easy readability.  When `true`, indents by 2 spaces; when an integer, indents by that number of spaces; and when a string, uses the string as the indentation pattern."},
-    {name: "keyOrderSensitive",
+    {name: "canonical",
      type: "Boolean",
-     descr: "Stringifies in key sensitive order, when supported by the JavaScript implementation.  Without this option, object keys are emitted in sorted order."}
+     descr: "Stringifies keys in an object in sorted order.  Without this option, object keys are emitted in the native JSON stringifier's order."}
   ],
   descr: ["Serialize a value to a string.\n\nFor EJSON values, the serialization " +
           "fully represents the value. For non-EJSON values, serializes the " +

From 998e8059933fc609b02bc3a2e7f5da911b95dfbf Mon Sep 17 00:00:00 2001
From: Naomi Seyfer <naomi@meteor.com>
Date: Wed, 2 Oct 2013 11:39:13 -0700
Subject: [PATCH 176/335] more docs and history.md notes

---
 History.md         | 8 ++++++--
 docs/client/api.js | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/History.md b/History.md
index aa9a7592bc..4bec1926b2 100644
--- a/History.md
+++ b/History.md
@@ -82,11 +82,15 @@ MISC
 
 * Check that the argument to `EJSON.parse` is a string.  #1401
 
+* `EJSON.stringify` now takes options: #1136
+  - `canonical` causes objects keys to be stringified in sorted order
+  - `indent` allows formatting control over the EJSON stringification
+
+* EJSON now supports `Infinity`, `-Infinity` and `NaN`.
+
 * Better error from functions that use `Meteor._wrapAsync` (eg collection write
   methods and `HTTP` methods) and in DDP server message processing.  #1387
 
-* XXX: Does appconfig branch have any visible effects that need to be here?
-
 * Support `appcache` on Chrome for iOS.
 
 * Support literate CoffeeScript files with the extension `.coffee.md` (in
diff --git a/docs/client/api.js b/docs/client/api.js
index a981e8fa02..03c8df8c12 100644
--- a/docs/client/api.js
+++ b/docs/client/api.js
@@ -98,7 +98,7 @@ Template.api.ejsonStringify = {
      descr: "Indents objects and arrays for easy readability.  When `true`, indents by 2 spaces; when an integer, indents by that number of spaces; and when a string, uses the string as the indentation pattern."},
     {name: "canonical",
      type: "Boolean",
-     descr: "Stringifies keys in an object in sorted order.  Without this option, object keys are emitted in the native JSON stringifier's order."}
+     descr: "When `true`, stringifies keys in an object in sorted order."}
   ],
   descr: ["Serialize a value to a string.\n\nFor EJSON values, the serialization " +
           "fully represents the value. For non-EJSON values, serializes the " +
@@ -131,7 +131,7 @@ Template.api.ejsonEquals = {
   options: [
     {name: "keyOrderSensitive",
      type: "Boolean",
-     descr: "Compare in key sensitive order, if supported by the JavaScript implementation.  For example, `{a: 1, b: 2}` is not equal to `{b: 2, a: 1}` with this option, but they are equal when this option is not specified."}
+     descr: "Compare in key sensitive order, if supported by the JavaScript implementation.  For example, `{a: 1, b: 2}` is equal to `{b: 2, a: 1}` only when `keyOrderSensitive` is `false`.  The default is `false`."}
   ],
   descr: ["Return true if `a` and `b` are equal to each other.  Return false otherwise." +
           "  Uses the `equals` method on `a` if present, otherwise performs a deep comparison."]

From dec262b2394113ce7c2879aa9c6eceadd74bd1ee Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Wed, 2 Oct 2013 12:17:04 -0700
Subject: [PATCH 177/335] Document upsert (first draft)

---
 docs/client/api.html | 53 ++++++++++++++++++++++++++++----------------
 docs/client/api.js   | 35 +++++++++++++++++++++++++++--
 docs/client/docs.js  |  1 +
 3 files changed, 68 insertions(+), 21 deletions(-)

diff --git a/docs/client/api.html b/docs/client/api.html
index 9fa58c4fbb..4599ce342a 100644
--- a/docs/client/api.html
+++ b/docs/client/api.html
@@ -633,7 +633,7 @@ In this release, Minimongo has some limitations:
 of selectors.
 * `$` to denote the matched array position is not
 supported in modifier.
-* `findAndModify`, upsert, aggregate functions, and
+* `findAndModify`, aggregate functions, and
 map/reduce aren't supported.
 
 All of these will be addressed in a future release. For full
@@ -722,24 +722,27 @@ handlers and a browser's JavaScript console.
   `multi` to true, and can use an arbitrary [Mongo
   selector](#selectors) to find the documents to modify. It bypasses
   any access control rules set up by [`allow`](#allow) and
-  [`deny`](#deny).
+  [`deny`](#deny). The number of affected documents will be returned
+  from the `update` call if you don't pass a callback.
 
 - Untrusted code can only modify a single document at once, specified
   by its `_id`. The modification is allowed only after checking any
-  applicable [`allow`](#allow) and [`deny`](#deny) rules.
+  applicable [`allow`](#allow) and [`deny`](#deny) rules. The number
+  of affected documents will be returned to the callback. Untrusted
+  code cannot perform upserts, except in insecure mode.
 
 On the server, if you don't provide a callback, then `update` blocks
 until the database acknowledges the write, or throws an exception if
 something went wrong.  If you do provide a callback, `update` returns
 immediately.  Once the update completes, the callback is called with a
-single error argument in the case of failure, or no arguments if the
-update was successful.
+single error argument in the case of failure, or a second argument
+indicating the number of affected documents if the update was successful.
 
 On the client, `update` never blocks.  If you do not provide a callback
 and the update fails on the server, then Meteor will log a warning to
 the console.  If you provide a callback, Meteor will call that function
-with an error argument if there was an error, or no arguments if the
-update was successful.
+with an error argument if there was an error, or a second argument
+indicating the number of affected documents if the update was successful.
 
 Client example:
 
@@ -765,9 +768,18 @@ Server example:
       }
     });
 
-{{#warning}}
-The Mongo `upsert` feature is not implemented.
-{{/warning}}
+You can use `update` to perform a Mongo upsert by setting the `upsert`
+option to true. You can also use the [`upsert`](#upsert) method to perform an
+upsert that returns the _id of the document that was inserted (if there was one)
+in addition to the number of affected documents.
+
+{{> api_box upsert}}
+
+Modify documents that match `selector` according to `modifier`, or insert
+a document if no documents were modified. `upsert` is the same as calling
+`update` with the `upsert` option set to true, except that the return
+value of `upsert` is an object that contain the keys `numberAffected`
+and `insertedId`. (`update` returns only the number of affected documents.)
 
 {{> api_box remove}}
 
@@ -783,7 +795,8 @@ handlers and a browser's JavaScript console.
   find the documents to remove, and can remove more than one document
   at once by passing a selector that matches multiple documents. It
   bypasses any access control rules set up by [`allow`](#allow) and
-  [`deny`](#deny).
+  [`deny`](#deny). The number of removed documents will be returned
+  from `remove` if you don't pass a callback.
 
   As a safety measure, if `selector` is omitted (or is `undefined`),
   no documents will be removed. Set `selector` to `{}` if you really
@@ -791,20 +804,22 @@ handlers and a browser's JavaScript console.
 
 - Untrusted code can only remove a single document at a time,
   specified by its `_id`. The document is removed only after checking
-  any applicable [`allow`](#allow) and [`deny`](#deny) rules.
+  any applicable [`allow`](#allow) and [`deny`](#deny) rules. The
+  number of removed documents will be returned to the callback.
 
 On the server, if you don't provide a callback, then `remove` blocks
-until the database acknowledges the write, or throws an exception if
+until the database acknowledges the write and then returns the number
+of removed documents, or throws an exception if
 something went wrong.  If you do provide a callback, `remove` returns
 immediately.  Once the remove completes, the callback is called with a
-single error argument in the case of failure, or no arguments if the
-remove was successful.
+single error argument in the case of failure, or a second argument
+indicating the number of removed documents if the remove was successful.
 
 On the client, `remove` never blocks.  If you do not provide a callback
-and the remove fails on the server, then Meteor will log a warning to
-the console.  If you provide a callback, Meteor will call that function
-with an error argument if there was an error, or no arguments if the
-remove was successful.
+and the remove fails on the server, then Meteor will log a warning to the
+console.  If you provide a callback, Meteor will call that function with an
+error argument if there was an error, or a second argument indicating the number
+of removed documents if the remove was successful.
 
 Client example:
 
diff --git a/docs/client/api.js b/docs/client/api.js
index 4a7402824a..47b46062ee 100644
--- a/docs/client/api.js
+++ b/docs/client/api.js
@@ -585,7 +585,7 @@ Template.api.update = {
   id: "update",
   name: "<em>collection</em>.update(selector, modifier, [options], [callback])",
   locus: "Anywhere",
-  descr: ["Modify one or more documents in the collection"],
+  descr: ["Modify one or more documents in the collection. Returns the number of affected documents."],
   args: [
     {name: "selector",
      type: "Mongo selector, or object id",
@@ -597,7 +597,37 @@ Template.api.update = {
      descr: "Specifies how to modify the documents"},
     {name: "callback",
      type: "Function",
-     descr: "Optional.  If present, called with an error object as its argument."}
+     descr: "Optional.  If present, called with an error object as the first argument and, if no error, the number of affected documents as the second."}
+  ],
+  options: [
+    {name: "multi",
+     type: "Boolean",
+     descr: "True to modify all matching documents; false to only modify one of the matching documents (the default)."},
+    {name: "upsert",
+     type: "Boolean",
+     descr: "True to insert a document if no matching documents are found."}
+  ]
+};
+
+Template.api.upsert = {
+  id: "upsert",
+  name: "<em>collection</em>.upsert(selector, modifier, [options], [callback])",
+  locus: "Anywhere",
+  descr: ["Modify one or more documents in the collection, or insert one if no matching documents were found. " +
+          "Returns an object with keys `numberAffected` (the number of documents modified) " +
+          " and `insertedId` (the unique _id of the document that was inserted, if any)."],
+  args: [
+    {name: "selector",
+     type: "Mongo selector, or object id",
+     type_link: "selectors",
+     descr: "Specifies which documents to modify"},
+    {name: "modifier",
+     type: "Mongo modifier",
+     type_link: "modifiers",
+     descr: "Specifies how to modify the documents"},
+    {name: "callback",
+     type: "Function",
+     descr: "Optional.  If present, called with an error object as the first argument and, if no error, the number of affected documents as the second."}
   ],
   options: [
     {name: "multi",
@@ -606,6 +636,7 @@ Template.api.update = {
   ]
 };
 
+
 Template.api.remove = {
   id: "remove",
   name: "<em>collection</em>.remove(selector, [callback])",
diff --git a/docs/client/docs.js b/docs/client/docs.js
index 3ac001e554..e1ad3d6c91 100644
--- a/docs/client/docs.js
+++ b/docs/client/docs.js
@@ -155,6 +155,7 @@ var toc = [
         {instance: "collection", name: "findOne"},
         {instance: "collection", name: "insert"},
         {instance: "collection", name: "update"},
+        {instance: "collection", name: "upsert"},
         {instance: "collection", name: "remove"},
         {instance: "collection", name: "allow"},
         {instance: "collection", name: "deny"}

From 86492eececb81ac5054eb2118b447e7f0e01daed Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Wed, 2 Oct 2013 12:47:50 -0700
Subject: [PATCH 178/335] Fix simulateUpsert call indentation

---
 packages/mongo-livedata/mongo_driver.js | 35 +++++++++++--------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/packages/mongo-livedata/mongo_driver.js b/packages/mongo-livedata/mongo_driver.js
index 1e5d3f3e93..941ecbb712 100644
--- a/packages/mongo-livedata/mongo_driver.js
+++ b/packages/mongo-livedata/mongo_driver.js
@@ -338,25 +338,22 @@ MongoConnection.prototype._update = function (collection_name, selector, mod,
 
     if (options.upsert && (! knownId) && options.insertedId) {
       mongoOpts.insertedId = options.insertedId;
-      simulateUpsertWithInsertedId(collection, mongoSelector, mongoMod,
-                                   isModify, mongoOpts,
-                                   // This callback does not need to be
-                                   // bindEnvironment'ed because
-                                   // simulateUpsertWithInsertedId() wraps it
-                                   // and then passes it through
-                                   // bindEnvironmentForWrite.
-                                   function (err, result) {
-                                     // If we got here via a upsert() call, then
-                                     // options._returnObject will be set and we
-                                     // should return the whole
-                                     // object. Otherwise, we should just return
-                                     // the number of affected docs to match the
-                                     // mongo API.
-                                     if (result && ! options._returnObject)
-                                       callback(err, result.numberAffected);
-                                     else
-                                       callback(err, result);
-                                   });
+      simulateUpsertWithInsertedId(
+        collection, mongoSelector, mongoMod,
+        isModify, mongoOpts,
+        // This callback does not need to be bindEnvironment'ed because
+        // simulateUpsertWithInsertedId() wraps it and then passes it through
+        // bindEnvironmentForWrite.
+        function (err, result) {
+          // If we got here via a upsert() call, then options._returnObject will
+          // be set and we should return the whole object. Otherwise, we should
+          // just return the number of affected docs to match the mongo API.
+          if (result && ! options._returnObject)
+            callback(err, result.numberAffected);
+          else
+            callback(err, result);
+        }
+      );
     } else {
       collection.update(mongoSelector, mongoMod, mongoOpts,
                         bindEnvironmentForWrite(function (err, result, extra) {

From 420be7abc67711ea2ce1f70a89a564fa74d4f1e0 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Tue, 24 Sep 2013 15:13:04 -0700
Subject: [PATCH 179/335] First $near commit.

Workaround for weird $near + $maxDistance syntax.
---
 packages/minimongo/minimongo_tests.js | 10 ++++++++++
 packages/minimongo/selector.js        | 25 ++++++++++++++++++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/packages/minimongo/minimongo_tests.js b/packages/minimongo/minimongo_tests.js
index 46146a51ef..33683a5958 100644
--- a/packages/minimongo/minimongo_tests.js
+++ b/packages/minimongo/minimongo_tests.js
@@ -2266,3 +2266,13 @@ Tinytest.add("minimongo - count on cursor with limit", function(test){
   c.stop();
 
 });
+
+Tinytest.add("minimongo - $near operator tests", function (test) {
+  var coll = new LocalCollection();
+  coll.insert({ rest: { loc: [2, 3] } });
+  coll.insert({ rest: { loc: [-3, 3] } });
+  coll.insert({ rest: { loc: [5, 5] } });
+
+  test.equal(coll.find({ 'rest.loc': { $near: [0, 0], $maxDistance: 4 } }).count(), 3);
+});
+
diff --git a/packages/minimongo/selector.js b/packages/minimongo/selector.js
index 057e0d9195..17c0b4ee2f 100644
--- a/packages/minimongo/selector.js
+++ b/packages/minimongo/selector.js
@@ -74,8 +74,13 @@ var compileValueSelector = function (valueSelector) {
     _.each(valueSelector, function (operand, operator) {
       if (!_.has(VALUE_OPERATORS, operator))
         throw new Error("Unrecognized operator: " + operator);
+      var options = valueSelector.$options;
+      // Special case for location operators
+      if (operator === "$near")
+        options = _.extend(options || {},
+                           { $maxDistance: valueSelector.$maxDistance });
       operatorFunctions.push(VALUE_OPERATORS[operator](
-        operand, valueSelector.$options));
+        operand, options));
     });
     return function (value) {
       return _.all(operatorFunctions, function (f) {
@@ -303,6 +308,24 @@ var VALUE_OPERATORS = {
     return function (value) {
       return !matcher(value);
     };
+  },
+
+  "$near": function (operand, options) {
+    var matcher = compileValueSelector(operand);
+    var distance = options.$maxDistance;
+    if (distance === undefined)
+      distance = -1;
+    return function (value) {
+      return distance
+    };
+  },
+
+  "$maxDistance": function () {
+    // $maxDistance is always considered my $near and is
+    // ignored if the one is not present
+    return function () {
+      return true;
+    }
   }
 };
 

From 49aec0c2d483e02de537f5e760b359082988f78d Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Tue, 24 Sep 2013 17:00:07 -0700
Subject: [PATCH 180/335] Simplest possible implementation of $near. Still no
 sorting

---
 packages/minimongo/minimongo_tests.js |  3 ++-
 packages/minimongo/selector.js        | 39 ++++++++++++++++-----------
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/packages/minimongo/minimongo_tests.js b/packages/minimongo/minimongo_tests.js
index 33683a5958..32f30df33d 100644
--- a/packages/minimongo/minimongo_tests.js
+++ b/packages/minimongo/minimongo_tests.js
@@ -2273,6 +2273,7 @@ Tinytest.add("minimongo - $near operator tests", function (test) {
   coll.insert({ rest: { loc: [-3, 3] } });
   coll.insert({ rest: { loc: [5, 5] } });
 
-  test.equal(coll.find({ 'rest.loc': { $near: [0, 0], $maxDistance: 4 } }).count(), 3);
+  test.equal(coll.find({ 'rest.loc': { $near: [0, 0], $maxDistance: 30 } }).count(), 3);
+  test.equal(coll.find({ 'rest.loc': { $near: [0, 0], $maxDistance: 4 } }).count(), 1);
 });
 
diff --git a/packages/minimongo/selector.js b/packages/minimongo/selector.js
index 17c0b4ee2f..b62b764b7d 100644
--- a/packages/minimongo/selector.js
+++ b/packages/minimongo/selector.js
@@ -74,13 +74,9 @@ var compileValueSelector = function (valueSelector) {
     _.each(valueSelector, function (operand, operator) {
       if (!_.has(VALUE_OPERATORS, operator))
         throw new Error("Unrecognized operator: " + operator);
-      var options = valueSelector.$options;
       // Special case for location operators
-      if (operator === "$near")
-        options = _.extend(options || {},
-                           { $maxDistance: valueSelector.$maxDistance });
       operatorFunctions.push(VALUE_OPERATORS[operator](
-        operand, options));
+        operand, valueSelector));
     });
     return function (value) {
       return _.all(operatorFunctions, function (f) {
@@ -260,7 +256,8 @@ var VALUE_OPERATORS = {
     };
   },
 
-  "$regex": function (operand, options) {
+  "$regex": function (operand, operators) {
+    var options = operators.$options;
     if (options !== undefined) {
       // Options passed in $options (even the empty string) always overrides
       // options in the RegExp object itself. (See also
@@ -310,22 +307,32 @@ var VALUE_OPERATORS = {
     };
   },
 
-  "$near": function (operand, options) {
+  "$near": function (operand, operators) {
+    function distance (a, b) {
+      var x = a[0] - b[0];
+      var y = a[1] - b[1];
+      return Math.sqrt(x * x + y * y);
+    }
+    // Makes sure we get 2 elements array and assume the first one to be x and
+    // the second one to y no matter what user passes.
+    // In case user passes { lon: x, lat: y } returns [x, y]
+    function pointToArray (point) {
+      var npoint = [];
+      _.each(point, function (xy) { npoint.push(xy); });
+      return npoint;
+    }
     var matcher = compileValueSelector(operand);
-    var distance = options.$maxDistance;
-    if (distance === undefined)
-      distance = -1;
+    var maxDistance = operators.$maxDistance;
+    var point = pointToArray(operand);
     return function (value) {
-      return distance
+      return maxDistance === undefined ? true :
+        distance(point, pointToArray(value)) <= maxDistance;
     };
   },
 
   "$maxDistance": function () {
-    // $maxDistance is always considered my $near and is
-    // ignored if the one is not present
-    return function () {
-      return true;
-    }
+    // evaluation happens in the $near operator
+    return function () { return true; }
   }
 };
 

From 83a944fdb486348b312ee9d1d10e0e4923cd01bd Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Wed, 25 Sep 2013 08:18:16 -0700
Subject: [PATCH 181/335] In minimongo selector compilation pass along the
 whole selector and original cursor when possible.

So this information can be used by weird operators such as $near or $.
---
 packages/minimongo/minimongo.js |  8 +++---
 packages/minimongo/selector.js  | 47 ++++++++++++++++++++-------------
 2 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index 2fae504cea..3b8d64b218 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -87,11 +87,11 @@ LocalCollection.Cursor = function (collection, selector, options) {
   if (LocalCollection._selectorIsId(selector)) {
     // stash for fast path
     self.selector_id = LocalCollection._idStringify(selector);
-    self.selector_f = LocalCollection._compileSelector(selector);
+    self.selector_f = LocalCollection._compileSelector(selector, self);
     self.sort_f = undefined;
   } else {
     self.selector_id = undefined;
-    self.selector_f = LocalCollection._compileSelector(selector);
+    self.selector_f = LocalCollection._compileSelector(selector, self);
     self.sort_f = options.sort ? LocalCollection._compileSort(options.sort) : null;
   }
   self.skip = options.skip;
@@ -488,7 +488,7 @@ LocalCollection.prototype.remove = function (selector, callback) {
   var remove = [];
 
   var queriesToRecompute = [];
-  var selector_f = LocalCollection._compileSelector(selector);
+  var selector_f = LocalCollection._compileSelector(selector, self);
 
   // Avoid O(n) for "remove a single doc by ID".
   var specificIds = LocalCollection._idsMatchedBySelector(selector);
@@ -555,7 +555,7 @@ LocalCollection.prototype.update = function (selector, mod, options, callback) {
   }
   if (!options) options = {};
 
-  var selector_f = LocalCollection._compileSelector(selector);
+  var selector_f = LocalCollection._compileSelector(selector, self);
 
   // Save the original results of any query that we might need to
   // _recomputeResults on, because _modifyAndNotify will mutate the objects in
diff --git a/packages/minimongo/selector.js b/packages/minimongo/selector.js
index b62b764b7d..d2ba62cb38 100644
--- a/packages/minimongo/selector.js
+++ b/packages/minimongo/selector.js
@@ -29,7 +29,7 @@ var hasOperators = function(valueSelector) {
   return !!theseAreOperators;  // {} has no operators
 };
 
-var compileValueSelector = function (valueSelector) {
+var compileValueSelector = function (valueSelector, selector, cursor) {
   if (valueSelector == null) {  // undefined or null
     return function (value) {
       return _anyIfArray(value, function (x) {
@@ -76,7 +76,7 @@ var compileValueSelector = function (valueSelector) {
         throw new Error("Unrecognized operator: " + operator);
       // Special case for location operators
       operatorFunctions.push(VALUE_OPERATORS[operator](
-        operand, valueSelector));
+        operand, valueSelector, cursor));
     });
     return function (value) {
       return _.all(operatorFunctions, function (f) {
@@ -96,11 +96,12 @@ var compileValueSelector = function (valueSelector) {
 
 // XXX can factor out common logic below
 var LOGICAL_OPERATORS = {
-  "$and": function(subSelector) {
+  "$and": function(subSelector, _, cursor) {
     if (!isArray(subSelector) || _.isEmpty(subSelector))
       throw Error("$and/$or/$nor must be nonempty array");
     var subSelectorFunctions = _.map(
-      subSelector, compileDocumentSelector);
+      subSelector, function (selector) {
+        return compileDocumentSelector(selector, cursor); });
     return function (doc) {
       return _.all(subSelectorFunctions, function (f) {
         return f(doc);
@@ -108,11 +109,12 @@ var LOGICAL_OPERATORS = {
     };
   },
 
-  "$or": function(subSelector) {
+  "$or": function(subSelector, _, cursor) {
     if (!isArray(subSelector) || _.isEmpty(subSelector))
       throw Error("$and/$or/$nor must be nonempty array");
     var subSelectorFunctions = _.map(
-      subSelector, compileDocumentSelector);
+      subSelector, function (selector) {
+        return compileDocumentSelector(selector, cursor); });
     return function (doc) {
       return _.any(subSelectorFunctions, function (f) {
         return f(doc);
@@ -120,11 +122,12 @@ var LOGICAL_OPERATORS = {
     };
   },
 
-  "$nor": function(subSelector) {
+  "$nor": function(subSelector, _, cursor) {
     if (!isArray(subSelector) || _.isEmpty(subSelector))
       throw Error("$and/$or/$nor must be nonempty array");
     var subSelectorFunctions = _.map(
-      subSelector, compileDocumentSelector);
+      subSelector, function (selector) {
+        return compileDocumentSelector(selector, cursor); });
     return function (doc) {
       return _.all(subSelectorFunctions, function (f) {
         return !f(doc);
@@ -289,8 +292,8 @@ var VALUE_OPERATORS = {
     return function (value) { return true; };
   },
 
-  "$elemMatch": function (operand) {
-    var matcher = compileDocumentSelector(operand);
+  "$elemMatch": function (operand, selector, cursor) {
+    var matcher = compileDocumentSelector(operand, cursor);
     return function (value) {
       if (!isArray(value))
         return false;
@@ -307,8 +310,9 @@ var VALUE_OPERATORS = {
     };
   },
 
-  "$near": function (operand, operators) {
-    function distance (a, b) {
+  "$near": function (operand, operators, cursor) {
+    function distance (a, b, mode) {
+      // XXX if mode is 2dsphere, compute differently
       var x = a[0] - b[0];
       var y = a[1] - b[1];
       return Math.sqrt(x * x + y * y);
@@ -325,8 +329,11 @@ var VALUE_OPERATORS = {
     var maxDistance = operators.$maxDistance;
     var point = pointToArray(operand);
     return function (value) {
-      return maxDistance === undefined ? true :
-        distance(point, pointToArray(value)) <= maxDistance;
+      var dist = distance(point, pointToArray(value), cursor._2dMode);
+      // Used later in sorting by distance, since $near queries are sorted by
+      // distance from closest to farthest.
+      cursor._distance[value._id] = dist;
+      return maxDistance === undefined ? true : dist <= maxDistance;
     };
   },
 
@@ -566,7 +573,7 @@ LocalCollection._makeLookupFunction = function (key) {
 };
 
 // The main compilation function for a given selector.
-var compileDocumentSelector = function (docSelector) {
+var compileDocumentSelector = function (docSelector, cursor) {
   var perKeySelectors = [];
   _.each(docSelector, function (subSelector, key) {
     if (key.substr(0, 1) === '$') {
@@ -574,10 +581,12 @@ var compileDocumentSelector = function (docSelector) {
       // this function), or $where.
       if (!_.has(LOGICAL_OPERATORS, key))
         throw new Error("Unrecognized logical operator: " + key);
-      perKeySelectors.push(LOGICAL_OPERATORS[key](subSelector));
+      perKeySelectors.push(
+        LOGICAL_OPERATORS[key](subSelector, docSelector, cursor));
     } else {
       var lookUpByIndex = LocalCollection._makeLookupFunction(key);
-      var valueSelectorFunc = compileValueSelector(subSelector);
+      var valueSelectorFunc =
+        compileValueSelector(subSelector, docSelector, cursor);
       perKeySelectors.push(function (doc) {
         var branchValues = lookUpByIndex(doc);
         // We apply the selector to each "branched" value and return true if any
@@ -615,7 +624,7 @@ var compileDocumentSelector = function (docSelector) {
 // Given a selector, return a function that takes one argument, a
 // document, and returns true if the document matches the selector,
 // else false.
-LocalCollection._compileSelector = function (selector) {
+LocalCollection._compileSelector = function (selector, cursor) {
   // you can pass a literal function instead of a selector
   if (selector instanceof Function)
     return function (doc) {return selector.call(doc);};
@@ -638,7 +647,7 @@ LocalCollection._compileSelector = function (selector) {
       EJSON.isBinary(selector))
     throw new Error("Invalid selector: " + selector);
 
-  return compileDocumentSelector(selector);
+  return compileDocumentSelector(selector, cursor);
 };
 
 // Give a sort spec, which can be in any of these forms:

From 6158599ab4b34d38e55adb76ff9c0541d6eed3ef Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Wed, 25 Sep 2013 10:27:53 -0700
Subject: [PATCH 182/335] Some docs.

---
 packages/minimongo/selector.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/minimongo/selector.js b/packages/minimongo/selector.js
index d2ba62cb38..6f25aac103 100644
--- a/packages/minimongo/selector.js
+++ b/packages/minimongo/selector.js
@@ -145,6 +145,13 @@ var LOGICAL_OPERATORS = {
   }
 };
 
+// Each value operator is a function with args:
+//  - operand - Anything
+//  - operators - Object - operators on the same level (neighbours)
+//  - cursor - Object - original cursor
+// returns a function with args:
+//  - value - a value the operator is tested against
+//  - doc - the whole document tested in this query
 var VALUE_OPERATORS = {
   "$in": function (operand) {
     if (!isArray(operand))

From cd3edc6a2b609862c6ecf0ce9c49a60af2f1d86e Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Wed, 25 Sep 2013 10:29:13 -0700
Subject: [PATCH 183/335] Naming unused param as '_' wasn't the best idea.

---
 packages/minimongo/selector.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/minimongo/selector.js b/packages/minimongo/selector.js
index 6f25aac103..991b9d1418 100644
--- a/packages/minimongo/selector.js
+++ b/packages/minimongo/selector.js
@@ -96,7 +96,7 @@ var compileValueSelector = function (valueSelector, selector, cursor) {
 
 // XXX can factor out common logic below
 var LOGICAL_OPERATORS = {
-  "$and": function(subSelector, _, cursor) {
+  "$and": function(subSelector, operators, cursor) {
     if (!isArray(subSelector) || _.isEmpty(subSelector))
       throw Error("$and/$or/$nor must be nonempty array");
     var subSelectorFunctions = _.map(
@@ -109,7 +109,7 @@ var LOGICAL_OPERATORS = {
     };
   },
 
-  "$or": function(subSelector, _, cursor) {
+  "$or": function(subSelector, operators, cursor) {
     if (!isArray(subSelector) || _.isEmpty(subSelector))
       throw Error("$and/$or/$nor must be nonempty array");
     var subSelectorFunctions = _.map(
@@ -122,7 +122,7 @@ var LOGICAL_OPERATORS = {
     };
   },
 
-  "$nor": function(subSelector, _, cursor) {
+  "$nor": function(subSelector, operators, cursor) {
     if (!isArray(subSelector) || _.isEmpty(subSelector))
       throw Error("$and/$or/$nor must be nonempty array");
     var subSelectorFunctions = _.map(

From 5888a9b114fc85b6ce15fa51233deb72222d9f25 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Wed, 25 Sep 2013 11:14:04 -0700
Subject: [PATCH 184/335] Pass the whole doc and the neighbor operators around
 in minimongo selector matchers.

So various operators can look up what is the doc they are matching
---
 packages/minimongo/selector.js | 66 +++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 32 deletions(-)

diff --git a/packages/minimongo/selector.js b/packages/minimongo/selector.js
index 991b9d1418..add85e0008 100644
--- a/packages/minimongo/selector.js
+++ b/packages/minimongo/selector.js
@@ -78,9 +78,9 @@ var compileValueSelector = function (valueSelector, selector, cursor) {
       operatorFunctions.push(VALUE_OPERATORS[operator](
         operand, valueSelector, cursor));
     });
-    return function (value) {
+    return function (value, doc) {
       return _.all(operatorFunctions, function (f) {
-        return f(value);
+        return f(value, doc);
       });
     };
   }
@@ -99,12 +99,11 @@ var LOGICAL_OPERATORS = {
   "$and": function(subSelector, operators, cursor) {
     if (!isArray(subSelector) || _.isEmpty(subSelector))
       throw Error("$and/$or/$nor must be nonempty array");
-    var subSelectorFunctions = _.map(
-      subSelector, function (selector) {
-        return compileDocumentSelector(selector, cursor); });
-    return function (doc) {
+    var subSelectorFunctions = _.map(subSelector, function (selector) {
+      return compileDocumentSelector(selector, cursor); });
+    return function (doc, wholeDoc) {
       return _.all(subSelectorFunctions, function (f) {
-        return f(doc);
+        return f(doc, wholeDoc);
       });
     };
   },
@@ -112,12 +111,11 @@ var LOGICAL_OPERATORS = {
   "$or": function(subSelector, operators, cursor) {
     if (!isArray(subSelector) || _.isEmpty(subSelector))
       throw Error("$and/$or/$nor must be nonempty array");
-    var subSelectorFunctions = _.map(
-      subSelector, function (selector) {
-        return compileDocumentSelector(selector, cursor); });
-    return function (doc) {
+    var subSelectorFunctions = _.map(subSelector, function (selector) {
+      return compileDocumentSelector(selector, cursor); });
+    return function (doc, wholeDoc) {
       return _.any(subSelectorFunctions, function (f) {
-        return f(doc);
+        return f(doc, wholeDoc);
       });
     };
   },
@@ -125,12 +123,11 @@ var LOGICAL_OPERATORS = {
   "$nor": function(subSelector, operators, cursor) {
     if (!isArray(subSelector) || _.isEmpty(subSelector))
       throw Error("$and/$or/$nor must be nonempty array");
-    var subSelectorFunctions = _.map(
-      subSelector, function (selector) {
-        return compileDocumentSelector(selector, cursor); });
-    return function (doc) {
+    var subSelectorFunctions = _.map(subSelector, function (selector) {
+      return compileDocumentSelector(selector, cursor); });
+    return function (doc, wholeDoc) {
       return _.all(subSelectorFunctions, function (f) {
-        return !f(doc);
+        return !f(doc, wholeDoc);
       });
     };
   },
@@ -223,11 +220,11 @@ var VALUE_OPERATORS = {
     if (!isArray(operand))
       throw new Error("Argument to $nin must be array");
     var inFunction = VALUE_OPERATORS.$in(operand);
-    return function (value) {
+    return function (value, doc) {
       // Field doesn't exist, so it's not-in operand
       if (value === undefined)
         return true;
-      return !inFunction(value);
+      return !inFunction(value, doc);
     };
   },
 
@@ -301,19 +298,19 @@ var VALUE_OPERATORS = {
 
   "$elemMatch": function (operand, selector, cursor) {
     var matcher = compileDocumentSelector(operand, cursor);
-    return function (value) {
+    return function (value, doc) {
       if (!isArray(value))
         return false;
       return _.any(value, function (x) {
-        return matcher(x);
+        return matcher(x, doc);
       });
     };
   },
 
-  "$not": function (operand) {
-    var matcher = compileValueSelector(operand);
-    return function (value) {
-      return !matcher(value);
+  "$not": function (operand, operators, cursor) {
+    var matcher = compileValueSelector(operand, operators, cursor);
+    return function (value, doc) {
+      return !matcher(value, doc);
     };
   },
 
@@ -332,14 +329,15 @@ var VALUE_OPERATORS = {
       _.each(point, function (xy) { npoint.push(xy); });
       return npoint;
     }
-    var matcher = compileValueSelector(operand);
     var maxDistance = operators.$maxDistance;
     var point = pointToArray(operand);
-    return function (value) {
+    return function (value, doc) {
       var dist = distance(point, pointToArray(value), cursor._2dMode);
       // Used later in sorting by distance, since $near queries are sorted by
       // distance from closest to farthest.
-      cursor._distance[value._id] = dist;
+      if (!cursor._distance)
+        cursor._distance = {};
+      cursor._distance[doc._id] = dist;
       return maxDistance === undefined ? true : dist <= maxDistance;
     };
   },
@@ -594,7 +592,7 @@ var compileDocumentSelector = function (docSelector, cursor) {
       var lookUpByIndex = LocalCollection._makeLookupFunction(key);
       var valueSelectorFunc =
         compileValueSelector(subSelector, docSelector, cursor);
-      perKeySelectors.push(function (doc) {
+      perKeySelectors.push(function (doc, wholeDoc) {
         var branchValues = lookUpByIndex(doc);
         // We apply the selector to each "branched" value and return true if any
         // match. However, for "negative" selectors like $ne or $not we actually
@@ -615,15 +613,19 @@ var compileDocumentSelector = function (docSelector, cursor) {
                         (subSelector.$not || subSelector.$ne ||
                          subSelector.$nin))
               ? _.all : _.any;
-        return combiner(branchValues, valueSelectorFunc);
+        return combiner(branchValues, function (val) {
+          return valueSelectorFunc(val, wholeDoc);
+        });
       });
     }
   });
 
 
-  return function (doc) {
+  return function (doc, wholeDoc) {
+    if (wholeDoc === undefined)
+      wholeDoc = doc;
     return _.all(perKeySelectors, function (f) {
-      return f(doc);
+      return f(doc, wholeDoc);
     });
   };
 };

From 0587f3293b4a0c441ac58c88539af04fbecfbad1 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Wed, 25 Sep 2013 11:43:36 -0700
Subject: [PATCH 185/335] Sort takes into consideration the distance from given
 point on $near queries.

---
 packages/minimongo/minimongo.js       |  2 +-
 packages/minimongo/minimongo_tests.js | 12 ++++++++++++
 packages/minimongo/selector.js        | 10 ++++++++--
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index 3b8d64b218..d19b6f12cf 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -92,7 +92,7 @@ LocalCollection.Cursor = function (collection, selector, options) {
   } else {
     self.selector_id = undefined;
     self.selector_f = LocalCollection._compileSelector(selector, self);
-    self.sort_f = options.sort ? LocalCollection._compileSort(options.sort) : null;
+    self.sort_f = options.sort ? LocalCollection._compileSort(options.sort, self) : null;
   }
   self.skip = options.skip;
   self.limit = options.limit;
diff --git a/packages/minimongo/minimongo_tests.js b/packages/minimongo/minimongo_tests.js
index 32f30df33d..dd0160ba76 100644
--- a/packages/minimongo/minimongo_tests.js
+++ b/packages/minimongo/minimongo_tests.js
@@ -2275,5 +2275,17 @@ Tinytest.add("minimongo - $near operator tests", function (test) {
 
   test.equal(coll.find({ 'rest.loc': { $near: [0, 0], $maxDistance: 30 } }).count(), 3);
   test.equal(coll.find({ 'rest.loc': { $near: [0, 0], $maxDistance: 4 } }).count(), 1);
+  var points = coll.find({ 'rest.loc': { $near: [0, 0], $maxDistance: 6 } }).fetch();
+  _.each(points, function (point, i, points) {
+    test.isTrue(!i || distance([0, 0], point.rest.loc) >= distance([0, 0], points[i - 1].rest.loc));
+  });
+
+  function distance(a, b) {
+    var x = a[0] - b[0];
+    var y = a[1] - b[1];
+    return Math.sqrt(x * x + y * y);
+  }
+
+  // XXX more tests!
 });
 
diff --git a/packages/minimongo/selector.js b/packages/minimongo/selector.js
index add85e0008..726d50652d 100644
--- a/packages/minimongo/selector.js
+++ b/packages/minimongo/selector.js
@@ -672,7 +672,7 @@ LocalCollection._compileSelector = function (selector, cursor) {
 // first object comes first in order, 1 if the second object comes
 // first, or 0 if neither object comes before the other.
 
-LocalCollection._compileSort = function (spec) {
+LocalCollection._compileSort = function (spec, cursor) {
   var sortSpecParts = [];
 
   if (spec instanceof Array) {
@@ -700,8 +700,14 @@ LocalCollection._compileSort = function (spec) {
     throw Error("Bad sort specification: ", JSON.stringify(spec));
   }
 
+  // If there are no sorting rules specified, try to sort on _distance hidden
+  // fields on cursor we may acquire if query involved $near operator.
   if (sortSpecParts.length === 0)
-    return function () {return 0;};
+    return function (a, b) {
+      if (!cursor || !cursor._distance)
+        return 0;
+      return cursor._distance[a._id] - cursor._distance[b._id];
+    };
 
   // reduceValue takes in all the possible values for the sort key along various
   // branches, and returns the min or max value (according to the bool

From 1de8d392b6f6cc3c88daf9de84e26bf7c5cbd996 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Wed, 25 Sep 2013 18:07:06 -0700
Subject: [PATCH 186/335] EnsureIndex accepts 2d or 2dsphere options to
 understand what user wants in minimongo.

---
 packages/minimongo/minimongo.js | 15 +++++++++++++++
 packages/minimongo/selector.js  |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index d19b6f12cf..5301a37554 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -1175,3 +1175,18 @@ LocalCollection._compileProjection = function (fields) {
     return res;
   };
 };
+
+// This function exists for convenience of using geo-location operators such as
+// $near and doesn't actually build any indexes. Function will still throw an
+// exception if you try to ensure index on anything rather than "2d" or
+// "2dsphere" on a single field.
+LocalCollection.prototype.ensureIndex = function (keys, options) {
+  if (options || _.keys(keys).length !== 1 ||
+      !_.contains(["2d", "2dsphere"], _.values(keys)[0]))
+    throw new Error("Can only call _ensureIndex on server collections " +
+                    "(exception for geo-location indexes)");
+  
+  var self = this;
+  self._2dMode = _.values(keys)[0];
+};
+
diff --git a/packages/minimongo/selector.js b/packages/minimongo/selector.js
index 726d50652d..9d7df43146 100644
--- a/packages/minimongo/selector.js
+++ b/packages/minimongo/selector.js
@@ -332,7 +332,7 @@ var VALUE_OPERATORS = {
     var maxDistance = operators.$maxDistance;
     var point = pointToArray(operand);
     return function (value, doc) {
-      var dist = distance(point, pointToArray(value), cursor._2dMode);
+      var dist = distance(point, pointToArray(value), cursor.collection._2dMode);
       // Used later in sorting by distance, since $near queries are sorted by
       // distance from closest to farthest.
       if (!cursor._distance)

From fb7309881ddb7e6c4c58edf57536595d0d8fe167 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Fri, 27 Sep 2013 12:38:49 -0700
Subject: [PATCH 187/335] GeoJSON Utils package.

Not sure if it is good enough, let's see in later tests.
---
 packages/geojson-utils/.gitignore             |   1 +
 packages/geojson-utils/geojson-utils.js       | 382 ++++++++++++++++++
 packages/geojson-utils/geojson-utils.tests.js |  55 +++
 packages/geojson-utils/package.js             |  15 +
 4 files changed, 453 insertions(+)
 create mode 100644 packages/geojson-utils/.gitignore
 create mode 100644 packages/geojson-utils/geojson-utils.js
 create mode 100644 packages/geojson-utils/geojson-utils.tests.js
 create mode 100644 packages/geojson-utils/package.js

diff --git a/packages/geojson-utils/.gitignore b/packages/geojson-utils/.gitignore
new file mode 100644
index 0000000000..677a6fc263
--- /dev/null
+++ b/packages/geojson-utils/.gitignore
@@ -0,0 +1 @@
+.build*
diff --git a/packages/geojson-utils/geojson-utils.js b/packages/geojson-utils/geojson-utils.js
new file mode 100644
index 0000000000..59da072d4d
--- /dev/null
+++ b/packages/geojson-utils/geojson-utils.js
@@ -0,0 +1,382 @@
+(function () {
+  var gju = {};
+
+  // Export the geojson object for **CommonJS**
+  if (typeof module !== 'undefined' && module.exports) {
+    module.exports = gju;
+  }
+
+  // Export for Meteor uni-package
+  GeoJSON = gju;
+
+  // adapted from http://www.kevlindev.com/gui/math/intersection/Intersection.js
+  gju.lineStringsIntersect = function (l1, l2) {
+    var intersects = [];
+    for (var i = 0; i <= l1.coordinates.length - 2; ++i) {
+      for (var j = 0; j <= l2.coordinates.length - 2; ++j) {
+        var a1 = {
+          x: l1.coordinates[i][1],
+          y: l1.coordinates[i][0]
+        },
+          a2 = {
+            x: l1.coordinates[i + 1][1],
+            y: l1.coordinates[i + 1][0]
+          },
+          b1 = {
+            x: l2.coordinates[j][1],
+            y: l2.coordinates[j][0]
+          },
+          b2 = {
+            x: l2.coordinates[j + 1][1],
+            y: l2.coordinates[j + 1][0]
+          },
+          ua_t = (b2.x - b1.x) * (a1.y - b1.y) - (b2.y - b1.y) * (a1.x - b1.x),
+          ub_t = (a2.x - a1.x) * (a1.y - b1.y) - (a2.y - a1.y) * (a1.x - b1.x),
+          u_b = (b2.y - b1.y) * (a2.x - a1.x) - (b2.x - b1.x) * (a2.y - a1.y);
+        if (u_b != 0) {
+          var ua = ua_t / u_b,
+            ub = ub_t / u_b;
+          if (0 <= ua && ua <= 1 && 0 <= ub && ub <= 1) {
+            intersects.push({
+              'type': 'Point',
+              'coordinates': [a1.x + ua * (a2.x - a1.x), a1.y + ua * (a2.y - a1.y)]
+            });
+          }
+        }
+      }
+    }
+    if (intersects.length == 0) intersects = false;
+    return intersects;
+  }
+
+  // Bounding Box
+
+  function boundingBoxAroundPolyCoords (coords) {
+    var xAll = [], yAll = []
+
+    for (var i = 0; i < coords[0].length; i++) {
+      xAll.push(coords[0][i][1])
+      yAll.push(coords[0][i][0])
+    }
+
+    xAll = xAll.sort(function (a,b) { return a - b })
+    yAll = yAll.sort(function (a,b) { return a - b })
+
+    return [ [xAll[0], yAll[0]], [xAll[xAll.length - 1], yAll[yAll.length - 1]] ]
+  }
+
+  gju.pointInBoundingBox = function (point, bounds) {
+    return !(point.coordinates[1] < bounds[0][0] || point.coordinates[1] > bounds[1][0] || point.coordinates[0] < bounds[0][1] || point.coordinates[0] > bounds[1][1]) 
+  }
+
+  // Point in Polygon
+  // http://www.ecse.rpi.edu/Homepages/wrf/Research/Short_Notes/pnpoly.html#Listing the Vertices
+
+  function pnpoly (x,y,coords) {
+    var vert = [ [0,0] ]
+
+    for (var i = 0; i < coords.length; i++) {
+      for (var j = 0; j < coords[i].length; j++) {
+        vert.push(coords[i][j])
+      }
+      vert.push([0,0])
+    }
+
+    var inside = false
+    for (var i = 0, j = vert.length - 1; i < vert.length; j = i++) {
+      if (((vert[i][0] > y) != (vert[j][0] > y)) && (x < (vert[j][1] - vert[i][1]) * (y - vert[i][0]) / (vert[j][0] - vert[i][0]) + vert[i][1])) inside = !inside
+    }
+
+    return inside
+  }
+
+  gju.pointInPolygon = function (p, poly) {
+    var coords = (poly.type == "Polygon") ? [ poly.coordinates ] : poly.coordinates
+
+    var insideBox = false
+    for (var i = 0; i < coords.length; i++) {
+      if (gju.pointInBoundingBox(p, boundingBoxAroundPolyCoords(coords[i]))) insideBox = true
+    }
+    if (!insideBox) return false
+
+    var insidePoly = false
+    for (var i = 0; i < coords.length; i++) {
+      if (pnpoly(p.coordinates[1], p.coordinates[0], coords[i])) insidePoly = true
+    }
+
+    return insidePoly
+  }
+
+  gju.numberToRadius = function (number) {
+    return number * Math.PI / 180;
+  }
+
+  gju.numberToDegree = function (number) {
+    return number * 180 / Math.PI;
+  }
+
+  // written with help from @tautologe
+  gju.drawCircle = function (radiusInMeters, centerPoint, steps) {
+    var center = [centerPoint.coordinates[1], centerPoint.coordinates[0]],
+      dist = (radiusInMeters / 1000) / 6371,
+      // convert meters to radiant
+      radCenter = [gju.numberToRadius(center[0]), gju.numberToRadius(center[1])],
+      steps = steps || 15,
+      // 15 sided circle
+      poly = [[center[0], center[1]]];
+    for (var i = 0; i < steps; i++) {
+      var brng = 2 * Math.PI * i / steps;
+      var lat = Math.asin(Math.sin(radCenter[0]) * Math.cos(dist)
+              + Math.cos(radCenter[0]) * Math.sin(dist) * Math.cos(brng));
+      var lng = radCenter[1] + Math.atan2(Math.sin(brng) * Math.sin(dist) * Math.cos(radCenter[0]),
+                                          Math.cos(dist) - Math.sin(radCenter[0]) * Math.sin(lat));
+      poly[i] = [];
+      poly[i][1] = gju.numberToDegree(lat);
+      poly[i][0] = gju.numberToDegree(lng);
+    }
+    return {
+      "type": "Polygon",
+      "coordinates": [poly]
+    };
+  }
+
+  // assumes rectangle starts at lower left point
+  gju.rectangleCentroid = function (rectangle) {
+    var bbox = rectangle.coordinates[0];
+    var xmin = bbox[0][0],
+      ymin = bbox[0][1],
+      xmax = bbox[2][0],
+      ymax = bbox[2][1];
+    var xwidth = xmax - xmin;
+    var ywidth = ymax - ymin;
+    return {
+      'type': 'Point',
+      'coordinates': [xmin + xwidth / 2, ymin + ywidth / 2]
+    };
+  }
+
+  // from http://www.movable-type.co.uk/scripts/latlong.html
+  gju.pointDistance = function (pt1, pt2) {
+    var lon1 = pt1.coordinates[1],
+      lat1 = pt1.coordinates[0],
+      lon2 = pt2.coordinates[1],
+      lat2 = pt2.coordinates[0],
+      dLat = gju.numberToRadius(lat2 - lat1),
+      dLon = gju.numberToRadius(lon2 - lon1),
+      a = Math.pow(Math.sin(dLat / 2), 2) + Math.cos(gju.numberToRadius(lat1))
+        * Math.cos(gju.numberToRadius(lat2)) * Math.pow(Math.sin(dLon / 2), 2),
+      c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+    return (6371 * c) * 1000; // returns meters
+  },
+
+  // checks if geometry lies entirely within a circle
+  // works with Point, LineString, Polygon
+  gju.geometryWithinRadius = function (geometry, center, radius) {
+    if (geometry.type == 'Point') {
+      return gju.pointDistance(geometry, center) <= radius;
+    } else if (geometry.type == 'LineString' || geometry.type == 'Polygon') {
+      var point = {};
+      var coordinates;
+      if (geometry.type == 'Polygon') {
+        // it's enough to check the exterior ring of the Polygon
+        coordinates = geometry.coordinates[0];
+      } else {
+        coordinates = geometry.coordinates;
+      }
+      for (var i in coordinates) {
+        point.coordinates = coordinates[i];
+        if (gju.pointDistance(point, center) > radius) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+
+  // adapted from http://paulbourke.net/geometry/polyarea/javascript.txt
+  gju.area = function (polygon) {
+    var area = 0;
+    // TODO: polygon holes at coordinates[1]
+    var points = polygon.coordinates[0];
+    var j = points.length - 1;
+    var p1, p2;
+
+    for (var i = 0; i < points.length; j = i++) {
+      var p1 = {
+        x: points[i][1],
+        y: points[i][0]
+      };
+      var p2 = {
+        x: points[j][1],
+        y: points[j][0]
+      };
+      area += p1.x * p2.y;
+      area -= p1.y * p2.x;
+    }
+
+    area /= 2;
+    return area;
+  },
+
+  // adapted from http://paulbourke.net/geometry/polyarea/javascript.txt
+  gju.centroid = function (polygon) {
+    var f, x = 0,
+      y = 0;
+    // TODO: polygon holes at coordinates[1]
+    var points = polygon.coordinates[0];
+    var j = points.length - 1;
+    var p1, p2;
+
+    for (var i = 0; i < points.length; j = i++) {
+      var p1 = {
+        x: points[i][1],
+        y: points[i][0]
+      };
+      var p2 = {
+        x: points[j][1],
+        y: points[j][0]
+      };
+      f = p1.x * p2.y - p2.x * p1.y;
+      x += (p1.x + p2.x) * f;
+      y += (p1.y + p2.y) * f;
+    }
+
+    f = gju.area(polygon) * 6;
+    return {
+      'type': 'Point',
+      'coordinates': [y / f, x / f]
+    };
+  },
+
+  gju.simplify = function (source, kink) { /* source[] array of geojson points */
+    /* kink	in metres, kinks above this depth kept  */
+    /* kink depth is the height of the triangle abc where a-b and b-c are two consecutive line segments */
+    kink = kink || 20;
+    source = source.map(function (o) {
+      return {
+        lng: o.coordinates[0],
+        lat: o.coordinates[1]
+      }
+    });
+
+    var n_source, n_stack, n_dest, start, end, i, sig;
+    var dev_sqr, max_dev_sqr, band_sqr;
+    var x12, y12, d12, x13, y13, d13, x23, y23, d23;
+    var F = (Math.PI / 180.0) * 0.5;
+    var index = new Array(); /* aray of indexes of source points to include in the reduced line */
+    var sig_start = new Array(); /* indices of start & end of working section */
+    var sig_end = new Array();
+
+    /* check for simple cases */
+
+    if (source.length < 3) return (source); /* one or two points */
+
+    /* more complex case. initialize stack */
+
+    n_source = source.length;
+    band_sqr = kink * 360.0 / (2.0 * Math.PI * 6378137.0); /* Now in degrees */
+    band_sqr *= band_sqr;
+    n_dest = 0;
+    sig_start[0] = 0;
+    sig_end[0] = n_source - 1;
+    n_stack = 1;
+
+    /* while the stack is not empty  ... */
+    while (n_stack > 0) {
+
+      /* ... pop the top-most entries off the stacks */
+
+      start = sig_start[n_stack - 1];
+      end = sig_end[n_stack - 1];
+      n_stack--;
+
+      if ((end - start) > 1) { /* any intermediate points ? */
+
+        /* ... yes, so find most deviant intermediate point to
+        either side of line joining start & end points */
+
+        x12 = (source[end].lng() - source[start].lng());
+        y12 = (source[end].lat() - source[start].lat());
+        if (Math.abs(x12) > 180.0) x12 = 360.0 - Math.abs(x12);
+        x12 *= Math.cos(F * (source[end].lat() + source[start].lat())); /* use avg lat to reduce lng */
+        d12 = (x12 * x12) + (y12 * y12);
+
+        for (i = start + 1, sig = start, max_dev_sqr = -1.0; i < end; i++) {
+
+          x13 = source[i].lng() - source[start].lng();
+          y13 = source[i].lat() - source[start].lat();
+          if (Math.abs(x13) > 180.0) x13 = 360.0 - Math.abs(x13);
+          x13 *= Math.cos(F * (source[i].lat() + source[start].lat()));
+          d13 = (x13 * x13) + (y13 * y13);
+
+          x23 = source[i].lng() - source[end].lng();
+          y23 = source[i].lat() - source[end].lat();
+          if (Math.abs(x23) > 180.0) x23 = 360.0 - Math.abs(x23);
+          x23 *= Math.cos(F * (source[i].lat() + source[end].lat()));
+          d23 = (x23 * x23) + (y23 * y23);
+
+          if (d13 >= (d12 + d23)) dev_sqr = d23;
+          else if (d23 >= (d12 + d13)) dev_sqr = d13;
+          else dev_sqr = (x13 * y12 - y13 * x12) * (x13 * y12 - y13 * x12) / d12; // solve triangle
+          if (dev_sqr > max_dev_sqr) {
+            sig = i;
+            max_dev_sqr = dev_sqr;
+          }
+        }
+
+        if (max_dev_sqr < band_sqr) { /* is there a sig. intermediate point ? */
+          /* ... no, so transfer current start point */
+          index[n_dest] = start;
+          n_dest++;
+        } else { /* ... yes, so push two sub-sections on stack for further processing */
+          n_stack++;
+          sig_start[n_stack - 1] = sig;
+          sig_end[n_stack - 1] = end;
+          n_stack++;
+          sig_start[n_stack - 1] = start;
+          sig_end[n_stack - 1] = sig;
+        }
+      } else { /* ... no intermediate points, so transfer current start point */
+        index[n_dest] = start;
+        n_dest++;
+      }
+    }
+
+    /* transfer last point */
+    index[n_dest] = n_source - 1;
+    n_dest++;
+
+    /* make return array */
+    var r = new Array();
+    for (var i = 0; i < n_dest; i++)
+      r.push(source[index[i]]);
+
+    return r.map(function (o) {
+      return {
+        type: "Point",
+        coordinates: [o.lng, o.lat]
+      }
+    });
+  }
+
+  // http://www.movable-type.co.uk/scripts/latlong.html#destPoint
+  gju.destinationPoint = function (pt, brng, dist) {
+    dist = dist/6371;  // convert dist to angular distance in radians
+    brng = gju.numberToRadius(brng);
+
+    var lat1 = gju.numberToRadius(pt.coordinates[0]);
+    var lon1 = gju.numberToRadius(pt.coordinates[1]);
+
+    var lat2 = Math.asin( Math.sin(lat1)*Math.cos(dist) +
+                          Math.cos(lat1)*Math.sin(dist)*Math.cos(brng) );
+    var lon2 = lon1 + Math.atan2(Math.sin(brng)*Math.sin(dist)*Math.cos(lat1),
+                                 Math.cos(dist)-Math.sin(lat1)*Math.sin(lat2));
+    lon2 = (lon2+3*Math.PI) % (2*Math.PI) - Math.PI;  // normalise to -180..+180º
+
+    return {
+      'type': 'Point',
+      'coordinates': [gju.numberToDegree(lat2), gju.numberToDegree(lon2)]
+    };
+  };
+
+})();
diff --git a/packages/geojson-utils/geojson-utils.tests.js b/packages/geojson-utils/geojson-utils.tests.js
new file mode 100644
index 0000000000..38a2ce9ea1
--- /dev/null
+++ b/packages/geojson-utils/geojson-utils.tests.js
@@ -0,0 +1,55 @@
+var gju = GeoJSON;
+
+Tinytest.add("geojson-utils - line intersects", function (test) {
+  var diagonalUp = { "type": "LineString","coordinates": [
+    [0, 0], [10, 10]
+  ]}
+  var diagonalDown = { "type": "LineString","coordinates": [
+    [10, 0], [0, 10]
+  ]}
+  var farAway = { "type": "LineString","coordinates": [
+    [100, 100], [110, 110]
+  ]}
+
+  test.isTrue(gju.lineStringsIntersect(diagonalUp, diagonalDown));
+  test.isFalse(gju.lineStringsIntersect(diagonalUp, farAway));
+});
+
+// Used by two tests
+var box = {
+  "type": "Polygon",
+  "coordinates": [
+    [ [0, 0], [10, 0], [10, 10], [0, 10] ]
+  ]
+};
+
+Tinytest.add("geojson-utils - inside/outside of the box", function (test) {
+
+  var inBox = {"type": "Point", "coordinates": [5, 5]}
+  var outBox = {"type": "Point", "coordinates": [15, 15]}
+
+  test.isTrue(gju.pointInPolygon(inBox, box));
+  test.isFalse(gju.pointInPolygon(outBox, box));
+});
+
+Tinytest.add("geojson-utils - drawCircle", function (test) {
+  test.length(gju.drawCircle(10, {"type": "Point", "coordinates": [0, 0]}).
+               coordinates[0], 15);
+  test.length(gju.drawCircle(10, {"type": "Point", "coordinates": [0, 0]}, 50).
+              coordinates[0], 50);
+});
+
+Tinytest.add("geojson-utils - centroid", function (test) {
+  var centroid = gju.rectangleCentroid(box)
+  test.equal(centroid.coordinates[0], 5);
+  test.equal(centroid.coordinates[1], 5);
+});
+
+Tinytest.add("geojson-utils - point distance", function (test) {
+  var fairyLand = {"type": "Point",
+    "coordinates": [37.80919060818706, -122.260000705719]}
+  var navalBase = {"type": "Point",
+    "coordinates": [37.78774223089045, -122.32083320617676]}
+  test.equal(Math.floor(gju.pointDistance(fairyLand, navalBase)), 5852);
+});
+
diff --git a/packages/geojson-utils/package.js b/packages/geojson-utils/package.js
new file mode 100644
index 0000000000..d687834461
--- /dev/null
+++ b/packages/geojson-utils/package.js
@@ -0,0 +1,15 @@
+Package.describe({
+  summary: "Meteor's client-side datastore: a port of MongoDB to Javascript",
+  internal: true
+});
+
+Package.on_use(function (api) {
+  api.export('GeoJSON');
+  api.add_files(['geojson-utils.js']);
+});
+
+Package.on_test(function (api) {
+  api.use('tinytest');
+  api.add_files(['geojson-utils.js', 'geojson-utils.tests.js'], 'client');
+});
+

From a1a555558a6a02ba7e7f2b997c6716b863577f99 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Fri, 27 Sep 2013 14:24:24 -0700
Subject: [PATCH 188/335] Comment on constant in distance calculations.

---
 packages/geojson-utils/geojson-utils.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/geojson-utils/geojson-utils.js b/packages/geojson-utils/geojson-utils.js
index 59da072d4d..af33fe6284 100644
--- a/packages/geojson-utils/geojson-utils.js
+++ b/packages/geojson-utils/geojson-utils.js
@@ -166,6 +166,7 @@
       a = Math.pow(Math.sin(dLat / 2), 2) + Math.cos(gju.numberToRadius(lat1))
         * Math.cos(gju.numberToRadius(lat2)) * Math.pow(Math.sin(dLon / 2), 2),
       c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+    // Earth radius is 6371 km
     return (6371 * c) * 1000; // returns meters
   },
 

From d68661192f9f9b034fd8e4d284498a26a58ddb65 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Fri, 27 Sep 2013 14:54:56 -0700
Subject: [PATCH 189/335] Imply GeoJSON Utils package and use it to calculate
 distance between geojson objects.

---
 packages/minimongo/minimongo.js |  5 ++++-
 packages/minimongo/package.js   |  3 +++
 packages/minimongo/selector.js  | 33 +++++++++++++++++++++++++++++----
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index 5301a37554..9b739b15cf 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -1185,8 +1185,11 @@ LocalCollection.prototype.ensureIndex = function (keys, options) {
       !_.contains(["2d", "2dsphere"], _.values(keys)[0]))
     throw new Error("Can only call _ensureIndex on server collections " +
                     "(exception for geo-location indexes)");
-  
+
   var self = this;
   self._2dMode = _.values(keys)[0];
+
+  if (self._2dMode === "2dsphere" && GeoJSON === undefined)
+    throw new Error("Need geojson-utils package for GeoJSON calculations");
 };
 
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index 7502f33d08..51e0217ec4 100644
--- a/packages/minimongo/package.js
+++ b/packages/minimongo/package.js
@@ -7,6 +7,8 @@ Package.on_use(function (api) {
   api.export('LocalCollection');
   api.use(['underscore', 'json', 'ejson', 'ordered-dict', 'deps',
            'random', 'ordered-dict']);
+  // If you really want geolocation queries to work, add this package
+  api.imply('geojson-utils');
   api.add_files([
     'minimongo.js',
     'selector.js',
@@ -18,6 +20,7 @@ Package.on_use(function (api) {
 
 Package.on_test(function (api) {
   api.use('minimongo', 'client');
+  api.use('geojson-utils', 'client');
   api.use('test-helpers', 'client');
   api.use(['tinytest', 'underscore', 'ejson', 'ordered-dict',
            'random', 'deps']);
diff --git a/packages/minimongo/selector.js b/packages/minimongo/selector.js
index 9d7df43146..3e5557e3d2 100644
--- a/packages/minimongo/selector.js
+++ b/packages/minimongo/selector.js
@@ -315,10 +315,13 @@ var VALUE_OPERATORS = {
   },
 
   "$near": function (operand, operators, cursor) {
-    function distance (a, b, mode) {
-      // XXX if mode is 2dsphere, compute differently
+    function distanceCoordinatePairs (a, b) {
+      a = pointToArray(a);
+      b = pointToArray(b);
       var x = a[0] - b[0];
       var y = a[1] - b[1];
+      if (_.isNaN(x) || _.isNan(y))
+        return null;
       return Math.sqrt(x * x + y * y);
     }
     // Makes sure we get 2 elements array and assume the first one to be x and
@@ -330,14 +333,36 @@ var VALUE_OPERATORS = {
       return npoint;
     }
     var maxDistance = operators.$maxDistance;
-    var point = pointToArray(operand);
+    var point = operand;
     return function (value, doc) {
-      var dist = distance(point, pointToArray(value), cursor.collection._2dMode);
+      var dist = null;
+      switch (cursor.collection._2dMode) {
+        case "2d":
+          dist = distanceCoordinatePairs(point, value);
+          break;
+        case "2dsphere":
+          // XXX: for now, we don't calculate the actual distance between, say,
+          // polygon and circle. If people care about this use-case it will get
+          // a priority.
+          if (value.type === "Point")
+            dist = GeoJSON.pointDistance(point, value);
+          else
+            dist = GeoJSON.geometryWithinRadius(value, point, maxDistance) ?
+                     0 : maxDistance + 1;
+          break;
+        default:
+          throw new Error("Unknown mode for distance calculations.");
+      }
       // Used later in sorting by distance, since $near queries are sorted by
       // distance from closest to farthest.
       if (!cursor._distance)
         cursor._distance = {};
       cursor._distance[doc._id] = dist;
+
+      // Distance couldn't parse a geometry object
+      if (dist === null)
+        return false;
+
       return maxDistance === undefined ? true : dist <= maxDistance;
     };
   },

From b5230e6fee347901bf0e5a79e56d64ca132489e6 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Fri, 27 Sep 2013 14:59:51 -0700
Subject: [PATCH 190/335] Fix package's description

---
 packages/geojson-utils/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/geojson-utils/package.js b/packages/geojson-utils/package.js
index d687834461..15d3fd3f7a 100644
--- a/packages/geojson-utils/package.js
+++ b/packages/geojson-utils/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  summary: "Meteor's client-side datastore: a port of MongoDB to Javascript",
+  summary: 'GeoJSON utility functions',
   internal: true
 });
 

From 8fa42acdbe18a0c954e67918a5323bb48110b542 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Fri, 27 Sep 2013 15:02:17 -0700
Subject: [PATCH 191/335] Calculation method by default is 2d

---
 packages/minimongo/selector.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/minimongo/selector.js b/packages/minimongo/selector.js
index 3e5557e3d2..281ada3329 100644
--- a/packages/minimongo/selector.js
+++ b/packages/minimongo/selector.js
@@ -320,7 +320,7 @@ var VALUE_OPERATORS = {
       b = pointToArray(b);
       var x = a[0] - b[0];
       var y = a[1] - b[1];
-      if (_.isNaN(x) || _.isNan(y))
+      if (_.isNaN(x) || _.isNaN(y))
         return null;
       return Math.sqrt(x * x + y * y);
     }
@@ -336,7 +336,7 @@ var VALUE_OPERATORS = {
     var point = operand;
     return function (value, doc) {
       var dist = null;
-      switch (cursor.collection._2dMode) {
+      switch (cursor.collection._2dMode || "2d") {
         case "2d":
           dist = distanceCoordinatePairs(point, value);
           break;

From a5534ca414bd5ce23a7edbb47e0686a52c50c12c Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Fri, 27 Sep 2013 15:53:25 -0700
Subject: [PATCH 192/335] A lot of generated tests to actually make sure
 distance is correct.

---
 packages/geojson-utils/geojson-utils.js       |  8 ++---
 packages/geojson-utils/geojson-utils.tests.js | 30 +++++++++++++++++--
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/packages/geojson-utils/geojson-utils.js b/packages/geojson-utils/geojson-utils.js
index af33fe6284..28ce187606 100644
--- a/packages/geojson-utils/geojson-utils.js
+++ b/packages/geojson-utils/geojson-utils.js
@@ -157,10 +157,10 @@
 
   // from http://www.movable-type.co.uk/scripts/latlong.html
   gju.pointDistance = function (pt1, pt2) {
-    var lon1 = pt1.coordinates[1],
-      lat1 = pt1.coordinates[0],
-      lon2 = pt2.coordinates[1],
-      lat2 = pt2.coordinates[0],
+    var lon1 = pt1.coordinates[0],
+      lat1 = pt1.coordinates[1],
+      lon2 = pt2.coordinates[0],
+      lat2 = pt2.coordinates[1],
       dLat = gju.numberToRadius(lat2 - lat1),
       dLon = gju.numberToRadius(lon2 - lon1),
       a = Math.pow(Math.sin(dLat / 2), 2) + Math.cos(gju.numberToRadius(lat1))
diff --git a/packages/geojson-utils/geojson-utils.tests.js b/packages/geojson-utils/geojson-utils.tests.js
index 38a2ce9ea1..5aae2f7d4f 100644
--- a/packages/geojson-utils/geojson-utils.tests.js
+++ b/packages/geojson-utils/geojson-utils.tests.js
@@ -47,9 +47,35 @@ Tinytest.add("geojson-utils - centroid", function (test) {
 
 Tinytest.add("geojson-utils - point distance", function (test) {
   var fairyLand = {"type": "Point",
-    "coordinates": [37.80919060818706, -122.260000705719]}
+    "coordinates": [-122.260000705719, 37.80919060818706]}
   var navalBase = {"type": "Point",
-    "coordinates": [37.78774223089045, -122.32083320617676]}
+    "coordinates": [-122.32083320617676, 37.78774223089045]}
   test.equal(Math.floor(gju.pointDistance(fairyLand, navalBase)), 5852);
 });
 
+Tinytest.add("geojson-utils - points distance generated tests", function (test) {
+  var floatEqual = function (a, b) {
+    test.isTrue(Math.abs(a - b) < 0.000001);
+  };
+  floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[-19.416501816827804,-13.442164216190577]} , {"type":"Point","coordinates":[8.694866622798145,-8.511979941977188]} ),  3115066.2536578891 );
+floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[151.2841189110186,-56.14564002258703]} , {"type":"Point","coordinates":[167.77983197313733,0.05544793023727834]} ),  6423493.2321747802 );
+floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[100.28413630579598,-88.02313695591874]} , {"type":"Point","coordinates":[36.48786173714325,53.44207073468715]} ),  15848950.0402601473 );
+floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[-70.34899035631679,76.51596869179048]} , {"type":"Point","coordinates":[154.91605914011598,-73.60970971290953]} ),  18714226.5425080135 );
+floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[96.28682994353585,58.77288202662021]} , {"type":"Point","coordinates":[-118.33936230326071,72.07877089688554]} ),  5223022.7731127860 );
+floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[140.35530551429838,10.507104953983799]} , {"type":"Point","coordinates":[-67.73368513956666,38.075836981181055]} ),  13874476.3135112207 );
+floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[69.55582775664516,86.25450283149257]} , {"type":"Point","coordinates":[-18.446230484172702,6.116170521359891]} ),  9314403.3309389465 );
+floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[163.83647522330284,-65.7211532376241]} , {"type":"Point","coordinates":[-159.2198902608361,-78.42975475382991]} ),  1831929.5917785936 );
+floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[-178.9383797585033,-54.87420454365201]} , {"type":"Point","coordinates":[-175.35227065649815,-84.04084282391705]} ),  3244710.9344544266 );
+floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[-48.63219943456352,11.284161149058491]} , {"type":"Point","coordinates":[-179.12627786491066,-51.95622375886887]} ),  13691492.4666933995 );
+floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[140.29684206470847,-67.20720696030185]} , {"type":"Point","coordinates":[-109.37452355003916,36.03131077555008]} ),  14525055.6462231465 );
+floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[-154.6698773431126,58.322094617411494]} , {"type":"Point","coordinates":[61.18583445576951,-4.3424885796848685]} ),  13261602.4336371962 );
+floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[122.5562841903884,10.43972848681733]} , {"type":"Point","coordinates":[-11.756078708684072,-43.86124441982247]} ),  14275427.5511620939 );
+floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[-67.91648306301795,-86.38826347864233]} , {"type":"Point","coordinates":[163.577536230674,12.987319261068478]} ),  11699799.3615680672 );
+floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[91.65140007715672,17.595150742679834]} , {"type":"Point","coordinates":[135.80393003183417,22.307532118167728]} ),  4628773.1129429890 );
+floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[-112.70280818711035,34.45729674655013]} , {"type":"Point","coordinates":[-127.42168210959062,-25.51327457977459]} ),  6846704.0253010122 );
+floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[-161.55807900894433,-77.40711871231906]} , {"type":"Point","coordinates":[-92.66313794790767,-89.12077954714186]} ),  1368055.9401701286 );
+floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[39.966264681424946,9.890176948625594]} , {"type":"Point","coordinates":[-159.88646019320004,40.60383598925546]} ),  14041503.0409814864 );
+floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[-57.48232689569704,86.64061016729102]} , {"type":"Point","coordinates":[59.53941993578337,-75.73194969259202]} ),  18560499.7346975356 );
+floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[-142.0938081513159,80.76813141163439]} , {"type":"Point","coordinates":[14.891517050098628,64.56322408467531]} ),  3793112.6186894816 );
+});
+

From 9b8971ede65c9755f4662c58628137c8454aeb56 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Fri, 27 Sep 2013 16:58:38 -0700
Subject: [PATCH 193/335] Proved to have working api for 2dsphere.

---
 packages/minimongo/minimongo.js | 2 +-
 packages/minimongo/selector.js  | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index 9b739b15cf..8f71186d1a 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -1180,7 +1180,7 @@ LocalCollection._compileProjection = function (fields) {
 // $near and doesn't actually build any indexes. Function will still throw an
 // exception if you try to ensure index on anything rather than "2d" or
 // "2dsphere" on a single field.
-LocalCollection.prototype.ensureIndex = function (keys, options) {
+LocalCollection.prototype._ensureIndex = function (keys, options) {
   if (options || _.keys(keys).length !== 1 ||
       !_.contains(["2d", "2dsphere"], _.values(keys)[0]))
     throw new Error("Can only call _ensureIndex on server collections " +
diff --git a/packages/minimongo/selector.js b/packages/minimongo/selector.js
index 281ada3329..46b4f25915 100644
--- a/packages/minimongo/selector.js
+++ b/packages/minimongo/selector.js
@@ -332,11 +332,12 @@ var VALUE_OPERATORS = {
       _.each(point, function (xy) { npoint.push(xy); });
       return npoint;
     }
-    var maxDistance = operators.$maxDistance;
-    var point = operand;
+    var mode = cursor.collection._2dMode || "2d";
+    var maxDistance = mode === "2d" ? operators.$maxDistance : operand.$maxDistance;
+    var point = mode === "2d" ? operand : operand.$geometry;
     return function (value, doc) {
       var dist = null;
-      switch (cursor.collection._2dMode || "2d") {
+      switch (mode) {
         case "2d":
           dist = distanceCoordinatePairs(point, value);
           break;
@@ -351,7 +352,7 @@ var VALUE_OPERATORS = {
                      0 : maxDistance + 1;
           break;
         default:
-          throw new Error("Unknown mode for distance calculations.");
+          throw new Error("Unknown mode for distance calculations: " + mode);
       }
       // Used later in sorting by distance, since $near queries are sorted by
       // distance from closest to farthest.

From 3f976e874f0e34e06f5c6e8ab240f73e2c1a64f7 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Fri, 27 Sep 2013 17:14:40 -0700
Subject: [PATCH 194/335] Let _compileSort handle empty sorting rules. So the
 line that says: "sort by distance by default" will work

---
 packages/minimongo/minimongo.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index 8f71186d1a..57bb896461 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -92,7 +92,7 @@ LocalCollection.Cursor = function (collection, selector, options) {
   } else {
     self.selector_id = undefined;
     self.selector_f = LocalCollection._compileSelector(selector, self);
-    self.sort_f = options.sort ? LocalCollection._compileSort(options.sort, self) : null;
+    self.sort_f = LocalCollection._compileSort(options.sort || [], self);
   }
   self.skip = options.skip;
   self.limit = options.limit;

From 3e6da8b2666532c0f9fd7bc5c05a6a295aa606e7 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Fri, 27 Sep 2013 17:35:07 -0700
Subject: [PATCH 195/335] Don't mess the sorting unless it's a geo query

---
 packages/minimongo/minimongo.js | 9 ++++++++-
 packages/minimongo/selector.js  | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index 57bb896461..6f1f3ec886 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -92,7 +92,8 @@ LocalCollection.Cursor = function (collection, selector, options) {
   } else {
     self.selector_id = undefined;
     self.selector_f = LocalCollection._compileSelector(selector, self);
-    self.sort_f = LocalCollection._compileSort(options.sort || [], self);
+    self.sort_f = (isGeoQuery(selector) || options.sort) ?
+      LocalCollection._compileSort(options.sort || [], self) : null;
   }
   self.skip = options.skip;
   self.limit = options.limit;
@@ -1193,3 +1194,9 @@ LocalCollection.prototype._ensureIndex = function (keys, options) {
     throw new Error("Need geojson-utils package for GeoJSON calculations");
 };
 
+var isGeoQuery = function (selector) {
+  return _.any(selector, function (val, key) {
+    return key === "$near" || (_.isObject(val) && isGeoQuery(val));
+  });
+};
+
diff --git a/packages/minimongo/selector.js b/packages/minimongo/selector.js
index 46b4f25915..3ccf462a27 100644
--- a/packages/minimongo/selector.js
+++ b/packages/minimongo/selector.js
@@ -785,3 +785,4 @@ LocalCollection._compileSort = function (spec, cursor) {
     return 0;
   };
 };
+

From 638dd0566b389e9ed9d627c06c72c75768f39ab1 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Fri, 27 Sep 2013 18:00:27 -0700
Subject: [PATCH 196/335] More tests. And weakly depend, not imply!

---
 packages/minimongo/minimongo.js       |  2 +-
 packages/minimongo/minimongo_tests.js | 28 ++++++++++++++++++++++++++-
 packages/minimongo/package.js         |  4 ++--
 packages/minimongo/selector.js        |  3 +++
 4 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index 6f1f3ec886..67f5929f83 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -1190,7 +1190,7 @@ LocalCollection.prototype._ensureIndex = function (keys, options) {
   var self = this;
   self._2dMode = _.values(keys)[0];
 
-  if (self._2dMode === "2dsphere" && GeoJSON === undefined)
+  if (self._2dMode === "2dsphere" && !Package['geojson-utils'])
     throw new Error("Need geojson-utils package for GeoJSON calculations");
 };
 
diff --git a/packages/minimongo/minimongo_tests.js b/packages/minimongo/minimongo_tests.js
index dd0160ba76..3469d50b50 100644
--- a/packages/minimongo/minimongo_tests.js
+++ b/packages/minimongo/minimongo_tests.js
@@ -2286,6 +2286,32 @@ Tinytest.add("minimongo - $near operator tests", function (test) {
     return Math.sqrt(x * x + y * y);
   }
 
-  // XXX more tests!
+  // GeoJSON tests
+  coll = new LocalCollection();
+  var data = [{ "category" : "LARCENY/THEFT", "descript" : "GRAND THEFT OF PROPERTY", "address" : "900 Block of MINNA ST", "location" : { "type" : "Point", "coordinates" : [  -122.41538270191,  37.774683628213 ] }, "_id" : "eRHmRvNtHbCjNw6ox" },
+    { "category" : "LARCENY/THEFT", "descript" : "PETTY THEFT FROM LOCKED AUTO", "address" : "900 Block of MINNA ST", "location" : { "type" : "Point", "coordinates" : [  -122.415386041221,  37.7747879744156 ] }, "_id" : "fc9KktqwLcfKaKBDr" },
+    { "category" : "OTHER OFFENSES", "descript" : "POSSESSION OF BURGLARY TOOLS", "address" : "900 Block of MINNA ST", "location" : { "type" : "Point", "coordinates" : [  -122.415386041221,  37.7747879744156 ] }, "_id" : "fr2gw6x8agCXwcKkK" },
+    { "category" : "WEAPON LAWS", "descript" : "POSS OF PROHIBITED WEAPON", "address" : "900 Block of MINNA ST", "location" : { "type" : "Point", "coordinates" : [  -122.415386041221,  37.7747879744156 ] }, "_id" : "nn3oaDPoeGC5JwqsS" },
+  { "category" : "BURGLARY", "descript" : "BURGLARY OF STORE, FORCIBLE ENTRY", "address" : "100 Block of 10TH ST", "location" : { "type" : "Point", "coordinates" : [  -122.415449723856,  37.7749518087273 ] }, "_id" : "qm2F7wnB5D6yjKBNn" }];
+
+  _.each(data, function (x) { coll.insert(x); });
+  coll._ensureIndex({ location: "2dsphere" });
+
+  var close15 = coll.find({ location: { $near: {
+    $geometry: { type: "Point",
+                 coordinates: [-122.4154282, 37.7746115] },
+    $maxDistance: 15 } } }).fetch();
+  test.length(close15, 1);
+  test.equal(close15[0].descript, "GRAND THEFT OF PROPERTY");
+
+  var close20 = coll.find({ location: { $near: {
+    $geometry: { type: "Point",
+                 coordinates: [-122.4154282, 37.7746115] },
+    $maxDistance: 20 } } }).fetch();
+  test.length(close20, 4);
+  test.equal(close20[0].descript, "GRAND THEFT OF PROPERTY");
+  test.equal(close20[1].descript, "PETTY THEFT FROM LOCKED AUTO");
+  test.equal(close20[2].descript, "POSSESSION OF BURGLARY TOOLS");
+  test.equal(close20[3].descript, "POSS OF PROHIBITED WEAPON");
 });
 
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index 51e0217ec4..2c881346e3 100644
--- a/packages/minimongo/package.js
+++ b/packages/minimongo/package.js
@@ -8,7 +8,7 @@ Package.on_use(function (api) {
   api.use(['underscore', 'json', 'ejson', 'ordered-dict', 'deps',
            'random', 'ordered-dict']);
   // If you really want geolocation queries to work, add this package
-  api.imply('geojson-utils');
+  api.use('geojson-utils', { weak: true });
   api.add_files([
     'minimongo.js',
     'selector.js',
@@ -19,8 +19,8 @@ Package.on_use(function (api) {
 });
 
 Package.on_test(function (api) {
-  api.use('minimongo', 'client');
   api.use('geojson-utils', 'client');
+  api.use('minimongo', 'client');
   api.use('test-helpers', 'client');
   api.use(['tinytest', 'underscore', 'ejson', 'ordered-dict',
            'random', 'deps']);
diff --git a/packages/minimongo/selector.js b/packages/minimongo/selector.js
index 3ccf462a27..1cd120473c 100644
--- a/packages/minimongo/selector.js
+++ b/packages/minimongo/selector.js
@@ -342,6 +342,9 @@ var VALUE_OPERATORS = {
           dist = distanceCoordinatePairs(point, value);
           break;
         case "2dsphere":
+          // Presence of this package is checked when user ensures 2dsphere
+          // index on collection.
+          var GeoJSON = Package['geojson-utils'].GeoJSON;
           // XXX: for now, we don't calculate the actual distance between, say,
           // polygon and circle. If people care about this use-case it will get
           // a priority.

From e127ed25aaa53b299d3f40828e0648de8ac41ec6 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Fri, 27 Sep 2013 19:59:30 -0700
Subject: [PATCH 197/335] Touch History.md

---
 History.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/History.md b/History.md
index a81fadcf71..6abbe60e9a 100644
--- a/History.md
+++ b/History.md
@@ -23,6 +23,8 @@ MINIMONGO
 * Fix various bugs with using Mongo ObjectIds. (XXX bad description! this is
   3cfeed and 008847)
 
+* `$near` operator for `2d` and `2dsphere` indices.
+
 * Improve behavior of `$ne`, $nin`, and `$not` selectors with objects containing
   arrays.  #1451
 

From f902d6f55edb06da094b81281270c8868bbd339b Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Mon, 30 Sep 2013 15:16:26 -0700
Subject: [PATCH 198/335] Don't have to ensure index to distinguish 2d vs
 2dsphere queries.

---
 packages/minimongo/minimongo.js       | 17 -----------------
 packages/minimongo/minimongo_tests.js |  1 -
 packages/minimongo/selector.js        |  9 ++++-----
 3 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index 67f5929f83..ee5cbacd45 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -1177,23 +1177,6 @@ LocalCollection._compileProjection = function (fields) {
   };
 };
 
-// This function exists for convenience of using geo-location operators such as
-// $near and doesn't actually build any indexes. Function will still throw an
-// exception if you try to ensure index on anything rather than "2d" or
-// "2dsphere" on a single field.
-LocalCollection.prototype._ensureIndex = function (keys, options) {
-  if (options || _.keys(keys).length !== 1 ||
-      !_.contains(["2d", "2dsphere"], _.values(keys)[0]))
-    throw new Error("Can only call _ensureIndex on server collections " +
-                    "(exception for geo-location indexes)");
-
-  var self = this;
-  self._2dMode = _.values(keys)[0];
-
-  if (self._2dMode === "2dsphere" && !Package['geojson-utils'])
-    throw new Error("Need geojson-utils package for GeoJSON calculations");
-};
-
 var isGeoQuery = function (selector) {
   return _.any(selector, function (val, key) {
     return key === "$near" || (_.isObject(val) && isGeoQuery(val));
diff --git a/packages/minimongo/minimongo_tests.js b/packages/minimongo/minimongo_tests.js
index 3469d50b50..d6e11b61b4 100644
--- a/packages/minimongo/minimongo_tests.js
+++ b/packages/minimongo/minimongo_tests.js
@@ -2295,7 +2295,6 @@ Tinytest.add("minimongo - $near operator tests", function (test) {
   { "category" : "BURGLARY", "descript" : "BURGLARY OF STORE, FORCIBLE ENTRY", "address" : "100 Block of 10TH ST", "location" : { "type" : "Point", "coordinates" : [  -122.415449723856,  37.7749518087273 ] }, "_id" : "qm2F7wnB5D6yjKBNn" }];
 
   _.each(data, function (x) { coll.insert(x); });
-  coll._ensureIndex({ location: "2dsphere" });
 
   var close15 = coll.find({ location: { $near: {
     $geometry: { type: "Point",
diff --git a/packages/minimongo/selector.js b/packages/minimongo/selector.js
index 1cd120473c..3fd13896d0 100644
--- a/packages/minimongo/selector.js
+++ b/packages/minimongo/selector.js
@@ -332,7 +332,8 @@ var VALUE_OPERATORS = {
       _.each(point, function (xy) { npoint.push(xy); });
       return npoint;
     }
-    var mode = cursor.collection._2dMode || "2d";
+    // GeoJSON query is marked as $geometry property
+    var mode = _.isObject(operand) && _.has(operand, '$geometry') ? "2dsphere" : "2d";
     var maxDistance = mode === "2d" ? operators.$maxDistance : operand.$maxDistance;
     var point = mode === "2d" ? operand : operand.$geometry;
     return function (value, doc) {
@@ -342,8 +343,8 @@ var VALUE_OPERATORS = {
           dist = distanceCoordinatePairs(point, value);
           break;
         case "2dsphere":
-          // Presence of this package is checked when user ensures 2dsphere
-          // index on collection.
+          if (!_.has(Package, 'geojson-utils'))
+            throw new Error('Need geojson-utils package for GeoJSON calculations');
           var GeoJSON = Package['geojson-utils'].GeoJSON;
           // XXX: for now, we don't calculate the actual distance between, say,
           // polygon and circle. If people care about this use-case it will get
@@ -354,8 +355,6 @@ var VALUE_OPERATORS = {
             dist = GeoJSON.geometryWithinRadius(value, point, maxDistance) ?
                      0 : maxDistance + 1;
           break;
-        default:
-          throw new Error("Unknown mode for distance calculations: " + mode);
       }
       // Used later in sorting by distance, since $near queries are sorted by
       // distance from closest to farthest.

From 56aeac63ddd2a7e703c78cb63b71e5601df629b9 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Mon, 30 Sep 2013 15:33:31 -0700
Subject: [PATCH 199/335] Typo in NOTES.

---
 packages/minimongo/NOTES | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/minimongo/NOTES b/packages/minimongo/NOTES
index 017aeda689..e2db1fb0e2 100644
--- a/packages/minimongo/NOTES
+++ b/packages/minimongo/NOTES
@@ -46,7 +46,7 @@ It just hasn't been looked at/thought about yet.
 upsert combined with $-operators might work, but hasn't actually been
 looked at or tested.
 
-In general, the API needs tests, espectially update. (On the other
+In general, the API needs tests, especially update. (On the other
 hand, the underlying selector and mutator code is quite well tested.)
 
 ## OTHER STUFF ##

From 9e898fe1e975877595fe1df8b2a96f7db18a0854 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Mon, 30 Sep 2013 15:46:31 -0700
Subject: [PATCH 200/335] Add a link to the original geojson-utils

and add the copyright notice to LICENSE
---
 LICENSE.txt                       | 6 ++++++
 packages/geojson-utils/package.js | 1 +
 2 files changed, 7 insertions(+)

diff --git a/LICENSE.txt b/LICENSE.txt
index 319a50a963..8c9a5d378f 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -516,6 +516,12 @@ Copyright 2011, Robert Mustacchi. All rights reserved.
 Copyright 2011, Joyent, Inc. All rights reserved.
 
 
+----------
+geojson-utils: https://github.com/maxogden/geojson-js-utils
+----------
+
+Copyright (c) 2010 Max Ogden
+
 ==============
 Apache License
 ==============
diff --git a/packages/geojson-utils/package.js b/packages/geojson-utils/package.js
index 15d3fd3f7a..9cc423db0b 100644
--- a/packages/geojson-utils/package.js
+++ b/packages/geojson-utils/package.js
@@ -1,5 +1,6 @@
 Package.describe({
   summary: 'GeoJSON utility functions',
+  url: 'https://github.com/maxogden/geojson-js-utils',
   internal: true
 });
 

From 89df75b15e0298d2e82a2e65341780d55b034cae Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Wed, 2 Oct 2013 16:12:13 -0700
Subject: [PATCH 201/335] Add stuff to History.md.

---
 .mailmap   | 1 +
 History.md | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.mailmap b/.mailmap
index e710a78b4d..bfef295657 100644
--- a/.mailmap
+++ b/.mailmap
@@ -11,6 +11,7 @@
 GITHUB: ansman <nicklas@ansman.se>
 GITHUB: awwx <andrew.wilcox@gmail.com>
 GITHUB: codeinthehole <david.winterbottom@gmail.com>
+GITHUB: jacott <geoffjacobsen@gmail.com>
 GITHUB: Maxhodges <Max@whiterabbitpress.com>
 GITHUB: meawoppl <meawoppl@gmail.com>
 GITHUB: mitar <mitar.git@tnode.com>
diff --git a/History.md b/History.md
index a81fadcf71..8d8aa53fb0 100644
--- a/History.md
+++ b/History.md
@@ -11,6 +11,8 @@ SECURITY
 
 MINIMONGO
 
+* XXX upsert, update/remove return values  #1046
+
 * Pass an index and the cursor itself to the callbacks in `cursor.forEach` and
   `cursor.map`, just like the corresponding `Array` methods.  #63
 
@@ -109,9 +111,9 @@ MISC
   * XXX: we should try to do more upgrades in this release if possible (in
     conjunction with the Node upgrade)
 
-Patches contributed by GitHub users ansman, awwx, codeinthehole, Maxhodges,
-meawoppl, mitar, mizzao, mquandalle, nathan-muir, RobertLowe, ryw, and
-timhaines.
+Patches contributed by GitHub users ansman, awwx, codeinthehole, jacott,
+Maxhodges, meawoppl, mitar, mizzao, mquandalle, nathan-muir, RobertLowe, ryw,
+and timhaines.
 
 
 ## v0.6.5.1

From aacd87505ea5b69927b5fa6a9943c160d3354cb1 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Wed, 2 Oct 2013 16:39:41 -0700
Subject: [PATCH 202/335] Put generated tests in more readable form.

---
 packages/geojson-utils/geojson-utils.tests.js | 61 +++++++++++++------
 1 file changed, 41 insertions(+), 20 deletions(-)

diff --git a/packages/geojson-utils/geojson-utils.tests.js b/packages/geojson-utils/geojson-utils.tests.js
index 5aae2f7d4f..73cc5d1554 100644
--- a/packages/geojson-utils/geojson-utils.tests.js
+++ b/packages/geojson-utils/geojson-utils.tests.js
@@ -57,25 +57,46 @@ Tinytest.add("geojson-utils - points distance generated tests", function (test)
   var floatEqual = function (a, b) {
     test.isTrue(Math.abs(a - b) < 0.000001);
   };
-  floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[-19.416501816827804,-13.442164216190577]} , {"type":"Point","coordinates":[8.694866622798145,-8.511979941977188]} ),  3115066.2536578891 );
-floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[151.2841189110186,-56.14564002258703]} , {"type":"Point","coordinates":[167.77983197313733,0.05544793023727834]} ),  6423493.2321747802 );
-floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[100.28413630579598,-88.02313695591874]} , {"type":"Point","coordinates":[36.48786173714325,53.44207073468715]} ),  15848950.0402601473 );
-floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[-70.34899035631679,76.51596869179048]} , {"type":"Point","coordinates":[154.91605914011598,-73.60970971290953]} ),  18714226.5425080135 );
-floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[96.28682994353585,58.77288202662021]} , {"type":"Point","coordinates":[-118.33936230326071,72.07877089688554]} ),  5223022.7731127860 );
-floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[140.35530551429838,10.507104953983799]} , {"type":"Point","coordinates":[-67.73368513956666,38.075836981181055]} ),  13874476.3135112207 );
-floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[69.55582775664516,86.25450283149257]} , {"type":"Point","coordinates":[-18.446230484172702,6.116170521359891]} ),  9314403.3309389465 );
-floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[163.83647522330284,-65.7211532376241]} , {"type":"Point","coordinates":[-159.2198902608361,-78.42975475382991]} ),  1831929.5917785936 );
-floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[-178.9383797585033,-54.87420454365201]} , {"type":"Point","coordinates":[-175.35227065649815,-84.04084282391705]} ),  3244710.9344544266 );
-floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[-48.63219943456352,11.284161149058491]} , {"type":"Point","coordinates":[-179.12627786491066,-51.95622375886887]} ),  13691492.4666933995 );
-floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[140.29684206470847,-67.20720696030185]} , {"type":"Point","coordinates":[-109.37452355003916,36.03131077555008]} ),  14525055.6462231465 );
-floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[-154.6698773431126,58.322094617411494]} , {"type":"Point","coordinates":[61.18583445576951,-4.3424885796848685]} ),  13261602.4336371962 );
-floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[122.5562841903884,10.43972848681733]} , {"type":"Point","coordinates":[-11.756078708684072,-43.86124441982247]} ),  14275427.5511620939 );
-floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[-67.91648306301795,-86.38826347864233]} , {"type":"Point","coordinates":[163.577536230674,12.987319261068478]} ),  11699799.3615680672 );
-floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[91.65140007715672,17.595150742679834]} , {"type":"Point","coordinates":[135.80393003183417,22.307532118167728]} ),  4628773.1129429890 );
-floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[-112.70280818711035,34.45729674655013]} , {"type":"Point","coordinates":[-127.42168210959062,-25.51327457977459]} ),  6846704.0253010122 );
-floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[-161.55807900894433,-77.40711871231906]} , {"type":"Point","coordinates":[-92.66313794790767,-89.12077954714186]} ),  1368055.9401701286 );
-floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[39.966264681424946,9.890176948625594]} , {"type":"Point","coordinates":[-159.88646019320004,40.60383598925546]} ),  14041503.0409814864 );
-floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[-57.48232689569704,86.64061016729102]} , {"type":"Point","coordinates":[59.53941993578337,-75.73194969259202]} ),  18560499.7346975356 );
-floatEqual(GeoJSON.pointDistance( {"type":"Point","coordinates":[-142.0938081513159,80.76813141163439]} , {"type":"Point","coordinates":[14.891517050098628,64.56322408467531]} ),  3793112.6186894816 );
+
+  // Pairs of points we will be looking a distance between
+  var tests = [[[-19.416501816827804,-13.442164216190577], [8.694866622798145,-8.511979941977188]],
+    [[151.2841189110186,-56.14564002258703], [167.77983197313733,0.05544793023727834]],
+    [[100.28413630579598,-88.02313695591874], [36.48786173714325,53.44207073468715]],
+    [[-70.34899035631679,76.51596869179048], [154.91605914011598,-73.60970971290953]],
+    [[96.28682994353585,58.77288202662021], [-118.33936230326071,72.07877089688554]],
+    [[140.35530551429838,10.507104953983799], [-67.73368513956666,38.075836981181055]],
+    [[69.55582775664516,86.25450283149257], [-18.446230484172702,6.116170521359891]],
+    [[163.83647522330284,-65.7211532376241], [-159.2198902608361,-78.42975475382991]],
+    [[-178.9383797585033,-54.87420454365201], [-175.35227065649815,-84.04084282391705]],
+    [[-48.63219943456352,11.284161149058491], [-179.12627786491066,-51.95622375886887]],
+    [[140.29684206470847,-67.20720696030185], [-109.37452355003916,36.03131077555008]],
+    [[-154.6698773431126,58.322094617411494], [61.18583445576951,-4.3424885796848685]],
+    [[122.5562841903884,10.43972848681733], [-11.756078708684072,-43.86124441982247]],
+    [[-67.91648306301795,-86.38826347864233], [163.577536230674,12.987319261068478]],
+    [[91.65140007715672,17.595150742679834], [135.80393003183417,22.307532118167728]],
+    [[-112.70280818711035,34.45729674655013], [-127.42168210959062,-25.51327457977459]],
+    [[-161.55807900894433,-77.40711871231906], [-92.66313794790767,-89.12077954714186]],
+    [[39.966264681424946,9.890176948625594], [-159.88646019320004,40.60383598925546]],
+    [[-57.48232689569704,86.64061016729102], [59.53941993578337,-75.73194969259202]],
+    [[-142.0938081513159,80.76813141163439], [14.891517050098628,64.56322408467531]]];
+
+  // correct distance between two points
+  var answers = [3115066.2536578891, 6423493.2321747802, 15848950.0402601473,
+    18714226.5425080135, 5223022.7731127860, 13874476.3135112207,
+    9314403.3309389465, 1831929.5917785936, 3244710.9344544266,
+    13691492.4666933995, 14525055.6462231465, 13261602.4336371962,
+    14275427.5511620939, 11699799.3615680672, 4628773.1129429890,
+    6846704.0253010122, 1368055.9401701286, 14041503.0409814864,
+    18560499.7346975356, 3793112.6186894816];
+
+  _.each(tests, function (pair, testN) {
+    var distance = GeoJSON.pointDistance.apply(this, _.map(pair, toGeoJSONPoint));
+    test.isTrue(Math.abs(distance - answers[testN]) < 0.00000001,
+      "Wrong distance between points " + JSON.stringify(pair) + ": " + distance);
+  });
+
+  function toGeoJSONPoint (coordinates) {
+    return { type: "Point", coordinates: coordinates };
+  }
 });
 

From 1e103b8e46bb9022492ec0d600ca05bdfa2d6027 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Wed, 2 Oct 2013 18:37:38 -0700
Subject: [PATCH 203/335] Modify test data so the result order is obvious.

---
 packages/minimongo/minimongo_tests.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/minimongo/minimongo_tests.js b/packages/minimongo/minimongo_tests.js
index d6e11b61b4..3f74b4fd83 100644
--- a/packages/minimongo/minimongo_tests.js
+++ b/packages/minimongo/minimongo_tests.js
@@ -2288,13 +2288,14 @@ Tinytest.add("minimongo - $near operator tests", function (test) {
 
   // GeoJSON tests
   coll = new LocalCollection();
-  var data = [{ "category" : "LARCENY/THEFT", "descript" : "GRAND THEFT OF PROPERTY", "address" : "900 Block of MINNA ST", "location" : { "type" : "Point", "coordinates" : [  -122.41538270191,  37.774683628213 ] }, "_id" : "eRHmRvNtHbCjNw6ox" },
-    { "category" : "LARCENY/THEFT", "descript" : "PETTY THEFT FROM LOCKED AUTO", "address" : "900 Block of MINNA ST", "location" : { "type" : "Point", "coordinates" : [  -122.415386041221,  37.7747879744156 ] }, "_id" : "fc9KktqwLcfKaKBDr" },
-    { "category" : "OTHER OFFENSES", "descript" : "POSSESSION OF BURGLARY TOOLS", "address" : "900 Block of MINNA ST", "location" : { "type" : "Point", "coordinates" : [  -122.415386041221,  37.7747879744156 ] }, "_id" : "fr2gw6x8agCXwcKkK" },
-    { "category" : "WEAPON LAWS", "descript" : "POSS OF PROHIBITED WEAPON", "address" : "900 Block of MINNA ST", "location" : { "type" : "Point", "coordinates" : [  -122.415386041221,  37.7747879744156 ] }, "_id" : "nn3oaDPoeGC5JwqsS" },
-  { "category" : "BURGLARY", "descript" : "BURGLARY OF STORE, FORCIBLE ENTRY", "address" : "100 Block of 10TH ST", "location" : { "type" : "Point", "coordinates" : [  -122.415449723856,  37.7749518087273 ] }, "_id" : "qm2F7wnB5D6yjKBNn" }];
+  var data = [{ "category" : "BURGLARY", "descript" : "BURGLARY OF STORE, FORCIBLE ENTRY", "address" : "100 Block of 10TH ST", "location" : { "type" : "Point", "coordinates" : [  -122.415449723856,  37.7749518087273 ] } },
+    { "category" : "WEAPON LAWS", "descript" : "POSS OF PROHIBITED WEAPON", "address" : "900 Block of MINNA ST", "location" : { "type" : "Point", "coordinates" : [  -122.415386041221,  37.7747879744156 ] } },
+    { "category" : "LARCENY/THEFT", "descript" : "GRAND THEFT OF PROPERTY", "address" : "900 Block of MINNA ST", "location" : { "type" : "Point", "coordinates" : [  -122.41538270191,  37.774683628213 ] } },
+    { "category" : "LARCENY/THEFT", "descript" : "PETTY THEFT FROM LOCKED AUTO", "address" : "900 Block of MINNA ST", "location" : { "type" : "Point", "coordinates" : [  -122.415396041221,  37.7747879744156 ] } },
+    { "category" : "OTHER OFFENSES", "descript" : "POSSESSION OF BURGLARY TOOLS", "address" : "900 Block of MINNA ST", "location" : { "type" : "Point", "coordinates" : [  -122.415386041221,  37.7747879734156 ] } }
+  ];
 
-  _.each(data, function (x) { coll.insert(x); });
+  _.each(data, function (x, i) { coll.insert(_.extend(x, { x: i })); });
 
   var close15 = coll.find({ location: { $near: {
     $geometry: { type: "Point",

From b58c85f323953567d9c88ecf57f984ee86f8344a Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Wed, 2 Oct 2013 19:19:51 -0700
Subject: [PATCH 204/335] Glasser's comments

---
 packages/minimongo/selector.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/minimongo/selector.js b/packages/minimongo/selector.js
index 3fd13896d0..dd116f22c5 100644
--- a/packages/minimongo/selector.js
+++ b/packages/minimongo/selector.js
@@ -328,9 +328,7 @@ var VALUE_OPERATORS = {
     // the second one to y no matter what user passes.
     // In case user passes { lon: x, lat: y } returns [x, y]
     function pointToArray (point) {
-      var npoint = [];
-      _.each(point, function (xy) { npoint.push(xy); });
-      return npoint;
+      return _.map(point, _.identity);
     }
     // GeoJSON query is marked as $geometry property
     var mode = _.isObject(operand) && _.has(operand, '$geometry') ? "2dsphere" : "2d";
@@ -344,7 +342,7 @@ var VALUE_OPERATORS = {
           break;
         case "2dsphere":
           if (!_.has(Package, 'geojson-utils'))
-            throw new Error('Need geojson-utils package for GeoJSON calculations');
+            throw new Error('Need geojson-utils package for GeoJSON calculations (such as $near)');
           var GeoJSON = Package['geojson-utils'].GeoJSON;
           // XXX: for now, we don't calculate the actual distance between, say,
           // polygon and circle. If people care about this use-case it will get
@@ -358,9 +356,11 @@ var VALUE_OPERATORS = {
       }
       // Used later in sorting by distance, since $near queries are sorted by
       // distance from closest to farthest.
-      if (!cursor._distance)
-        cursor._distance = {};
-      cursor._distance[doc._id] = dist;
+      if (cursor) {
+        if (!cursor._distance)
+          cursor._distance = {};
+        cursor._distance[doc._id] = dist;
+      }
 
       // Distance couldn't parse a geometry object
       if (dist === null)
@@ -650,6 +650,7 @@ var compileDocumentSelector = function (docSelector, cursor) {
 
 
   return function (doc, wholeDoc) {
+    // If called w/o wholeDoc, doc is considered the original by default
     if (wholeDoc === undefined)
       wholeDoc = doc;
     return _.all(perKeySelectors, function (f) {

From 0e2d56d382db715045f8af1a48d7dbbc1af7eb42 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Wed, 2 Oct 2013 20:28:07 -0700
Subject: [PATCH 205/335] Glasser's comments on restrictCreationByEmailDomain
 in Accounts

---
 packages/accounts-base/accounts_server.js | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index 397e4b84a9..9fc42adc9b 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -328,7 +328,7 @@ Accounts.validateNewUser = function (func) {
   validateNewUserHooks.push(func);
 };
 
-// XXX Copied from the middle of oplog-tailing logic
+// XXX Find a better place for this utility function
 // Like Perl's quotemeta: quotes all regexp metacharacters. See
 //   https://github.com/substack/quotemeta/blob/master/index.js
 var quotemeta = function (str) {
@@ -355,16 +355,20 @@ Accounts.validateNewUser(function (user) {
   // User with password can have only one email on creation
   if (user.emails)
     emailIsGood = emailIsGood && testEmailDomain(user.emails[0].address);
+  else {
+    // Find any email of any service and check it
+    if (!_.isEmpty(user.services))
+      emailIsGood = emailIsGood && _.any(user.services, function (service) {
+        return service.email && testEmailDomain(service.email); });
+  }
 
-  // Find any email of any service and check it
-  emailIsGood = emailIsGood && _.any(user.services, function (service) {
-    return service.email && testEmailDomain(service.email);
-  });
 
-  if (!emailIsGood)
+  if (!emailIsGood) {
     if (_.isString(domain))
       throw new Meteor.Error(403, "@" + domain + " email required");
-    else throw new Meteor.Error(403, "Email doesn't match the criterias.");
+    else
+      throw new Meteor.Error(403, "Email doesn't match the criterias.");
+  }
 
   return true;
 });

From c20db8d3287e2fe19a026bad75659105454cf06f Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Wed, 2 Oct 2013 21:21:10 -0700
Subject: [PATCH 206/335] Remove $'s in selector when upserting new minimongo
 doc.

Plus test for it.
---
 packages/minimongo/minimongo.js               |  2 +-
 packages/minimongo/modify.js                  |  8 +++++
 packages/mongo-livedata/mongo_driver.js       |  5 +---
 .../mongo-livedata/mongo_livedata_tests.js    | 30 +++++++++++++++++++
 4 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index 2fae504cea..54f634565a 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -596,7 +596,7 @@ LocalCollection.prototype.update = function (selector, mod, options, callback) {
   // generate an id for it.
   var insertedId;
   if (updateCount === 0 && options.upsert) {
-    var newDoc = _.clone(selector);
+    var newDoc = LocalCollection._removeDollarOperators(selector);
     LocalCollection._modify(newDoc, mod, true);
     if (! newDoc._id && options.insertedId)
       newDoc._id = options.insertedId;
diff --git a/packages/minimongo/modify.js b/packages/minimongo/modify.js
index 295b9c8d6b..6edde2ccb7 100644
--- a/packages/minimongo/modify.js
+++ b/packages/minimongo/modify.js
@@ -313,3 +313,11 @@ LocalCollection._modifiers = {
     throw Error("$bit is not supported");
   }
 };
+
+LocalCollection._removeDollarOperators = function (selector) {
+  var selectorDoc = {};
+  for (var k in selector)
+    if (k.substr(0, 1) !== '$')
+      selectorDoc[k] = selector[k];
+  return selectorDoc;
+};
diff --git a/packages/mongo-livedata/mongo_driver.js b/packages/mongo-livedata/mongo_driver.js
index 941ecbb712..e48adff121 100644
--- a/packages/mongo-livedata/mongo_driver.js
+++ b/packages/mongo-livedata/mongo_driver.js
@@ -413,14 +413,11 @@ var simulateUpsertWithInsertedId = function (collection, selector, mod,
   // Run this code up front so that it fails fast if someone uses
   // a Mongo update operator we don't support.
   if (isModify) {
-    var selectorDoc = {};
-    for (var k in selector)
-      if (k.substr(0, 1) !== '$')
-        selectorDoc[k] = selector[k];
     // We've already run replaceTypes/replaceMeteorAtomWithMongo on
     // selector and mod.  We assume it doesn't matter, as far as
     // the behavior of modifiers is concerned, whether `_modify`
     // is run on EJSON or on mongo-converted EJSON.
+    var selectorDoc = LocalCollection._removeDollarOperators(selector);
     LocalCollection._modify(selectorDoc, mod, true);
     newDoc = selectorDoc;
   } else {
diff --git a/packages/mongo-livedata/mongo_livedata_tests.js b/packages/mongo-livedata/mongo_livedata_tests.js
index 3e0ca2e71f..9fc5f80acb 100644
--- a/packages/mongo-livedata/mongo_livedata_tests.js
+++ b/packages/mongo-livedata/mongo_livedata_tests.js
@@ -1161,6 +1161,36 @@ _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
                       {name: 'Steve', _id: 'steve'}]);
       test.isTrue(coll.findOne('steve'));
       test.isFalse(coll.findOne('fred'));
+
+      // Test $ operator in selectors.
+
+      var result10 = upsert(coll, useUpdate,
+                            {$or: [{name: 'David'}, {name: 'Emily'}]},
+                            {$set: {foo: 3}}, {multi: true});
+      test.equal(result10.numberAffected, 2);
+      if (! useUpdate)
+        test.isFalse(result10.insertedId);
+      compareResults(test, useUpdate,
+        [coll.findOne({name: 'David'}), coll.findOne({name: 'Emily'})],
+        [{name: 'David', foo: 3, bar: 7, _id: davidId},
+         {name: 'Emily', foo: 3, bar: 7, _id: emilyId}]
+      );
+
+      var result11 = upsert(
+        coll, useUpdate,
+        {
+          name: 'Charlie',
+          $or: [{ foo: 2}, { bar: 7 }]
+        },
+        { $set: { foo: 3 } }
+      );
+      test.equal(result11.numberAffected, 1);
+      if (! useUpdate)
+        test.isTrue(result11.insertedId);
+      var charlieId = result11.insertedId;
+      compareResults(test, useUpdate,
+                     coll.find({ name: 'Charlie' }).fetch(),
+                     [{name: 'Charlie', foo: 3, _id: charlieId}]);
     });
   });
 });

From d3ec00c3ef077d172fc10de6864803a2b91ca519 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Wed, 2 Oct 2013 23:00:23 -0700
Subject: [PATCH 207/335] Fix collection driver upsert callbacks.

Run a bunch of upsert tests on the direct collections (LocalCollection and
MongoConnection). Revealed a weirdness with MongoConnection.upsert(); if there
is no id from the selector or modifier, then mongo ends up generating one and we
don't return it.
---
 packages/minimongo/minimongo.js               |   2 +-
 packages/mongo-livedata/mongo_driver.js       |   5 +-
 .../mongo-livedata/mongo_livedata_tests.js    | 551 ++++++++++--------
 3 files changed, 306 insertions(+), 252 deletions(-)

diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index 54f634565a..5bee132f17 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -637,7 +637,7 @@ LocalCollection.prototype.upsert = function (selector, mod, options, callback) {
   return self.update(selector, mod, _.extend({}, options, {
     upsert: true,
     _returnObject: true
-  }, callback));
+  }), callback);
 };
 
 LocalCollection.prototype._modifyAndNotify = function (
diff --git a/packages/mongo-livedata/mongo_driver.js b/packages/mongo-livedata/mongo_driver.js
index e48adff121..86708242e3 100644
--- a/packages/mongo-livedata/mongo_driver.js
+++ b/packages/mongo-livedata/mongo_driver.js
@@ -489,6 +489,9 @@ _.each(["insert", "update", "remove"], function (method) {
   };
 });
 
+// XXX MongoConnection.upsert() does not return the id of the inserted document
+// unless you set it explicitly in the selector or modifier (as a replacement
+// doc).
 MongoConnection.prototype.upsert = function (collectionName, selector, mod,
                                              options, callback) {
   var self = this;
@@ -501,7 +504,7 @@ MongoConnection.prototype.upsert = function (collectionName, selector, mod,
                      _.extend({}, options, {
                        upsert: true,
                        _returnObject: true
-                     }, callback));
+                     }), callback);
 };
 
 MongoConnection.prototype.find = function (collectionName, selector, options) {
diff --git a/packages/mongo-livedata/mongo_livedata_tests.js b/packages/mongo-livedata/mongo_livedata_tests.js
index 9fc5f80acb..33877d6218 100644
--- a/packages/mongo-livedata/mongo_livedata_tests.js
+++ b/packages/mongo-livedata/mongo_livedata_tests.js
@@ -30,8 +30,8 @@ var stripId = function (obj) {
   delete obj._id;
 };
 
-var compareResults = function (test, useUpdate, actual, expected) {
-  if (useUpdate) {
+var compareResults = function (test, skipIds, actual, expected) {
+  if (skipIds) {
     _.map(actual, stripId);
     _.map(expected, stripId);
   }
@@ -1057,291 +1057,343 @@ if (Meteor.isServer) {
 // over the network.
 _.each(Meteor.isServer ? [true, false] : [true], function (minimongo) {
   _.each([true, false], function (useUpdate) {
-    Tinytest.add("mongo-livedata - " + (useUpdate ? "update " : "") + "upsert" + (minimongo ? " minimongo" : "") + ", " + idGeneration, function (test) {
-      var run = test.runId();
-      var options = collectionOptions;
-      if (minimongo)
-        options = _.extend({}, collectionOptions, { connection: null });
-      var coll = new Meteor.Collection("livedata_upsert_collection_"+run, options);
+    _.each([true, false], function (useDirectCollection) {
+      Tinytest.add("mongo-livedata - " + (useUpdate ? "update " : "") + "upsert" + (minimongo ? " minimongo" : "") + (useDirectCollection ? " direct collection " : "") + ", " + idGeneration, function (test) {
+        var run = test.runId();
+        var options = collectionOptions;
+        // We don't get ids back when we use update() to upsert, or when we are
+        // directly calling MongoConnection.upsert().
+        var skipIds = useUpdate || (! minimongo && useDirectCollection);
+        if (minimongo)
+          options = _.extend({}, collectionOptions, { connection: null });
+        var coll = new Meteor.Collection(
+          "livedata_upsert_collection_"+run+
+            (useUpdate ? "_update_" : "") +
+            (minimongo ? "_minimongo_" : "") +
+            (useDirectCollection ? "_direct_" : "") + "",
+          options
+        );
+        if (useDirectCollection)
+          coll = coll._collection;
 
-      var result1 = upsert(coll, useUpdate, {foo: 'bar'}, {foo: 'bar'});
-      test.equal(result1.numberAffected, 1);
-      if (! useUpdate)
-        test.isTrue(result1.insertedId);
-      compareResults(test, useUpdate, coll.find().fetch(), [{foo: 'bar', _id: result1.insertedId}]);
+        var result1 = upsert(coll, useUpdate, {foo: 'bar'}, {foo: 'bar'});
+        test.equal(result1.numberAffected, 1);
+        if (! skipIds)
+          test.isTrue(result1.insertedId);
+        compareResults(test, skipIds, coll.find().fetch(), [{foo: 'bar', _id: result1.insertedId}]);
 
-      var result2 = upsert(coll, useUpdate, {foo: 'bar'}, {foo: 'baz'});
-      test.equal(result2.numberAffected, 1);
-      if (! useUpdate)
-        test.isFalse(result2.insertedId);
-      compareResults(test, useUpdate, coll.find().fetch(), [{foo: 'baz', _id: result1.insertedId}]);
+        var result2 = upsert(coll, useUpdate, {foo: 'bar'}, {foo: 'baz'});
+        test.equal(result2.numberAffected, 1);
+        if (! skipIds)
+          test.isFalse(result2.insertedId);
+        compareResults(test, skipIds, coll.find().fetch(), [{foo: 'baz', _id: result1.insertedId}]);
 
-      coll.remove({});
+        coll.remove({});
 
-      // Test values that require transformation to go into Mongo:
+        // Test values that require transformation to go into Mongo:
 
-      var t1 = new Meteor.Collection.ObjectID();
-      var t2 = new Meteor.Collection.ObjectID();
-      var result3 = upsert(coll, useUpdate, {foo: t1}, {foo: t1});
-      test.equal(result3.numberAffected, 1);
-      if (! useUpdate)
-        test.isTrue(result3.insertedId);
-      compareResults(test, useUpdate, coll.find().fetch(), [{foo: t1, _id: result3.insertedId}]);
+        var t1 = new Meteor.Collection.ObjectID();
+        var t2 = new Meteor.Collection.ObjectID();
+        var result3 = upsert(coll, useUpdate, {foo: t1}, {foo: t1});
+        test.equal(result3.numberAffected, 1);
+        if (! skipIds)
+          test.isTrue(result3.insertedId);
+        compareResults(test, skipIds, coll.find().fetch(), [{foo: t1, _id: result3.insertedId}]);
 
-      var result4 = upsert(coll, useUpdate, {foo: t1}, {foo: t2});
-      test.equal(result2.numberAffected, 1);
-      if (! useUpdate)
-        test.isFalse(result2.insertedId);
-      compareResults(test, useUpdate, coll.find().fetch(), [{foo: t2, _id: result3.insertedId}]);
+        var result4 = upsert(coll, useUpdate, {foo: t1}, {foo: t2});
+        test.equal(result2.numberAffected, 1);
+        if (! skipIds)
+          test.isFalse(result2.insertedId);
+        compareResults(test, skipIds, coll.find().fetch(), [{foo: t2, _id: result3.insertedId}]);
 
-      coll.remove({});
+        coll.remove({});
 
-      // Test modification by upsert
+        // Test modification by upsert
 
-      var result5 = upsert(coll, useUpdate, {name: 'David'}, {$set: {foo: 1}});
-      test.equal(result5.numberAffected, 1);
-      if (! useUpdate)
-        test.isTrue(result5.insertedId);
-      var davidId = result5.insertedId;
-      compareResults(test, useUpdate, coll.find().fetch(), [{name: 'David', foo: 1, _id: davidId}]);
+        var result5 = upsert(coll, useUpdate, {name: 'David'}, {$set: {foo: 1}});
+        test.equal(result5.numberAffected, 1);
+        if (! skipIds)
+          test.isTrue(result5.insertedId);
+        var davidId = result5.insertedId;
+        compareResults(test, skipIds, coll.find().fetch(), [{name: 'David', foo: 1, _id: davidId}]);
 
-      test.throws(function () {
-        // test that bad modifier fails fast
-        upsert(coll, useUpdate, {name: 'David'}, {$blah: {foo: 2}});
+        test.throws(function () {
+          // test that bad modifier fails fast
+          upsert(coll, useUpdate, {name: 'David'}, {$blah: {foo: 2}});
+        });
+
+
+        var result6 = upsert(coll, useUpdate, {name: 'David'}, {$set: {foo: 2}});
+        test.equal(result6.numberAffected, 1);
+        if (! skipIds)
+          test.isFalse(result6.insertedId);
+        compareResults(test, skipIds, coll.find().fetch(), [{name: 'David', foo: 2,
+                                                               _id: result5.insertedId}]);
+
+        var emilyId = coll.insert({name: 'Emily', foo: 2});
+        compareResults(test, skipIds, coll.find().fetch(), [{name: 'David', foo: 2, _id: davidId},
+                                                              {name: 'Emily', foo: 2, _id: emilyId}]);
+
+        // multi update by upsert
+        var result7 = upsert(coll, useUpdate, {foo: 2},
+                             {$set: {bar: 7},
+                              $setOnInsert: {name: 'Fred', foo: 2}},
+                             {multi: true});
+        test.equal(result7.numberAffected, 2);
+        if (! skipIds)
+          test.isFalse(result7.insertedId);
+        compareResults(test, skipIds, coll.find().fetch(), [{name: 'David', foo: 2, bar: 7, _id: davidId},
+                                                              {name: 'Emily', foo: 2, bar: 7, _id: emilyId}]);
+
+        // insert by multi upsert
+        var result8 = upsert(coll, useUpdate, {foo: 3},
+                             {$set: {bar: 7},
+                              $setOnInsert: {name: 'Fred', foo: 2}},
+                             {multi: true});
+        test.equal(result8.numberAffected, 1);
+        if (! skipIds)
+          test.isTrue(result8.insertedId);
+        var fredId = result8.insertedId;
+        compareResults(test, skipIds, coll.find().fetch(),
+                       [{name: 'David', foo: 2, bar: 7, _id: davidId},
+                        {name: 'Emily', foo: 2, bar: 7, _id: emilyId},
+                        {name: 'Fred', foo: 2, bar: 7, _id: fredId}]);
+
+        // test `insertedId` option
+        var result9 = upsert(coll, useUpdate, {name: 'Steve'},
+                             {name: 'Steve'},
+                             {insertedId: 'steve'});
+        test.equal(result9.numberAffected, 1);
+        if (! skipIds)
+          test.equal(result9.insertedId, 'steve');
+        compareResults(test, skipIds, coll.find().fetch(),
+                       [{name: 'David', foo: 2, bar: 7, _id: davidId},
+                        {name: 'Emily', foo: 2, bar: 7, _id: emilyId},
+                        {name: 'Fred', foo: 2, bar: 7, _id: fredId},
+                        {name: 'Steve', _id: 'steve'}]);
+        test.isTrue(coll.findOne('steve'));
+        test.isFalse(coll.findOne('fred'));
+
+        // Test $ operator in selectors.
+
+        var result10 = upsert(coll, useUpdate,
+                              {$or: [{name: 'David'}, {name: 'Emily'}]},
+                              {$set: {foo: 3}}, {multi: true});
+        test.equal(result10.numberAffected, 2);
+        if (! skipIds)
+          test.isFalse(result10.insertedId);
+        compareResults(test, skipIds,
+                       [coll.findOne({name: 'David'}), coll.findOne({name: 'Emily'})],
+                       [{name: 'David', foo: 3, bar: 7, _id: davidId},
+                        {name: 'Emily', foo: 3, bar: 7, _id: emilyId}]
+                      );
+
+        var result11 = upsert(
+          coll, useUpdate,
+          {
+            name: 'Charlie',
+            $or: [{ foo: 2}, { bar: 7 }]
+          },
+          { $set: { foo: 3 } }
+        );
+        test.equal(result11.numberAffected, 1);
+        if (! skipIds)
+          test.isTrue(result11.insertedId);
+        var charlieId = result11.insertedId;
+        compareResults(test, skipIds,
+                       coll.find({ name: 'Charlie' }).fetch(),
+                       [{name: 'Charlie', foo: 3, _id: charlieId}]);
       });
-
-
-      var result6 = upsert(coll, useUpdate, {name: 'David'}, {$set: {foo: 2}});
-      test.equal(result6.numberAffected, 1);
-      if (! useUpdate)
-        test.isFalse(result6.insertedId);
-      compareResults(test, useUpdate, coll.find().fetch(), [{name: 'David', foo: 2,
-                                        _id: result5.insertedId}]);
-
-      var emilyId = coll.insert({name: 'Emily', foo: 2});
-      compareResults(test, useUpdate, coll.find().fetch(), [{name: 'David', foo: 2, _id: davidId},
-                                           {name: 'Emily', foo: 2, _id: emilyId}]);
-
-      // multi update by upsert
-      var result7 = upsert(coll, useUpdate, {foo: 2},
-                           {$set: {bar: 7},
-                            $setOnInsert: {name: 'Fred', foo: 2}},
-                           {multi: true});
-      test.equal(result7.numberAffected, 2);
-      if (! useUpdate)
-        test.isFalse(result7.insertedId);
-      compareResults(test, useUpdate, coll.find().fetch(), [{name: 'David', foo: 2, bar: 7, _id: davidId},
-                                           {name: 'Emily', foo: 2, bar: 7, _id: emilyId}]);
-
-      // insert by multi upsert
-      var result8 = upsert(coll, useUpdate, {foo: 3},
-                           {$set: {bar: 7},
-                            $setOnInsert: {name: 'Fred', foo: 2}},
-                           {multi: true});
-      test.equal(result8.numberAffected, 1);
-      if (! useUpdate)
-        test.isTrue(result8.insertedId);
-      var fredId = result8.insertedId;
-      compareResults(test, useUpdate, coll.find().fetch(),
-                     [{name: 'David', foo: 2, bar: 7, _id: davidId},
-                      {name: 'Emily', foo: 2, bar: 7, _id: emilyId},
-                      {name: 'Fred', foo: 2, bar: 7, _id: fredId}]);
-
-      // test `insertedId` option
-      var result9 = upsert(coll, useUpdate, {name: 'Steve'},
-                           {name: 'Steve'},
-                           {insertedId: 'steve'});
-      test.equal(result9.numberAffected, 1);
-      if (! useUpdate)
-        test.equal(result9.insertedId, 'steve');
-      compareResults(test, useUpdate, coll.find().fetch(),
-                     [{name: 'David', foo: 2, bar: 7, _id: davidId},
-                      {name: 'Emily', foo: 2, bar: 7, _id: emilyId},
-                      {name: 'Fred', foo: 2, bar: 7, _id: fredId},
-                      {name: 'Steve', _id: 'steve'}]);
-      test.isTrue(coll.findOne('steve'));
-      test.isFalse(coll.findOne('fred'));
-
-      // Test $ operator in selectors.
-
-      var result10 = upsert(coll, useUpdate,
-                            {$or: [{name: 'David'}, {name: 'Emily'}]},
-                            {$set: {foo: 3}}, {multi: true});
-      test.equal(result10.numberAffected, 2);
-      if (! useUpdate)
-        test.isFalse(result10.insertedId);
-      compareResults(test, useUpdate,
-        [coll.findOne({name: 'David'}), coll.findOne({name: 'Emily'})],
-        [{name: 'David', foo: 3, bar: 7, _id: davidId},
-         {name: 'Emily', foo: 3, bar: 7, _id: emilyId}]
-      );
-
-      var result11 = upsert(
-        coll, useUpdate,
-        {
-          name: 'Charlie',
-          $or: [{ foo: 2}, { bar: 7 }]
-        },
-        { $set: { foo: 3 } }
-      );
-      test.equal(result11.numberAffected, 1);
-      if (! useUpdate)
-        test.isTrue(result11.insertedId);
-      var charlieId = result11.insertedId;
-      compareResults(test, useUpdate,
-                     coll.find({ name: 'Charlie' }).fetch(),
-                     [{name: 'Charlie', foo: 3, _id: charlieId}]);
     });
   });
 });
 
+var asyncUpsertTestName = function (useNetwork, useDirectCollection,
+                                    useUpdate, idGeneration) {
+  return "mongo-livedata - async " +
+    (useUpdate ? "update " : "") +
+    "upsert " +
+    (useNetwork ? "over network " : "") +
+    (useDirectCollection ? ", direct collection " : "") +
+    idGeneration;
+};
+
 // This is a duplicate of the test above, with some changes to make it work for
-// async upserts that go over the network.
-if (Meteor.isClient) {
-  _.each([true, false], function (useUpdate) {
-    Tinytest.addAsync("mongo-livedata - async " + (useUpdate ? "update " : "") + "upsert" + ", " + idGeneration, function (test, onComplete) {
-      var coll;
-      var run = test.runId();
-      var collName = "livedata_upsert_collection_"+run;
-      Meteor.call("createInsecureCollection", collName, collectionOptions);
-      coll = new Meteor.Collection(collName, collectionOptions);
-      Meteor.subscribe("c-" + collName);
-
-      var result1;
-      var next1 = function (err, result) {
-        result1 = result;
-        test.equal(result1.numberAffected, 1);
-        if (! useUpdate) {
-          test.isTrue(result1.insertedId);
-          test.equal(result1.insertedId, 'foo');
+// callback style. On the client, we test server-backed and in-memory
+// collections, and run the tests for both the Meteor.Collection and the
+// LocalCollection. On the server, we test mongo-backed collections, for both
+// the Meteor.Collection and the MongoConnection.
+_.each(Meteor.isServer ? [false] : [true, false], function (useNetwork) {
+  _.each(useNetwork ? [false] : [true, false], function (useDirectCollection) {
+    _.each([true, false], function (useUpdate) {
+      Tinytest.addAsync(asyncUpsertTestName(useNetwork, useDirectCollection, useUpdate, idGeneration), function (test, onComplete) {
+        var coll;
+        var run = test.runId();
+        var collName = "livedata_upsert_collection_"+run+
+              (useUpdate ? "_update_" : "") +
+              (useNetwork ? "_network_" : "") +
+              (useDirectCollection ? "_direct_" : "");
+        if (useNetwork) {
+          Meteor.call("createInsecureCollection", collName, collectionOptions);
+          coll = new Meteor.Collection(collName, collectionOptions);
+          Meteor.subscribe("c-" + collName);
+        } else {
+          var opts = _.clone(collectionOptions);
+          if (Meteor.isClient)
+            opts.connection = null;
+          coll = new Meteor.Collection(collName, opts);
+          if (useDirectCollection)
+            coll = coll._collection;
         }
-        compareResults(test, useUpdate, coll.find().fetch(), [{foo: 'bar', _id: 'foo'}]);
-        upsert(coll, useUpdate, {_id: 'foo'}, {foo: 'baz'}, next2);
-      };
 
-      // Test starts here.
-      upsert(coll, useUpdate, {_id: 'foo'}, {_id: 'foo', foo: 'bar'}, next1);
+        var result1;
+        var next1 = function (err, result) {
+          result1 = result;
+          test.equal(result1.numberAffected, 1);
+          if (! useUpdate) {
+            test.isTrue(result1.insertedId);
+            test.equal(result1.insertedId, 'foo');
+          }
+          compareResults(test, useUpdate, coll.find().fetch(), [{foo: 'bar', _id: 'foo'}]);
+          upsert(coll, useUpdate, {_id: 'foo'}, {foo: 'baz'}, next2);
+        };
 
-      var t1, t2, result2;
-      var next2 = function (err, result) {
-        result2 = result;
-        test.equal(result2.numberAffected, 1);
-        if (! useUpdate)
-          test.isFalse(result2.insertedId);
-        compareResults(test, useUpdate, coll.find().fetch(), [{foo: 'baz', _id: result1.insertedId}]);
-        coll.remove({_id: 'foo'});
-        compareResults(test, useUpdate, coll.find().fetch(), []);
+        // Test starts here.
+        upsert(coll, useUpdate, {_id: 'foo'}, {_id: 'foo', foo: 'bar'}, next1);
 
-        // Test values that require transformation to go into Mongo:
+        var t1, t2, result2;
+        var next2 = function (err, result) {
+          result2 = result;
+          test.equal(result2.numberAffected, 1);
+          if (! useUpdate)
+            test.isFalse(result2.insertedId);
+          compareResults(test, useUpdate, coll.find().fetch(), [{foo: 'baz', _id: result1.insertedId}]);
+          coll.remove({_id: 'foo'});
+          compareResults(test, useUpdate, coll.find().fetch(), []);
 
-        t1 = new Meteor.Collection.ObjectID();
-        t2 = new Meteor.Collection.ObjectID();
-        upsert(coll, useUpdate, {_id: t1}, {_id: t1, foo: 'bar'}, next3);
-      };
+          // Test values that require transformation to go into Mongo:
 
-      var result3;
-      var next3 = function (err, result) {
-        result3 = result;
-        test.equal(result3.numberAffected, 1);
-        if (! useUpdate) {
-          test.isTrue(result3.insertedId);
-          test.equal(t1, result3.insertedId);
-        }
-        compareResults(test, useUpdate, coll.find().fetch(), [{_id: t1, foo: 'bar'}]);
+          t1 = new Meteor.Collection.ObjectID();
+          t2 = new Meteor.Collection.ObjectID();
+          upsert(coll, useUpdate, {_id: t1}, {_id: t1, foo: 'bar'}, next3);
+        };
 
-        upsert(coll, useUpdate, {_id: t1}, {foo: t2}, next4);
-      };
+        var result3;
+        var next3 = function (err, result) {
+          result3 = result;
+          test.equal(result3.numberAffected, 1);
+          if (! useUpdate) {
+            test.isTrue(result3.insertedId);
+            test.equal(t1, result3.insertedId);
+          }
+          compareResults(test, useUpdate, coll.find().fetch(), [{_id: t1, foo: 'bar'}]);
 
-      var next4 = function (err, result4) {
-        test.equal(result2.numberAffected, 1);
-        if (! useUpdate)
-          test.isFalse(result2.insertedId);
-        compareResults(test, useUpdate, coll.find().fetch(), [{foo: t2, _id: result3.insertedId}]);
+          upsert(coll, useUpdate, {_id: t1}, {foo: t2}, next4);
+        };
 
-        coll.remove({_id: t1});
+        var next4 = function (err, result4) {
+          test.equal(result2.numberAffected, 1);
+          if (! useUpdate)
+            test.isFalse(result2.insertedId);
+          compareResults(test, useUpdate, coll.find().fetch(), [{foo: t2, _id: result3.insertedId}]);
 
-        // Test modification by upsert
-        upsert(coll, useUpdate, {_id: 'David'}, {$set: {foo: 1}}, next5);
-      };
+          coll.remove({_id: t1});
 
-      var result5;
-      var next5 = function (err, result) {
-        result5 = result;
-        test.equal(result5.numberAffected, 1);
-        if (! useUpdate) {
-          test.isTrue(result5.insertedId);
-          test.equal(result5.insertedId, 'David');
-        }
-        var davidId = result5.insertedId;
-        compareResults(test, useUpdate, coll.find().fetch(), [{foo: 1, _id: davidId}]);
+          // Test modification by upsert
+          upsert(coll, useUpdate, {_id: 'David'}, {$set: {foo: 1}}, next5);
+        };
 
-        // test that bad modifier fails
-        // The stub throws an exception about the invalid modifier, which
-        // livedata logs (so we suppress it).
-        Meteor._suppress_log(1);
-        upsert(coll, useUpdate, {_id: 'David'}, {$blah: {foo: 2}}, function (err) {
-          test.isTrue(err);
-          upsert(coll, useUpdate, {_id: 'David'}, {$set: {foo: 2}}, next6);
-        });
-      };
+        var result5;
+        var next5 = function (err, result) {
+          result5 = result;
+          test.equal(result5.numberAffected, 1);
+          if (! useUpdate) {
+            test.isTrue(result5.insertedId);
+            test.equal(result5.insertedId, 'David');
+          }
+          var davidId = result5.insertedId;
+          compareResults(test, useUpdate, coll.find().fetch(), [{foo: 1, _id: davidId}]);
 
-      var result6;
-      var next6 = function (err, result) {
-        result6 = result;
-        test.equal(result6.numberAffected, 1);
-        if (! useUpdate)
-          test.isFalse(result6.insertedId);
-        compareResults(test, useUpdate, coll.find().fetch(), [{_id: 'David', foo: 2}]);
+          if (! Meteor.isClient && useDirectCollection) {
+            // test that bad modifier fails
+            // The stub throws an exception about the invalid modifier, which
+            // livedata logs (so we suppress it).
+            Meteor._suppress_log(1);
+            upsert(coll, useUpdate, {_id: 'David'}, {$blah: {foo: 2}}, function (err) {
+              if (! (Meteor.isClient && useDirectCollection))
+                test.isTrue(err);
+              upsert(coll, useUpdate, {_id: 'David'}, {$set: {foo: 2}}, next6);
+            });
+          } else {
+            // XXX skip this test for now for LocalCollection; the fact that
+            // we're in a nested sequence of callbacks means we're inside a
+            // Meteor.defer, which means the exception just gets
+            // logged. Something should be done about this at some point?  Maybe
+            // LocalCollection callbacks don't really have to be deferred.
+            upsert(coll, useUpdate, {_id: 'David'}, {$set: {foo: 2}}, next6);
+          }
+        };
 
-        var emilyId = coll.insert({_id: 'Emily', foo: 2});
-        compareResults(test, useUpdate, coll.find().fetch(), [{_id: 'David', foo: 2},
-                                             {_id: 'Emily', foo: 2}]);
+        var result6;
+        var next6 = function (err, result) {
+          result6 = result;
+          test.equal(result6.numberAffected, 1);
+          if (! useUpdate)
+            test.isFalse(result6.insertedId);
+          compareResults(test, useUpdate, coll.find().fetch(), [{_id: 'David', foo: 2}]);
 
-        // multi update by upsert.
-        // We can't actually update multiple documents since we have to do it by
-        // id, but at least make sure the multi flag doesn't mess anything up.
-        upsert(coll, useUpdate, {_id: 'Emily'},
-               {$set: {bar: 7},
-                $setOnInsert: {name: 'Fred', foo: 2}},
-               {multi: true}, next7);
-      };
+          var emilyId = coll.insert({_id: 'Emily', foo: 2});
+          compareResults(test, useUpdate, coll.find().fetch(), [{_id: 'David', foo: 2},
+                                                                {_id: 'Emily', foo: 2}]);
 
-      var result7;
-      var next7 = function (err, result) {
-        result7 = result;
-        test.equal(result7.numberAffected, 1);
-        if (! useUpdate)
-          test.isFalse(result7.insertedId);
-        compareResults(test, useUpdate, coll.find().fetch(), [{_id: 'David', foo: 2},
-                                             {_id: 'Emily', foo: 2, bar: 7}]);
+          // multi update by upsert.
+          // We can't actually update multiple documents since we have to do it by
+          // id, but at least make sure the multi flag doesn't mess anything up.
+          upsert(coll, useUpdate, {_id: 'Emily'},
+                 {$set: {bar: 7},
+                  $setOnInsert: {name: 'Fred', foo: 2}},
+                 {multi: true}, next7);
+        };
 
-        // insert by multi upsert
-        upsert(coll, useUpdate, {_id: 'Fred'},
-               {$set: {bar: 7},
-                $setOnInsert: {name: 'Fred', foo: 2}},
-               {multi: true}, next8);
+        var result7;
+        var next7 = function (err, result) {
+          result7 = result;
+          test.equal(result7.numberAffected, 1);
+          if (! useUpdate)
+            test.isFalse(result7.insertedId);
+          compareResults(test, useUpdate, coll.find().fetch(), [{_id: 'David', foo: 2},
+                                                                {_id: 'Emily', foo: 2, bar: 7}]);
 
-      };
+          // insert by multi upsert
+          upsert(coll, useUpdate, {_id: 'Fred'},
+                 {$set: {bar: 7},
+                  $setOnInsert: {name: 'Fred', foo: 2}},
+                 {multi: true}, next8);
 
-      var result8;
-      var next8 = function (err, result) {
-        result8 = result;
+        };
 
-        test.equal(result8.numberAffected, 1);
-        if (! useUpdate) {
-          test.isTrue(result8.insertedId);
-          test.equal(result8.insertedId, 'Fred');
-        }
-        var fredId = result8.insertedId;
-        compareResults(test, useUpdate,  coll.find().fetch(),
-                       [{_id: 'David', foo: 2},
-                        {_id: 'Emily', foo: 2, bar: 7},
-                        {name: 'Fred', foo: 2, bar: 7, _id: fredId}]);
-        onComplete();
-      };
+        var result8;
+        var next8 = function (err, result) {
+          result8 = result;
+
+          test.equal(result8.numberAffected, 1);
+          if (! useUpdate) {
+            test.isTrue(result8.insertedId);
+            test.equal(result8.insertedId, 'Fred');
+          }
+          var fredId = result8.insertedId;
+          compareResults(test, useUpdate,  coll.find().fetch(),
+                         [{_id: 'David', foo: 2},
+                          {_id: 'Emily', foo: 2, bar: 7},
+                          {name: 'Fred', foo: 2, bar: 7, _id: fredId}]);
+          onComplete();
+        };
+      });
     });
   });
+});
 
+if (Meteor.isClient) {
   Tinytest.addAsync("mongo-livedata - async update/remove return values over network " + idGeneration, function (test, onComplete) {
     var coll;
     var run = test.runId();
@@ -1372,8 +1424,7 @@ if (Meteor.isClient) {
       });
     });
   });
-
-} // end isClient
+}
 
 // Runs a method and its stub which do some upserts. The method throws an error
 // if we don't get the right return values.

From 5f84141145b407ad9686776315fe9e0d281fa6e1 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Thu, 3 Oct 2013 08:36:23 -0700
Subject: [PATCH 208/335] Only use mongoOpts when passed into mongo API

---
 packages/mongo-livedata/mongo_driver.js | 50 ++++++++++++-------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/packages/mongo-livedata/mongo_driver.js b/packages/mongo-livedata/mongo_driver.js
index 86708242e3..e43b54563a 100644
--- a/packages/mongo-livedata/mongo_driver.js
+++ b/packages/mongo-livedata/mongo_driver.js
@@ -337,10 +337,9 @@ MongoConnection.prototype._update = function (collection_name, selector, mod,
     var knownId = (isModify ? selector._id : mod._id);
 
     if (options.upsert && (! knownId) && options.insertedId) {
-      mongoOpts.insertedId = options.insertedId;
       simulateUpsertWithInsertedId(
         collection, mongoSelector, mongoMod,
-        isModify, mongoOpts,
+        isModify, options,
         // This callback does not need to be bindEnvironment'ed because
         // simulateUpsertWithInsertedId() wraps it and then passes it through
         // bindEnvironmentForWrite.
@@ -355,21 +354,22 @@ MongoConnection.prototype._update = function (collection_name, selector, mod,
         }
       );
     } else {
-      collection.update(mongoSelector, mongoMod, mongoOpts,
-                        bindEnvironmentForWrite(function (err, result, extra) {
-                          if (! err) {
-                            if (result && options._returnObject) {
-                              result = { numberAffected: result };
-                              // If this was an upsert() call, and we ended up
-                              // inserting a new doc and we know its id, then
-                              // return that id as well.
-                              if (options.upsert && knownId &&
-                                  ! extra.updatedExisting)
-                                result.insertedId = knownId;
-                            }
-                          }
-                          callback(err, result);
-                        }));
+      collection.update(
+        mongoSelector, mongoMod, mongoOpts,
+        bindEnvironmentForWrite(function (err, result, extra) {
+          if (! err) {
+            if (result && options._returnObject) {
+              result = { numberAffected: result };
+              // If this was an upsert() call, and we ended up
+              // inserting a new doc and we know its id, then
+              // return that id as well.
+              if (options.upsert && knownId &&
+                  ! extra.updatedExisting)
+                result.insertedId = knownId;
+            }
+          }
+          callback(err, result);
+        }));
     }
   } catch (e) {
     write.committed();
@@ -425,14 +425,14 @@ var simulateUpsertWithInsertedId = function (collection, selector, mod,
   }
 
   var insertedId = options.insertedId; // must exist
-  var mongoOptsForUpdate = _.extend({}, options);
-  delete mongoOptsForUpdate.insertedId;
-  delete mongoOptsForUpdate.upsert;
-
-  var mongoOptsForInsert = _.extend({}, options);
-  delete mongoOptsForUpdate.insertedId;
-  mongoOptsForInsert.upsert = true;
-  delete mongoOptsForInsert.multi;
+  var mongoOptsForUpdate = {
+    safe: true,
+    multi: options.multi
+  };
+  var mongoOptsForInsert = {
+    safe: true,
+    upsert: true
+  };
 
   var tries = NUM_OPTIMISTIC_TRIES;
 

From a39ff3cc145c33624abde9bdffdf86848e178e69 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Thu, 3 Oct 2013 10:00:08 -0700
Subject: [PATCH 209/335] Add comment about doing real upsert for mongo id
 generation

---
 packages/mongo-livedata/mongo_driver.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/mongo-livedata/mongo_driver.js b/packages/mongo-livedata/mongo_driver.js
index e43b54563a..1f7e999542 100644
--- a/packages/mongo-livedata/mongo_driver.js
+++ b/packages/mongo-livedata/mongo_driver.js
@@ -337,6 +337,9 @@ MongoConnection.prototype._update = function (collection_name, selector, mod,
     var knownId = (isModify ? selector._id : mod._id);
 
     if (options.upsert && (! knownId) && options.insertedId) {
+      // XXX In future we could do a real upsert for the mongo id generation
+      // case, if the the node mongo driver gives us back the id of the upserted
+      // doc (which our current version does not).
       simulateUpsertWithInsertedId(
         collection, mongoSelector, mongoMod,
         isModify, options,

From 82579293f3752782969afa014e52b9526f7a878c Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Thu, 3 Oct 2013 10:16:07 -0700
Subject: [PATCH 210/335] Override docs release temporarily

---
 docs/client/api.js           | 6 +-----
 docs/client/docs.js          | 5 +----
 docs/lib/release-override.js | 5 +++++
 3 files changed, 7 insertions(+), 9 deletions(-)
 create mode 100644 docs/lib/release-override.js

diff --git a/docs/client/api.js b/docs/client/api.js
index d15f33f061..d7e9cfa033 100644
--- a/docs/client/api.js
+++ b/docs/client/api.js
@@ -73,11 +73,7 @@ Template.api.release = {
   descr: ["`Meteor.release` is a string containing the name of the " +
           "[release](#meteorupdate) with which the project was built (for " +
           "example, `\"" +
-          // Put the current release in the docs as the example)
-          // XXX for now this is hard-coded because galaxy apps are on a
-          // different meteor release
-          //         (Meteor.release ? Meteor.release : '0.6.0') +
-          "0.6.5.1" +
+          Meteor.release +
           "\"`). It is `undefined` if the project was built using a git " +
           "checkout of Meteor."]
 };
diff --git a/docs/client/docs.js b/docs/client/docs.js
index 8d77d1e6de..f32972da78 100644
--- a/docs/client/docs.js
+++ b/docs/client/docs.js
@@ -1,8 +1,5 @@
 Template.headline.release = function () {
-  // XXX This is commented out because for now galaxy apps have to be on a
-  // different Meteor release that has a bug fix.
-  return "0.6.5.1";
-  //  return Meteor.release || "(checkout)";
+  return Meteor.release || "(checkout)";
 };
 
 
diff --git a/docs/lib/release-override.js b/docs/lib/release-override.js
new file mode 100644
index 0000000000..fa9c6b7d3b
--- /dev/null
+++ b/docs/lib/release-override.js
@@ -0,0 +1,5 @@
+// While galaxy apps are on their own special meteor releases, override
+// Meteor.release here.
+if (Meteor.isClient) {
+  Meteor.release = Meteor.release ? "0.6.5.1" : undefined;
+}

From cd500b036cb46f7d44f54b91750d249da51287b3 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Thu, 3 Oct 2013 13:43:13 -0700
Subject: [PATCH 211/335] Dissallow $near to be inside $or/$and/$nor/$not

---
 packages/minimongo/minimongo.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index ee5cbacd45..1329a12006 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -90,6 +90,11 @@ LocalCollection.Cursor = function (collection, selector, options) {
     self.selector_f = LocalCollection._compileSelector(selector, self);
     self.sort_f = undefined;
   } else {
+    // MongoDB throws different errors on different branching operators
+    // containing $near
+    if (isGeoQuerySpecial(selector))
+      throw new Error("$near can't be inside $or/$and/$nor/$not");
+
     self.selector_id = undefined;
     self.selector_f = LocalCollection._compileSelector(selector, self);
     self.sort_f = (isGeoQuery(selector) || options.sort) ?
@@ -1177,9 +1182,20 @@ LocalCollection._compileProjection = function (fields) {
   };
 };
 
+// Searches $near operator in the selector recursively
+// (including all $or/$and/$nor/$not branches)
 var isGeoQuery = function (selector) {
   return _.any(selector, function (val, key) {
     return key === "$near" || (_.isObject(val) && isGeoQuery(val));
   });
 };
 
+// Checks if $near appears under some $or/$and/$nor/$not branch
+var isGeoQuerySpecial = function (selector) {
+  return _.any(selector, function (val, key) {
+    if (_.contains(['$or', '$and', '$nor', '$not'], key))
+      return isGeoQuery(val);
+    return _.isObject(val) && isGeoQuerySpecial(val);
+  });
+};
+

From d5159ae81b2d5b7b39b1dfa340a7e14eecaeb343 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Wed, 2 Oct 2013 13:41:22 -0700
Subject: [PATCH 212/335] Rename BrowserPolicy framing functions.

Orient them around the default policy, which is app can be framed by any origin.
---
 docs/client/packages/browser-policy.html  | 18 ++++++++----------
 packages/browser-policy/browser-policy.js | 12 ++++--------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/docs/client/packages/browser-policy.html b/docs/client/packages/browser-policy.html
index f7676e7445..88204e770b 100644
--- a/docs/client/packages/browser-policy.html
+++ b/docs/client/packages/browser-policy.html
@@ -42,30 +42,28 @@ call `BrowserPolicy` functions in top-level application code or in
 #### Frame options
 
 You can use the following functions to specify which websites are allowed to
-frame your app:
+frame your app. By default, any website is allowed.
 <dl class="callbacks">
 {{#dtdd "BrowserPolicy.disallowFraming()"}}
 Your app will never render inside a frame or iframe.
 {{/dtdd}}
 
-{{#dtdd "BrowserPolicy.allowFramingByOrigin(origin)"}}
+{{#dtdd "BrowserPolicy.restrictFramingToOrigin(origin)"}}
 Your app will only render inside frames loaded by `origin`. You can only call
 this function once with a single origin, and cannot use wildcards or specify
 multiple origins that are allowed to frame your app. (This is a limitation of
 the X-Frame-Options header.) Example values of `origin` include
-"http://example.com" and "https://foo.example.com". Note that this value of the
-X-Frame-Options header is not yet supported in Chrome or Safari and will be
-ignored in those browsers.
+"http://example.com" and "https://foo.example.com".
+{{#warning}}
+This value of the X-Frame-Options header is not yet supported in Chrome or
+Safari and will be ignored in those browsers.
+{{/warning}}
 {{/dtdd}}
 
-{{#dtdd "BrowserPolicy.allowFramingBySameOrigin()"}}
+{{#dtdd "BrowserPolicy.restrictFramingToSameOrigin()"}}
 Your app will only render inside frames loaded by webpages on the same origin as
 your app.
 {{/dtdd}}
-
-{{#dtdd "BrowserPolicy.allowFramingByAnyOrigin()"}}
-Your app can be framed by any website.
-{{/dtdd}}
 </dl>
 
 #### Content options
diff --git a/packages/browser-policy/browser-policy.js b/packages/browser-policy/browser-policy.js
index a605d7f13e..25cff2e31a 100644
--- a/packages/browser-policy/browser-policy.js
+++ b/packages/browser-policy/browser-policy.js
@@ -40,9 +40,8 @@
 //
 // For controlling which origins can frame this app,
 // BrowserPolicy.disallowFraming()
-// BrowserPolicy.allowFramingByOrigin(origin)
-// BrowserPolicy.allowFramingBySameOrigin()
-// BrowserPolicy.allowFramingByAnyOrigin();
+// BrowserPolicy.restrictFramingToOrigin(origin)
+// BrowserPolicy.restrictFramingToSameOrigin()
 
 var xFrameOptions;
 var cspSrcs;
@@ -135,14 +134,14 @@ BrowserPolicy = _.extend(BrowserPolicy, {
     cspEnabled = false;
   },
 
-  allowFramingBySameOrigin: function () {
+  restrictFramingToSameOrigin: function () {
     xFrameOptions = "SAMEORIGIN";
   },
   disallowFraming: function () {
     xFrameOptions = "DENY";
   },
   // ALLOW-FROM not supported in Chrome or Safari.
-  allowFramingByOrigin: function (origin) {
+  restrictFramingToOrigin: function (origin) {
     // Trying to specify two allow-from throws to prevent users from
     // accidentally overwriting an allow-from origin when they think they are
     // adding multiple origins.
@@ -151,9 +150,6 @@ BrowserPolicy = _.extend(BrowserPolicy, {
                       " frame this app.");
     xFrameOptions = "ALLOW-FROM " + origin;
   },
-  allowFramingByAnyOrigin: function () {
-    xFrameOptions = null;
-  },
 
   // _enableForTests means that you can call CSP functions, but the header won't
   // actually be sent.

From b5286b941a77a1bdd57abb1ea01385eeaa62f7ea Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Wed, 2 Oct 2013 18:50:27 -0700
Subject: [PATCH 213/335] Separate browser policy functions into two packages.

* browser-policy uses browser-policy-framing and browser-policy-content, both of
  which set default policies when they are used. This way you get a default
  policy when you add a browser policy package, but you can pick and choose
  different packages if you only want to think about one of them.
* The two packages use different namespaces: BrowserPolicy.framing and
  BrowserPolicy.content, which meant some functions got renamed (e.g. not using
  "framing" or "content in the function name when it's already in the
  namespace).
---
 docs/client/packages/browser-policy.html      | 122 ++++----
 packages/browser-policy-common/.gitignore     |   1 +
 .../browser-policy-common.js                  |  27 ++
 packages/browser-policy-common/package.js     |  10 +
 packages/browser-policy-content/.gitignore    |   1 +
 .../browser-policy-content.js                 | 219 ++++++++++++++
 packages/browser-policy-content/package.js    |   9 +
 packages/browser-policy-framing/.gitignore    |   1 +
 .../browser-policy-framing.js                 |  39 +++
 packages/browser-policy-framing/package.js    |   9 +
 .../browser-policy/browser-policy-test.js     | 112 +++----
 packages/browser-policy/browser-policy.js     | 280 ------------------
 packages/browser-policy/package.js            |   7 +-
 packages/webapp/webapp_server.js              |  12 +-
 14 files changed, 451 insertions(+), 398 deletions(-)
 create mode 100644 packages/browser-policy-common/.gitignore
 create mode 100644 packages/browser-policy-common/browser-policy-common.js
 create mode 100644 packages/browser-policy-common/package.js
 create mode 100644 packages/browser-policy-content/.gitignore
 create mode 100644 packages/browser-policy-content/browser-policy-content.js
 create mode 100644 packages/browser-policy-content/package.js
 create mode 100644 packages/browser-policy-framing/.gitignore
 create mode 100644 packages/browser-policy-framing/browser-policy-framing.js
 create mode 100644 packages/browser-policy-framing/package.js
 delete mode 100644 packages/browser-policy/browser-policy.js

diff --git a/docs/client/packages/browser-policy.html b/docs/client/packages/browser-policy.html
index 88204e770b..2366c135c7 100644
--- a/docs/client/packages/browser-policy.html
+++ b/docs/client/packages/browser-policy.html
@@ -6,34 +6,38 @@ The `browser-policy` package lets you set security-related policies that will be
 enforced by newer browsers. These policies help you prevent and mitigate common
 attacks like cross-site scripting and clickjacking.
 
-`browser-policy` lets you configure the HTTP headers X-Frame-Options and
-Content-Security-Policy. X-Frame-Options tells the browser which websites are
-allowed to frame your app. You should only let trusted websites frame your app,
-because malicious sites could harm your users
-with <a href="https://www.owasp.org/index.php/Clickjacking">clickjacking
+When you add `browser-policy` to your app, you get default configurations for
+the HTTP headers X-Frame-Options and Content-Security-Policy. X-Frame-Options
+tells the browser which websites are allowed to frame your app. You should only
+let trusted websites frame your app, because malicious sites could harm your
+users with <a href="https://www.owasp.org/index.php/Clickjacking">clickjacking
 attacks</a>.
 <a href="https://developer.mozilla.org/en-US/docs/Security/CSP/Introducing_Content_Security_Policy">Content-Security-Policy</a>
 tells the browser where your app can load content from, which encourages safe
 practices and mitigates the damage of a cross-site-scripting attack.
+`browser-policy` also provides functions for you to configure these policies if
+the defaults are not suitable.
 
-For most apps, we recommend that you take the following steps when using
-`browser-policy`:
+If you only want to use Content-Security-Policy or X-Frame-Options but not both,
+you can add the individual packages `browser-policy-content` or
+`browser-policy-framing` instead of `browser-policy`.
 
-* Call `BrowserPolicy.enableContentSecurityPolicy()` to enable a starter policy
-for your app. With this starter policy, your app's client code will be able to
-load content (images, scripts, fonts, etc.) only from its own origin, except
-that XMLHttpRequests and WebSocket connections can go to any origin. Further,
-your app's client code will not be able to use functions such as `eval()` that
-convert strings to code.
-* You can use the functions described below to customize the content
-security policy. If your app does not need any inline Javascript such as inline
-`<script>` tags, we recommend that you modify the policy by calling
-`BrowserPolicy.disallowInlineScripts()` in server code. This will result in one
-extra round trip when your app is loaded, but will help prevent cross-site
-scripting attacks by disabling all scripts except those loaded from a `script
-src` attribute.
-* If your app does not need to be framed by other websites, call
-`BrowserPolicy.allowFramingBySameOrigin()` to help prevent clickjacking attacks.
+For most apps, we recommend that you take the following steps:
+
+* Add `browser-policy` to your app to enable a starter policy. With this starter
+policy, your app's client code will be able to load content (images, scripts,
+fonts, etc.) only from its own origin, except that XMLHttpRequests and WebSocket
+connections can go to any origin. Further, your app's client code will not be
+able to use functions such as `eval()` that convert strings to code. Users'
+browsers will only let your app be framed by web pages on the same origin as
+your app.
+* You can use the functions described below to customize the policies. If your
+app does not need any inline Javascript such as inline `<script>` tags, we
+recommend that you modify the policy by calling
+`BrowserPolicy.content.disallowInlineScripts()` in server code. This will result
+in one extra round trip when your app is loaded, but will help prevent
+cross-site scripting attacks by disabling all scripts except those loaded from a
+`script src` attribute.
 
 Meteor determines the browser policy when the server starts up, so you should
 call `BrowserPolicy` functions in top-level application code or in
@@ -41,14 +45,14 @@ call `BrowserPolicy` functions in top-level application code or in
 
 #### Frame options
 
-You can use the following functions to specify which websites are allowed to
-frame your app. By default, any website is allowed.
+By default, only web pages on the same origin as your app are allowed to frame
+your app. You can use the following functions to modify this policy.
 <dl class="callbacks">
-{{#dtdd "BrowserPolicy.disallowFraming()"}}
+{{#dtdd "BrowserPolicy.framing.disallow()"}}
 Your app will never render inside a frame or iframe.
 {{/dtdd}}
 
-{{#dtdd "BrowserPolicy.restrictFramingToOrigin(origin)"}}
+{{#dtdd "BrowserPolicy.framing.restrictToOrigin(origin)"}}
 Your app will only render inside frames loaded by `origin`. You can only call
 this function once with a single origin, and cannot use wildcards or specify
 multiple origins that are allowed to frame your app. (This is a limitation of
@@ -60,47 +64,46 @@ Safari and will be ignored in those browsers.
 {{/warning}}
 {{/dtdd}}
 
-{{#dtdd "BrowserPolicy.restrictFramingToSameOrigin()"}}
-Your app will only render inside frames loaded by webpages on the same origin as
-your app.
+{{#dtdd "BrowserPolicy.framing.allowAll()"}}
+This unsets the X-Frame-Options header, so that your app can be framed by
+any webpage.
 {{/dtdd}}
 </dl>
 
 #### Content options
 
 You can use the functions in this section to control how different types of
-content can be loaded on your site. In order to use any of these functions, you
-must first call `BrowserPolicy.enableContentSecurityPolicy()`, which enables the
-starter policy described above. This section covers additional functions that
-you can use to tighten or relax restrictions on what content your app can use.
+content can be loaded on your site.
 
 You can use the following functions to adjust policies on where Javascript and
 CSS can be run:
 
 <dl class="callbacks">
-{{#dtdd "BrowserPolicy.allowInlineScripts()"}}
+{{#dtdd "BrowserPolicy.content.allowInlineScripts()"}}
 Allows inline `<script>` tags, `javascript:` URLs, and inline event handlers.
+The default policy already allows inline scripts.
 {{/dtdd}}
 
-{{#dtdd "BrowserPolicy.disallowInlineScripts()"}}
+{{#dtdd "BrowserPolicy.content.disallowInlineScripts()"}}
 Disallows inline Javascript. Calling this function results in an extra
 round-trip on page load to retrieve Meteor runtime configuration that is usually
 part of an inline script tag.
 {{/dtdd}}
 
-{{#dtdd "BrowserPolicy.allowEval()"}}
+{{#dtdd "BrowserPolicy.content.allowEval()"}}
 Allows the creation of Javascript code from strings using function such as `eval()`.
 {{/dtdd}}
 
-{{#dtdd "BrowserPolicy.disallowEval()"}}
-Disallows eval and related functions.
+{{#dtdd "BrowserPolicy.content.disallowEval()"}}
+Disallows eval and related functions. The default policy already disallows eval.
 {{/dtdd}}
 
-{{#dtdd "BrowserPolicy.allowInlineStyles()"}}
-Allows inline style tags and style attributes.
+{{#dtdd "BrowserPolicy.content.allowInlineStyles()"}}
+Allows inline style tags and style attributes. The default policy already allows
+inline styles.
 {{/dtdd}}
 
-{{#dtdd "BrowserPolicy.disallowInlineStyles()"}}
+{{#dtdd "BrowserPolicy.content.disallowInlineStyles()"}}
 Disallows inline CSS.
 {{/dtdd}}
 </dl>
@@ -110,7 +113,7 @@ content can make. The following functions are defined for the content types
 script, object, image, media, font, and connect.
 
 <dl class="callbacks">
-{{#dtdd "BrowserPolicy.allow&lt;ContentType&gt;Origin(origin)"}}
+{{#dtdd "BrowserPolicy.content.allow&lt;ContentType&gt;Origin(origin)"}}
 Allows this type of content to be loaded from the given origin. `origin` is a
 string and can include an optional scheme (such as `http` or `https`), an
 optional wildcard at the beginning, and an optional port which can be a
@@ -119,34 +122,41 @@ wildcard. Examples include `example.com`, `https://*.example.com`, and
 origins to specify a whitelist of allowed origins.
 {{/dtdd}}
 
-{{#dtdd "BrowserPolicy.allow&lt;ContentType&gt;DataUrl()"}}
+{{#dtdd "BrowserPolicy.content.allow&lt;ContentType&gt;DataUrl()"}}
 Allows this type of content to be loaded from a `data:` URL.
 {{/dtdd}}
 
-{{#dtdd "BrowserPolicy.allow&lt;ContentType&gt;SameOrigin()"}}
+{{#dtdd "BrowserPolicy.content.allow&lt;ContentType&gt;SameOrigin()"}}
 Allows this type of content to be loaded from the same origin as your app.
 {{/dtdd}}
 
-{{#dtdd "BrowserPolicy.disallow&lt;ContentType&gt;()"}}
+{{#dtdd "BrowserPolicy.content.disallow&lt;ContentType&gt;()"}}
 Disallows this type of content on your app.
 {{/dtdd}}
 </dl>
 
-These functions are also defined for the content type `AllContent`, which is a
-shorthand for calling one of the above functions once for each content type.
-For example, if you want to allow the origin `https://foo.com` for all types of
-content but you want to disable `<object>` tags, you can call
-`BrowserPolicy.allowAllContentOrigin("https://foo.com")` followed by
-`BrowserPolicy.disallowObject()`.
+You can also set policies for all these types of content at once, using these
+functions:
 
-Other examples of using the `BrowserPolicy` API:
+* `BrowserPolicy.content.allowSameOriginForAll()`,
+* `BrowserPolicy.content.allowDataUrlForAll()`,
+* `BrowserPolicy.content.allowOriginForAll(origin)`
+* `BrowserPolicy.content.disallowAll()`
 
-* `BrowserPolicy.disallowObject()` causes the browser to disallow all
-`<object>` tags.
-* `BrowserPolicy.allowImageOrigin("https://example.com")`
+For example, if you want to allow the
+origin `https://foo.com` for all types of content but you want to disable
+`<object>` tags, you can call
+`BrowserPolicy.content.allowOriginForAll("https://foo.com")` followed by
+`BrowserPolicy.content.disallowObject()`.
+
+Other examples of using the `BrowserPolicy.content` API:
+
+* `BrowserPolicy.content.disallowFont()` causes the browser to disallow all
+`<font>` tags.
+* `BrowserPolicy.content.allowImageOrigin("https://example.com")`
 allows images to have their `src` attributes point to images served from
 `https://example.com`.
-* `BrowserPolicy.allowConnectOrigin("https://example.com")` allows XMLHttpRequest
+* `BrowserPolicy.content.allowConnectOrigin("https://example.com")` allows XMLHttpRequest
 and WebSocket connections to `https://example.com`.
 
 
diff --git a/packages/browser-policy-common/.gitignore b/packages/browser-policy-common/.gitignore
new file mode 100644
index 0000000000..677a6fc263
--- /dev/null
+++ b/packages/browser-policy-common/.gitignore
@@ -0,0 +1 @@
+.build*
diff --git a/packages/browser-policy-common/browser-policy-common.js b/packages/browser-policy-common/browser-policy-common.js
new file mode 100644
index 0000000000..9dd18f8556
--- /dev/null
+++ b/packages/browser-policy-common/browser-policy-common.js
@@ -0,0 +1,27 @@
+BrowserPolicy = {};
+
+var inTest = false;
+
+BrowserPolicy._runningTest = function () {
+  return inTest;
+};
+
+BrowserPolicy._setRunningTest = function () {
+  inTest = true;
+};
+
+WebApp.connectHandlers.use(function (req, res, next) {
+  // Never set headers inside tests because they could break other tests.
+  if (BrowserPolicy._runningTest())
+    return next();
+
+  var xFrameOptions = BrowserPolicy.framing &&
+        BrowserPolicy.framing._constructXFrameOptions();
+  var csp = BrowserPolicy.content &&
+        BrowserPolicy.content._constructCsp();
+  if (xFrameOptions)
+    res.setHeader("X-Frame-Options", xFrameOptions);
+  if (csp)
+    res.setHeader("Content-Security-Policy", csp);
+  next();
+});
diff --git a/packages/browser-policy-common/package.js b/packages/browser-policy-common/package.js
new file mode 100644
index 0000000000..b4ae927603
--- /dev/null
+++ b/packages/browser-policy-common/package.js
@@ -0,0 +1,10 @@
+Package.describe({
+  summary: "Common code for browser-policy packages",
+  internal: true
+});
+
+Package.on_use(function (api) {
+  api.use('webapp', 'server');
+  api.add_files('browser-policy-common.js', 'server');
+  api.export('BrowserPolicy', 'server');
+});
diff --git a/packages/browser-policy-content/.gitignore b/packages/browser-policy-content/.gitignore
new file mode 100644
index 0000000000..677a6fc263
--- /dev/null
+++ b/packages/browser-policy-content/.gitignore
@@ -0,0 +1 @@
+.build*
diff --git a/packages/browser-policy-content/browser-policy-content.js b/packages/browser-policy-content/browser-policy-content.js
new file mode 100644
index 0000000000..4b7e3f11ca
--- /dev/null
+++ b/packages/browser-policy-content/browser-policy-content.js
@@ -0,0 +1,219 @@
+// By adding this package, you get the following default policy:
+// No eval or other string-to-code, and content can only be loaded from the
+// same origin as the app (except for XHRs and websocket connections, which can
+// go to any origin).
+//
+// Apps should call BrowserPolicy.content.disallowInlineScripts() if they are
+// not using any inline script tags and are willing to accept an extra round
+// trip on page load.
+//
+// BrowserPolicy.content functions for tweaking CSP:
+// allowInlineScripts()
+// disallowInlineScripts(): adds extra round-trip to page load time
+// allowInlineStyles()
+// disallowInlineStyles()
+// allowEval()
+// disallowEval()
+//
+// For each type of content (script, object, image, media, font, connect,
+// style), there are the following functions:
+// allow<content type>Origin(origin): allows the type of content to be loaded
+// from the given origin
+// allow<content type>DataUrl(): allows the content to be loaded from data: URLs
+// allow<content type>SameOrigin(): allows the content to be loaded from the
+// same origin
+// disallow<content type>(): disallows this type of content all together (can't
+// be called for script)
+//
+// The following functions allow you to set rules for all types of content at
+// once:
+// allowAllContentOrigin(origin)
+// allowAllContentDataUrl()
+// allowAllContentSameOrigin()
+// disallowAllContent()
+//
+
+var cspSrcs;
+// CSP keywords have to be single-quoted.
+var unsafeInline = "'unsafe-inline'";
+var unsafeEval = "'unsafe-eval'";
+var selfKeyword = "'self'";
+var noneKeyword = "'none'";
+
+BrowserPolicy.content = {};
+
+var parseCsp = function (csp) {
+  var policies = csp.split("; ");
+  cspSrcs = {};
+  _.each(policies, function (policy) {
+    if (policy[policy.length - 1] === ";")
+      policy = policy.substring(0, policy.length - 1);
+    var srcs = policy.split(" ");
+    var directive = srcs[0];
+    if (_.indexOf(srcs, noneKeyword) !== -1)
+      cspSrcs[directive] = null;
+    else
+      cspSrcs[directive] = srcs.slice(1);
+  });
+
+  if (cspSrcs["default-src"] === undefined)
+    throw new Error("Content Security Policies used with " +
+                    "browser-policy must specify a default-src.");
+
+  // Copy default-src sources to other directives.
+  _.each(cspSrcs, function (sources, directive) {
+    cspSrcs[directive] = _.union(sources || [], cspSrcs["default-src"] || []);
+  });
+};
+
+var removeCspSrc = function (directive, src) {
+  cspSrcs[directive] = _.without(cspSrcs[directive] || [], src);
+};
+
+var ensureDirective = function (directive) {
+  cspSrcs = cspSrcs || {};
+  if (! _.has(cspSrcs, directive))
+    cspSrcs[directive] = _.clone(cspSrcs["default-src"]);
+};
+
+var setDefaultPolicy = function () {
+  // By default, unsafe inline scripts and styles are allowed, since we expect
+  // many apps will use them for analytics, etc. Unsafe eval is disallowed, and
+  // the only allowable content source is the same origin or data, except for
+  // connect which allows anything (since meteor.com apps make websocket
+  // connections to a lot of different origins).
+  BrowserPolicy.content.setPolicy("default-src 'self'; " +
+                                  "script-src 'self' 'unsafe-inline'; " +
+                                  "connect-src *; " +
+                                  "img-src data: 'self'; " +
+                                  "style-src 'self' 'unsafe-inline';");
+};
+
+_.extend(BrowserPolicy.content, {
+  // Exported for tests and browser-policy-common.
+  _constructCsp: function () {
+    if (! cspSrcs || _.isEmpty(cspSrcs))
+      return null;
+
+    var header = _.map(cspSrcs, function (srcs, directive) {
+      srcs = srcs || [];
+      if (_.isEmpty(srcs))
+        srcs = [noneKeyword];
+      var directiveCsp = _.uniq(srcs).join(" ");
+      return directive + " " + directiveCsp + ";";
+    });
+
+    header = header.join(" ");
+    return header;
+  },
+  _reset: function () {
+    setDefaultPolicy();
+  },
+
+  setPolicy: function (csp) {
+    parseCsp(csp);
+  },
+
+  _keywordAllowed: function (directive, keyword) {
+    return (cspSrcs[directive] &&
+            _.indexOf(cspSrcs[directive], keyword) !== -1);
+  },
+
+  // Used by webapp to determine whether we need an extra round trip for
+  // __meteor_runtime_config__.  If we're in a test run, we should always return
+  // true, since CSP headers are never sent on tests -- unless the
+  // _calledFromTests flag is set, in which case a test is testing what
+  // inlineScriptsAllowed() would return if we weren't in a test. Wphew.
+  // XXX maybe this test interface could be cleaned up
+  inlineScriptsAllowed: function (_calledFromTests) {
+    if (BrowserPolicy._runningTest() && ! _calledFromTests)
+      return true;
+
+    return BrowserPolicy.content._keywordAllowed("script-src",
+                                                 unsafeInline);
+  },
+
+  // Helpers for creating content security policies
+
+  allowInlineScripts: function () {
+    ensureDirective("script-src");
+    cspSrcs["script-src"].push(unsafeInline);
+  },
+  disallowInlineScripts: function () {
+    ensureDirective("script-src");
+    removeCspSrc("script-src", unsafeInline);
+  },
+  allowEval: function () {
+    ensureDirective("script-src");
+    cspSrcs["script-src"].push(unsafeEval);
+  },
+  disallowEval: function () {
+    ensureDirective("script-src");
+    removeCspSrc("script-src", unsafeEval);
+  },
+  allowInlineStyles: function () {
+    ensureDirective("style-src");
+    cspSrcs["style-src"].push(unsafeInline);
+  },
+  disallowInlineStyles: function () {
+    ensureDirective("style-src");
+    removeCspSrc("style-src", unsafeInline);
+  },
+
+  // Functions for setting defaults
+  allowSameOriginForAll: function () {
+    BrowserPolicy.content.allowOriginForAll(selfKeyword);
+  },
+  allowDataUrlForAll: function () {
+    BrowserPolicy.content.allowOriginForAll("data:");
+  },
+  allowOriginForAll: function (origin) {
+    ensureDirective("default-src");
+    _.each(_.keys(cspSrcs), function (directive) {
+      cspSrcs[directive].push(origin);
+    });
+  },
+  disallowAll: function () {
+    cspSrcs = {
+      "default-src": []
+    };
+  }
+});
+
+// allow<Resource>Origin, allow<Resource>Data, allow<Resource>self, and
+// disallow<Resource> methods for each type of resource.
+_.each(["script", "object", "img", "media",
+        "font", "connect", "style"],
+       function (resource) {
+         var directive = resource + "-src";
+         var methodResource;
+         if (resource !== "img") {
+           methodResource = resource.charAt(0).toUpperCase() +
+             resource.slice(1);
+         } else {
+           methodResource = "Image";
+         }
+         var allowMethodName = "allow" + methodResource + "Origin";
+         var disallowMethodName = "disallow" + methodResource;
+         var allowDataMethodName = "allow" + methodResource + "DataUrl";
+         var allowSelfMethodName = "allow" + methodResource + "SameOrigin";
+
+         BrowserPolicy.content[allowMethodName] = function (src) {
+           ensureDirective(directive);
+           cspSrcs[directive].push(src);
+         };
+         BrowserPolicy.content[disallowMethodName] = function () {
+           cspSrcs[directive] = [];
+         };
+         BrowserPolicy.content[allowDataMethodName] = function () {
+           ensureDirective(directive);
+           cspSrcs[directive].push("data:");
+         };
+         BrowserPolicy.content[allowSelfMethodName] = function () {
+           ensureDirective(directive);
+           cspSrcs[directive].push(selfKeyword);
+         };
+       });
+
+
+setDefaultPolicy();
diff --git a/packages/browser-policy-content/package.js b/packages/browser-policy-content/package.js
new file mode 100644
index 0000000000..542951fb4c
--- /dev/null
+++ b/packages/browser-policy-content/package.js
@@ -0,0 +1,9 @@
+Package.describe({
+  summary: "Configure content security policies"
+});
+
+Package.on_use(function (api) {
+  api.imply(["browser-policy-common"], "server");
+  api.add_files("browser-policy-content.js", "server");
+  api.use(["underscore", "browser-policy-common"], "server");
+});
diff --git a/packages/browser-policy-framing/.gitignore b/packages/browser-policy-framing/.gitignore
new file mode 100644
index 0000000000..677a6fc263
--- /dev/null
+++ b/packages/browser-policy-framing/.gitignore
@@ -0,0 +1 @@
+.build*
diff --git a/packages/browser-policy-framing/browser-policy-framing.js b/packages/browser-policy-framing/browser-policy-framing.js
new file mode 100644
index 0000000000..6b7439c375
--- /dev/null
+++ b/packages/browser-policy-framing/browser-policy-framing.js
@@ -0,0 +1,39 @@
+// By adding this package, you get a default policy where only web pages on the
+// same origin as your app can frame your app.
+//
+// For controlling which origins can frame this app,
+// BrowserPolicy.framing.disallow()
+// BrowserPolicy.framing.restrictToOrigin(origin)
+// BrowserPolicy.framing.allowByAnyOrigin()
+
+var defaultXFrameOptions = "SAMEORIGIN";
+var xFrameOptions = defaultXFrameOptions;
+
+BrowserPolicy.framing = {};
+
+_.extend(BrowserPolicy.framing, {
+  // Exported for tests and browser-policy-common.
+  _constructXFrameOptions: function () {
+    return xFrameOptions;
+  },
+  _reset: function () {
+    xFrameOptions = defaultXFrameOptions;
+  },
+
+  disallow: function () {
+    xFrameOptions = "DENY";
+  },
+  // ALLOW-FROM not supported in Chrome or Safari.
+  restrictToOrigin: function (origin) {
+    // Trying to specify two allow-from throws to prevent users from
+    // accidentally overwriting an allow-from origin when they think they are
+    // adding multiple origins.
+    if (xFrameOptions && xFrameOptions.indexOf("ALLOW-FROM") === 0)
+      throw new Error("You can only specify one origin that is allowed to" +
+                      " frame this app.");
+    xFrameOptions = "ALLOW-FROM " + origin;
+  },
+  allowAll: function () {
+    xFrameOptions = null;
+  }
+});
diff --git a/packages/browser-policy-framing/package.js b/packages/browser-policy-framing/package.js
new file mode 100644
index 0000000000..e21a0ad8f8
--- /dev/null
+++ b/packages/browser-policy-framing/package.js
@@ -0,0 +1,9 @@
+Package.describe({
+  summary: "Restrict which websites can frame your app"
+});
+
+Package.on_use(function (api) {
+  api.imply(["browser-policy-common"], "server");
+  api.use(["underscore", "browser-policy-common"], "server");
+  api.add_files("browser-policy-framing.js", "server");
+});
diff --git a/packages/browser-policy/browser-policy-test.js b/packages/browser-policy/browser-policy-test.js
index cf9ddd9e59..08757a3235 100644
--- a/packages/browser-policy/browser-policy-test.js
+++ b/packages/browser-policy/browser-policy-test.js
@@ -1,3 +1,5 @@
+BrowserPolicy._setRunningTest();
+
 var cspsEqual = function (csp1, csp2) {
   var cspToObj = function (csp) {
     csp = csp.substring(0, csp.length - 1);
@@ -15,109 +17,111 @@ var cspsEqual = function (csp1, csp2) {
   return EJSON.equals(cspToObj(csp1), cspToObj(csp2));
 };
 
+// It's important to call _reset() at the beginnning of these tests; otherwise
+// the headers left over at the end of the last test run will be used.
+
 Tinytest.add("browser-policy - csp", function (test) {
   var defaultCsp = "default-src 'self'; script-src 'self' 'unsafe-inline'; " +
         "connect-src * 'self'; img-src data: 'self'; style-src 'self' 'unsafe-inline';"
-  BrowserPolicy.enableContentSecurityPolicy(true /* enable for tests */);
 
+  BrowserPolicy.content._reset();
   // Default policy
-  test.isTrue(cspsEqual(BrowserPolicy._constructCsp(), defaultCsp));
-  test.isTrue(BrowserPolicy.inlineScriptsAllowed(true /* tests-only flag */));
+  test.isTrue(cspsEqual(BrowserPolicy.content._constructCsp(), defaultCsp));
+  test.isTrue(BrowserPolicy.content.inlineScriptsAllowed(true /* tests-only flag */));
 
   // Redundant whitelisting (inline scripts already allowed in default policy)
-  BrowserPolicy.allowInlineScripts();
-  test.isTrue(cspsEqual(BrowserPolicy._constructCsp(), defaultCsp));
+  BrowserPolicy.content.allowInlineScripts();
+  test.isTrue(cspsEqual(BrowserPolicy.content._constructCsp(), defaultCsp));
 
   // Disallow inline scripts
-  BrowserPolicy.disallowInlineScripts();
-  test.isTrue(cspsEqual(BrowserPolicy._constructCsp(),
+  BrowserPolicy.content.disallowInlineScripts();
+  test.isTrue(cspsEqual(BrowserPolicy.content._constructCsp(),
                         "default-src 'self'; script-src 'self'; " +
                         "connect-src * 'self'; img-src data: 'self'; style-src 'self' 'unsafe-inline';"));
-  test.isFalse(BrowserPolicy.inlineScriptsAllowed(true));
+  test.isFalse(BrowserPolicy.content.inlineScriptsAllowed(true));
 
   // Allow eval
-  BrowserPolicy.allowEval();
-  test.isTrue(cspsEqual(BrowserPolicy._constructCsp(), "default-src 'self'; script-src 'self' 'unsafe-eval'; " +
+  BrowserPolicy.content.allowEval();
+  test.isTrue(cspsEqual(BrowserPolicy.content._constructCsp(), "default-src 'self'; script-src 'self' 'unsafe-eval'; " +
                         "connect-src * 'self'; img-src data: 'self'; style-src 'self' 'unsafe-inline';"));
 
   // Disallow inline styles
-  BrowserPolicy.disallowInlineStyles();
-  test.isTrue(cspsEqual(BrowserPolicy._constructCsp(), "default-src 'self'; script-src 'self' 'unsafe-eval'; " +
+  BrowserPolicy.content.disallowInlineStyles();
+  test.isTrue(cspsEqual(BrowserPolicy.content._constructCsp(), "default-src 'self'; script-src 'self' 'unsafe-eval'; " +
                         "connect-src * 'self'; img-src data: 'self'; style-src 'self';"));
 
   // Allow data: urls everywhere
-  BrowserPolicy.allowAllContentDataUrl();
-  test.isTrue(cspsEqual(BrowserPolicy._constructCsp(),
+  BrowserPolicy.content.allowDataUrlForAll();
+  test.isTrue(cspsEqual(BrowserPolicy.content._constructCsp(),
                         "default-src 'self' data:; script-src 'self' 'unsafe-eval' data:; " +
                         "connect-src * data: 'self'; img-src data: 'self'; style-src 'self' data:;"));
 
   // Disallow everything
-  BrowserPolicy.disallowAllContent();
-  test.isTrue(cspsEqual(BrowserPolicy._constructCsp(), "default-src 'none';"));
-  test.isFalse(BrowserPolicy.inlineScriptsAllowed(true));
+  BrowserPolicy.content.disallowAll();
+  test.isTrue(cspsEqual(BrowserPolicy.content._constructCsp(), "default-src 'none';"));
+  test.isFalse(BrowserPolicy.content.inlineScriptsAllowed(true));
 
   // Put inline scripts back in
-  BrowserPolicy.allowInlineScripts();
-  test.isTrue(cspsEqual(BrowserPolicy._constructCsp(),
+  BrowserPolicy.content.allowInlineScripts();
+  test.isTrue(cspsEqual(BrowserPolicy.content._constructCsp(),
                         "default-src 'none'; script-src 'unsafe-inline';"));
-  test.isTrue(BrowserPolicy.inlineScriptsAllowed(true));
+  test.isTrue(BrowserPolicy.content.inlineScriptsAllowed(true));
 
   // Add 'self' to all content types
-  BrowserPolicy.allowAllContentSameOrigin();
-  test.isTrue(cspsEqual(BrowserPolicy._constructCsp(),
+  BrowserPolicy.content.allowSameOriginForAll();
+  test.isTrue(cspsEqual(BrowserPolicy.content._constructCsp(),
                         "default-src 'self'; script-src 'self' 'unsafe-inline';"));
-  test.isTrue(BrowserPolicy.inlineScriptsAllowed(true));
+  test.isTrue(BrowserPolicy.content.inlineScriptsAllowed(true));
 
   // Disallow all content except same-origin scripts
-  BrowserPolicy.disallowAllContent();
-  BrowserPolicy.allowScriptSameOrigin();
-  test.isTrue(cspsEqual(BrowserPolicy._constructCsp(),
+  BrowserPolicy.content.disallowAll();
+  BrowserPolicy.content.allowScriptSameOrigin();
+  test.isTrue(cspsEqual(BrowserPolicy.content._constructCsp(),
                         "default-src 'none'; script-src 'self';"));
-  test.isFalse(BrowserPolicy.inlineScriptsAllowed(true));
+  test.isFalse(BrowserPolicy.content.inlineScriptsAllowed(true));
 
   // Starting with all content same origin, disallowScript() and then allow
   // inline scripts. Result should be that that only inline scripts can execute,
   // not same-origin scripts.
-  BrowserPolicy.disallowAllContent();
-  BrowserPolicy.allowAllContentSameOrigin();
-  test.isTrue(cspsEqual(BrowserPolicy._constructCsp(), "default-src 'self';"));
-  BrowserPolicy.disallowScript();
-  test.isTrue(cspsEqual(BrowserPolicy._constructCsp(),
+  BrowserPolicy.content.disallowAll();
+  BrowserPolicy.content.allowSameOriginForAll();
+  test.isTrue(cspsEqual(BrowserPolicy.content._constructCsp(), "default-src 'self';"));
+  BrowserPolicy.content.disallowScript();
+  test.isTrue(cspsEqual(BrowserPolicy.content._constructCsp(),
                         "default-src 'self'; script-src 'none';"));
-  BrowserPolicy.allowInlineScripts();
-  test.isTrue(cspsEqual(BrowserPolicy._constructCsp(),
+  BrowserPolicy.content.allowInlineScripts();
+  test.isTrue(cspsEqual(BrowserPolicy.content._constructCsp(),
                         "default-src 'self'; script-src 'unsafe-inline';"));
 
   // Starting with all content same origin, allow inline scripts. (Should result
   // in both same origin and inline scripts allowed.)
-  BrowserPolicy.disallowAllContent();
-  BrowserPolicy.allowAllContentSameOrigin();
-  BrowserPolicy.allowInlineScripts();
-  test.isTrue(cspsEqual(BrowserPolicy._constructCsp(),
+  BrowserPolicy.content.disallowAll();
+  BrowserPolicy.content.allowSameOriginForAll();
+  BrowserPolicy.content.allowInlineScripts();
+  test.isTrue(cspsEqual(BrowserPolicy.content._constructCsp(),
                         "default-src 'self'; script-src 'self' 'unsafe-inline';"));
-  BrowserPolicy.disallowInlineScripts();
-  test.isTrue(cspsEqual(BrowserPolicy._constructCsp(),
+  BrowserPolicy.content.disallowInlineScripts();
+  test.isTrue(cspsEqual(BrowserPolicy.content._constructCsp(),
                         "default-src 'self'; script-src 'self';"));
 
   // Allow same origin for all content, then disallow object entirely.
-  BrowserPolicy.disallowAllContent();
-  BrowserPolicy.allowAllContentSameOrigin();
-  BrowserPolicy.disallowObject();
-  test.isTrue(cspsEqual(BrowserPolicy._constructCsp(),
+  BrowserPolicy.content.disallowAll();
+  BrowserPolicy.content.allowSameOriginForAll();
+  BrowserPolicy.content.disallowObject();
+  test.isTrue(cspsEqual(BrowserPolicy.content._constructCsp(),
                         "default-src 'self'; object-src 'none';"));
 });
 
 Tinytest.add("browser-policy - x-frame-options", function (test) {
-  BrowserPolicy._reset();
-  BrowserPolicy.disallowFraming();
-  test.equal(BrowserPolicy._constructXFrameOptions(), "DENY");
-  BrowserPolicy.allowFramingBySameOrigin();
-  test.equal(BrowserPolicy._constructXFrameOptions(), "SAMEORIGIN");
-  BrowserPolicy.allowFramingByOrigin("foo.com");
-  test.equal(BrowserPolicy._constructXFrameOptions(), "ALLOW-FROM foo.com");
+  BrowserPolicy.framing._reset();
+  test.equal(BrowserPolicy.framing._constructXFrameOptions(), "SAMEORIGIN");
+  BrowserPolicy.framing.disallow();
+  test.equal(BrowserPolicy.framing._constructXFrameOptions(), "DENY");
+  BrowserPolicy.framing.allowAll();
+  test.equal(BrowserPolicy.framing._constructXFrameOptions(), null);
+  BrowserPolicy.framing.restrictToOrigin("foo.com");
+  test.equal(BrowserPolicy.framing._constructXFrameOptions(), "ALLOW-FROM foo.com");
   test.throws(function () {
-    BrowserPolicy.allowFramingByOrigin("bar.com");
+    BrowserPolicy.framing.restrictToOrigin("bar.com");
   });
-  BrowserPolicy.allowFramingByAnyOrigin();
-  test.isFalse(BrowserPolicy._constructXFrameOptions());
 });
diff --git a/packages/browser-policy/browser-policy.js b/packages/browser-policy/browser-policy.js
deleted file mode 100644
index 25cff2e31a..0000000000
--- a/packages/browser-policy/browser-policy.js
+++ /dev/null
@@ -1,280 +0,0 @@
-// To enable CSP, call BrowserPolicy.enableContentSecurityPolicy(). This enables
-// the following default policy:
-// No eval or other string-to-code, and content can only be loaded from the
-// same origin as the app (except for XHRs and websocket connections, which can
-// go to any origin).
-//
-// Apps should call BrowserPolicy.allowFramingBySameOrigin() to allow only
-// same-origin pages to frame their apps, if they don't explicitly want to be
-// framed by third-party sites.
-//
-// Apps should call BrowserPolicy.disallowInlineScripts() if they are not using
-// any inline script tags and are willing to accept an extra round trip on page
-// load.
-//
-// BrowserPolicy functions for tweaking CSP:
-// allowInlineScripts()
-// disallowInlineScripts(): adds extra round-trip to page load time
-// allowInlineStyles()
-// disallowInlineStyles()
-// allowEval()
-// disallowEval()
-//
-// For each type of content (script, object, image, media, font, connect,
-// style), there are the following functions:
-// allow<content type>Origin(origin): allows the type of content to be loaded
-// from the given origin
-// allow<content type>DataUrl(): allows the content to be loaded from data: URLs
-// allow<content type>SameOrigin(): allows the content to be loaded from the
-// same origin
-// disallow<content type>(): disallows this type of content all together (can't
-// be called for script)
-//
-// The following functions allow you to set rules for all types of content at
-// once:
-// allowAllContentOrigin(origin)
-// allowAllContentDataUrl()
-// allowAllContentSameOrigin()
-// disallowAllContent()
-//
-//
-// For controlling which origins can frame this app,
-// BrowserPolicy.disallowFraming()
-// BrowserPolicy.restrictFramingToOrigin(origin)
-// BrowserPolicy.restrictFramingToSameOrigin()
-
-var xFrameOptions;
-var cspSrcs;
-
-// CSP keywords have to be single-quoted.
-var unsafeInline = "'unsafe-inline'";
-var unsafeEval = "'unsafe-eval'";
-var selfKeyword = "'self'";
-var noneKeyword = "'none'";
-
-var cspEnabled = false;
-var cspEnabledForTests = false;
-
-BrowserPolicy = {};
-
-// Exported for tests.
-var constructXFrameOptions = BrowserPolicy._constructXFrameOptions =
-      function () {
-        return xFrameOptions;
-      };
-
-var constructCsp = BrowserPolicy._constructCsp = function () {
-  cspSrcs = cspSrcs || {};
-
-  var header = _.map(cspSrcs, function (srcs, directive) {
-    srcs = srcs || [];
-    if (_.isEmpty(srcs))
-      srcs = [noneKeyword];
-    var directiveCsp = _.uniq(srcs).join(" ");
-    return directive + " " + directiveCsp + ";";
-  });
-
-  header = header.join(" ");
-  return header;
-};
-
-var parseCsp = function (csp) {
-  var policies = csp.split("; ");
-  cspSrcs = {};
-  _.each(policies, function (policy) {
-    if (policy[policy.length - 1] === ";")
-      policy = policy.substring(0, policy.length - 1);
-    var srcs = policy.split(" ");
-    var directive = srcs[0];
-    if (_.indexOf(srcs, noneKeyword) !== -1)
-      cspSrcs[directive] = null;
-    else
-      cspSrcs[directive] = srcs.slice(1);
-  });
-
-  if (cspSrcs["default-src"] === undefined)
-    throw new Error("Content Security Policies used with " +
-                    "browser-policy must specify a default-src.");
-
-  // Copy default-src sources to other directives.
-  _.each(cspSrcs, function (sources, directive) {
-    cspSrcs[directive] = _.union(sources || [], cspSrcs["default-src"] || []);
-  });
-};
-
-var removeCspSrc = function (directive, src) {
-  cspSrcs[directive] = _.without(cspSrcs[directive] || [], src);
-};
-
-var ensureDirective = function (directive) {
-  throwIfNotEnabled();
-  cspSrcs = cspSrcs || {};
-  if (! _.has(cspSrcs, directive))
-    cspSrcs[directive] = _.clone(cspSrcs["default-src"]);
-};
-
-var throwIfNotEnabled = function () {
-  if (! cspEnabled && ! cspEnabledForTests)
-    throw new Error("Enable this function by calling "+
-                    "BrowserPolicy.enableContentSecurityPolicy().");
-};
-
-WebApp.connectHandlers.use(function (req, res, next) {
-  if (xFrameOptions)
-    res.setHeader("X-Frame-Options", constructXFrameOptions());
-  if (cspEnabled)
-    res.setHeader("Content-Security-Policy", constructCsp());
-  next();
-});
-
-BrowserPolicy = _.extend(BrowserPolicy, {
-  _reset: function () {
-    xFrameOptions = null;
-    cspSrcs = null;
-    cspEnabled = false;
-  },
-
-  restrictFramingToSameOrigin: function () {
-    xFrameOptions = "SAMEORIGIN";
-  },
-  disallowFraming: function () {
-    xFrameOptions = "DENY";
-  },
-  // ALLOW-FROM not supported in Chrome or Safari.
-  restrictFramingToOrigin: function (origin) {
-    // Trying to specify two allow-from throws to prevent users from
-    // accidentally overwriting an allow-from origin when they think they are
-    // adding multiple origins.
-    if (xFrameOptions && xFrameOptions.indexOf("ALLOW-FROM") === 0)
-      throw new Error("You can only specify one origin that is allowed to" +
-                      " frame this app.");
-    xFrameOptions = "ALLOW-FROM " + origin;
-  },
-
-  // _enableForTests means that you can call CSP functions, but the header won't
-  // actually be sent.
-  enableContentSecurityPolicy: function (_enableForTests) {
-    // By default, unsafe inline scripts and styles are allowed, since we expect
-    // many apps will use them for analytics, etc. Unsafe eval is disallowed, and
-    // the only allowable content source is the same origin or data, except for
-    // connect which allows anything (since meteor.com apps make websocket
-    // connections to a lot of different origins).
-    if (! _enableForTests)
-      cspEnabled = true;
-    else
-      cspEnabledForTests = true;
-    cspSrcs = {};
-    BrowserPolicy.setContentSecurityPolicy("default-src 'self'; " +
-                                           "script-src 'self' 'unsafe-inline'; " +
-                                           "connect-src *; " +
-                                           "img-src data: 'self'; " +
-                                           "style-src 'self' 'unsafe-inline';");
-  },
-
-  setContentSecurityPolicy: function (csp) {
-    throwIfNotEnabled();
-    parseCsp(csp);
-  },
-
-  // Helpers for creating content security policies
-
-  _keywordAllowed: function (directive, keyword, _calledFromTests) {
-    // All keywords are allowed if csp is not enabled and we're not in a test
-    // run. If csp is enabled or we're in a test run, then look in cspSrcs to
-    // see if it's allowed.
-    return (! cspEnabled && ! _calledFromTests) ||
-      (cspSrcs[directive] &&
-       _.indexOf(cspSrcs[directive], keyword) !== -1);
-  },
-
-  // Used by webapp to determine whether we need an extra round trip for
-  // __meteor_runtime_config__.
-  // _calledFromTests is used to indicate that we should ignore cspEnabled and
-  // instead look directly in cspSrcs to determine if the keyword is allowed.
-  // XXX maybe this test interface could be cleaned up
-  inlineScriptsAllowed: function (_calledFromTests) {
-    return BrowserPolicy._keywordAllowed("script-src",
-                                         unsafeInline, _calledFromTests);
-  },
-
-  allowInlineScripts: function () {
-    ensureDirective("script-src");
-    cspSrcs["script-src"].push(unsafeInline);
-  },
-  disallowInlineScripts: function () {
-    ensureDirective("script-src");
-    removeCspSrc("script-src", unsafeInline);
-  },
-  allowEval: function () {
-    ensureDirective("script-src");
-    cspSrcs["script-src"].push(unsafeEval);
-  },
-  disallowEval: function () {
-    ensureDirective("script-src");
-    removeCspSrc("script-src", unsafeEval);
-  },
-  allowInlineStyles: function () {
-    ensureDirective("style-src");
-    cspSrcs["style-src"].push(unsafeInline);
-  },
-  disallowInlineStyles: function () {
-    ensureDirective("style-src");
-    removeCspSrc("style-src", unsafeInline);
-  },
-
-  // Functions for setting defaults
-  allowAllContentSameOrigin: function () {
-    BrowserPolicy.allowAllContentOrigin(selfKeyword);
-  },
-  allowAllContentDataUrl: function () {
-    BrowserPolicy.allowAllContentOrigin("data:");
-  },
-  allowAllContentOrigin: function (origin) {
-    ensureDirective("default-src");
-    _.each(_.keys(cspSrcs), function (directive) {
-      cspSrcs[directive].push(origin);
-    });
-  },
-  disallowAllContent: function () {
-    throwIfNotEnabled();
-    cspSrcs = {
-      "default-src": []
-    };
-  }
-});
-
-// allow<Resource>Origin, allow<Resource>Data, allow<Resource>self, and
-// disallow<Resource> methods for each type of resource.
-_.each(["script", "object", "img", "media",
-        "font", "connect", "style"],
-       function (resource) {
-         var directive = resource + "-src";
-         var methodResource;
-         if (resource !== "img") {
-           methodResource = resource.charAt(0).toUpperCase() +
-             resource.slice(1);
-         } else {
-           methodResource = "Image";
-         }
-         var allowMethodName = "allow" + methodResource + "Origin";
-         var disallowMethodName = "disallow" + methodResource;
-         var allowDataMethodName = "allow" + methodResource + "DataUrl";
-         var allowSelfMethodName = "allow" + methodResource + "SameOrigin";
-
-         BrowserPolicy[allowMethodName] = function (src) {
-           ensureDirective(directive);
-           cspSrcs[directive].push(src);
-         };
-         BrowserPolicy[disallowMethodName] = function () {
-           throwIfNotEnabled();
-           cspSrcs[directive] = [];
-         };
-         BrowserPolicy[allowDataMethodName] = function () {
-           ensureDirective(directive);
-           cspSrcs[directive].push("data:");
-         };
-         BrowserPolicy[allowSelfMethodName] = function () {
-           ensureDirective(directive);
-           cspSrcs[directive].push(selfKeyword);
-         };
-       });
diff --git a/packages/browser-policy/package.js b/packages/browser-policy/package.js
index ca3d0eff2f..0addf3d458 100644
--- a/packages/browser-policy/package.js
+++ b/packages/browser-policy/package.js
@@ -3,12 +3,11 @@ Package.describe({
 });
 
 Package.on_use(function (api) {
-  api.use(["underscore", "webapp"], "server");
-  api.add_files("browser-policy.js", "server");
-  api.export("BrowserPolicy", "server");
+  api.use(['browser-policy-content', 'browser-policy-framing'], 'server');
+  api.imply(['browser-policy-common'], 'server');
 });
 
 Package.on_test(function (api) {
-  api.use(["tinytest", "browser-policy", "ejson"]);
+  api.use(["tinytest", "browser-policy", "ejson"], "server");
   api.add_files("browser-policy-test.js", "server");
 });
diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js
index 3380ab81d2..7e504b7119 100644
--- a/packages/webapp/webapp_server.js
+++ b/packages/webapp/webapp_server.js
@@ -231,8 +231,10 @@ var runWebAppServer = function () {
       return;
     }
 
-    if (Package["browser-policy"] &&
-        ! Package["browser-policy"].BrowserPolicy.inlineScriptsAllowed() &&
+    var browserPolicyPackage = Package["browser-policy-common"];
+    if (browserPolicyPackage &&
+        browserPolicyPackage.BrowserPolicy.content &&
+        ! browserPolicyPackage.BrowserPolicy.content.inlineScriptsAllowed() &&
         pathname === "/meteor_runtime_config.js") {
       res.writeHead(200, { 'Content-type': 'application/javascript' });
       res.write("__meteor_runtime_config__ = " +
@@ -401,8 +403,10 @@ var runWebAppServer = function () {
 
     // Include __meteor_runtime_config__ in the app html, as an inline script if
     // it's not forbidden by CSP.
-    if (! Package["browser-policy"] ||
-        Package["browser-policy"].BrowserPolicy.inlineScriptsAllowed()) {
+    var browserPolicyPackage = Package["browser-policy-common"];
+    if (! browserPolicyPackage ||
+        ! browserPolicyPackage.BrowserPolicy.content ||
+        browserPolicyPackage.BrowserPolicy.content.inlineScriptsAllowed()) {
       boilerplateHtml = boilerplateHtml.replace(
           /##RUNTIME_CONFIG##/,
         "<script type='text/javascript'>__meteor_runtime_config__ = " +

From 6f94e8dbd08ae7548f13b29295c6732bba59f1ad Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Wed, 2 Oct 2013 18:59:41 -0700
Subject: [PATCH 214/335] Cache csp instead of constructing it each request.

---
 .../browser-policy-content/browser-policy-content.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/browser-policy-content/browser-policy-content.js b/packages/browser-policy-content/browser-policy-content.js
index 4b7e3f11ca..ed0206c4aa 100644
--- a/packages/browser-policy-content/browser-policy-content.js
+++ b/packages/browser-policy-content/browser-policy-content.js
@@ -34,6 +34,8 @@
 //
 
 var cspSrcs;
+var cachedCsp; // Avoid constructing the header out of cspSrcs when possible.
+
 // CSP keywords have to be single-quoted.
 var unsafeInline = "'unsafe-inline'";
 var unsafeEval = "'unsafe-eval'";
@@ -70,8 +72,11 @@ var removeCspSrc = function (directive, src) {
   cspSrcs[directive] = _.without(cspSrcs[directive] || [], src);
 };
 
+// Prepare for a change to cspSrcs. Ensure that we have a key in the dictionary
+// and clear any cached CSP.
 var ensureDirective = function (directive) {
   cspSrcs = cspSrcs || {};
+  cachedCsp = null;
   if (! _.has(cspSrcs, directive))
     cspSrcs[directive] = _.clone(cspSrcs["default-src"]);
 };
@@ -95,6 +100,9 @@ _.extend(BrowserPolicy.content, {
     if (! cspSrcs || _.isEmpty(cspSrcs))
       return null;
 
+    if (cachedCsp)
+      return cachedCsp;
+
     var header = _.map(cspSrcs, function (srcs, directive) {
       srcs = srcs || [];
       if (_.isEmpty(srcs))
@@ -107,10 +115,12 @@ _.extend(BrowserPolicy.content, {
     return header;
   },
   _reset: function () {
+    cachedCsp = null;
     setDefaultPolicy();
   },
 
   setPolicy: function (csp) {
+    cachedCsp = null;
     parseCsp(csp);
   },
 
@@ -174,6 +184,7 @@ _.extend(BrowserPolicy.content, {
     });
   },
   disallowAll: function () {
+    cachedCsp = null;
     cspSrcs = {
       "default-src": []
     };
@@ -203,6 +214,7 @@ _.each(["script", "object", "img", "media",
            cspSrcs[directive].push(src);
          };
          BrowserPolicy.content[disallowMethodName] = function () {
+           cachedCsp = null;
            cspSrcs[directive] = [];
          };
          BrowserPolicy.content[allowDataMethodName] = function () {

From a7007ec12bcb2f10936477d9db7552bf9a4bb058 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Thu, 3 Oct 2013 11:48:19 -0700
Subject: [PATCH 215/335] Actually save csp in cachedCsp.

Also rename ensureDirective to prepareForCspDirective to make it clearer that it
clears cachedCsp.
---
 .../browser-policy-content.js                 | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/packages/browser-policy-content/browser-policy-content.js b/packages/browser-policy-content/browser-policy-content.js
index ed0206c4aa..09d4cb7ee9 100644
--- a/packages/browser-policy-content/browser-policy-content.js
+++ b/packages/browser-policy-content/browser-policy-content.js
@@ -74,7 +74,7 @@ var removeCspSrc = function (directive, src) {
 
 // Prepare for a change to cspSrcs. Ensure that we have a key in the dictionary
 // and clear any cached CSP.
-var ensureDirective = function (directive) {
+var prepareForCspDirective = function (directive) {
   cspSrcs = cspSrcs || {};
   cachedCsp = null;
   if (! _.has(cspSrcs, directive))
@@ -112,6 +112,7 @@ _.extend(BrowserPolicy.content, {
     });
 
     header = header.join(" ");
+    cachedCsp = header;
     return header;
   },
   _reset: function () {
@@ -146,27 +147,27 @@ _.extend(BrowserPolicy.content, {
   // Helpers for creating content security policies
 
   allowInlineScripts: function () {
-    ensureDirective("script-src");
+    prepareForCspDirective("script-src");
     cspSrcs["script-src"].push(unsafeInline);
   },
   disallowInlineScripts: function () {
-    ensureDirective("script-src");
+    prepareForCspDirective("script-src");
     removeCspSrc("script-src", unsafeInline);
   },
   allowEval: function () {
-    ensureDirective("script-src");
+    prepareForCspDirective("script-src");
     cspSrcs["script-src"].push(unsafeEval);
   },
   disallowEval: function () {
-    ensureDirective("script-src");
+    prepareForCspDirective("script-src");
     removeCspSrc("script-src", unsafeEval);
   },
   allowInlineStyles: function () {
-    ensureDirective("style-src");
+    prepareForCspDirective("style-src");
     cspSrcs["style-src"].push(unsafeInline);
   },
   disallowInlineStyles: function () {
-    ensureDirective("style-src");
+    prepareForCspDirective("style-src");
     removeCspSrc("style-src", unsafeInline);
   },
 
@@ -178,7 +179,7 @@ _.extend(BrowserPolicy.content, {
     BrowserPolicy.content.allowOriginForAll("data:");
   },
   allowOriginForAll: function (origin) {
-    ensureDirective("default-src");
+    prepareForCspDirective("default-src");
     _.each(_.keys(cspSrcs), function (directive) {
       cspSrcs[directive].push(origin);
     });
@@ -210,7 +211,7 @@ _.each(["script", "object", "img", "media",
          var allowSelfMethodName = "allow" + methodResource + "SameOrigin";
 
          BrowserPolicy.content[allowMethodName] = function (src) {
-           ensureDirective(directive);
+           prepareForCspDirective(directive);
            cspSrcs[directive].push(src);
          };
          BrowserPolicy.content[disallowMethodName] = function () {
@@ -218,11 +219,11 @@ _.each(["script", "object", "img", "media",
            cspSrcs[directive] = [];
          };
          BrowserPolicy.content[allowDataMethodName] = function () {
-           ensureDirective(directive);
+           prepareForCspDirective(directive);
            cspSrcs[directive].push("data:");
          };
          BrowserPolicy.content[allowSelfMethodName] = function () {
-           ensureDirective(directive);
+           prepareForCspDirective(directive);
            cspSrcs[directive].push(selfKeyword);
          };
        });

From 9609fa2313febbeb61a94c864f7a1192da03f0c1 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Thu, 3 Oct 2013 11:59:47 -0700
Subject: [PATCH 216/335] Tweak browser-policy-framing docs

---
 docs/client/packages/browser-policy.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/client/packages/browser-policy.html b/docs/client/packages/browser-policy.html
index 2366c135c7..d89437e46e 100644
--- a/docs/client/packages/browser-policy.html
+++ b/docs/client/packages/browser-policy.html
@@ -45,8 +45,9 @@ call `BrowserPolicy` functions in top-level application code or in
 
 #### Frame options
 
-By default, only web pages on the same origin as your app are allowed to frame
-your app. You can use the following functions to modify this policy.
+By default, if you add `browser-policy` or `browser-policy-framing`, only web
+pages on the same origin as your app are allowed to frame your app. You can use
+the following functions to modify this policy.
 <dl class="callbacks">
 {{#dtdd "BrowserPolicy.framing.disallow()"}}
 Your app will never render inside a frame or iframe.

From 3afe10d947ae8c957867648a01f340615efb27ac Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Thu, 3 Oct 2013 12:00:09 -0700
Subject: [PATCH 217/335] Move meteor_runtime_config.js pathname check first

---
 packages/webapp/webapp_server.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js
index 7e504b7119..f801dc669e 100644
--- a/packages/webapp/webapp_server.js
+++ b/packages/webapp/webapp_server.js
@@ -232,10 +232,10 @@ var runWebAppServer = function () {
     }
 
     var browserPolicyPackage = Package["browser-policy-common"];
-    if (browserPolicyPackage &&
+    if (pathname === "/meteor_runtime_config.js" &&
+        browserPolicyPackage &&
         browserPolicyPackage.BrowserPolicy.content &&
-        ! browserPolicyPackage.BrowserPolicy.content.inlineScriptsAllowed() &&
-        pathname === "/meteor_runtime_config.js") {
+        ! browserPolicyPackage.BrowserPolicy.content.inlineScriptsAllowed()) {
       res.writeHead(200, { 'Content-type': 'application/javascript' });
       res.write("__meteor_runtime_config__ = " +
                 JSON.stringify(__meteor_runtime_config__) + ";");

From 43aa4de53002905f20963bdce6ffe42956869e69 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Thu, 3 Oct 2013 14:11:29 -0700
Subject: [PATCH 218/335] Tests for minimongo's restriction of $near to be
 inside $or/$and/$nor/$not

---
 packages/minimongo/minimongo_tests.js | 29 +++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/packages/minimongo/minimongo_tests.js b/packages/minimongo/minimongo_tests.js
index 3f74b4fd83..c8a5a13e72 100644
--- a/packages/minimongo/minimongo_tests.js
+++ b/packages/minimongo/minimongo_tests.js
@@ -2313,5 +2313,34 @@ Tinytest.add("minimongo - $near operator tests", function (test) {
   test.equal(close20[1].descript, "PETTY THEFT FROM LOCKED AUTO");
   test.equal(close20[2].descript, "POSSESSION OF BURGLARY TOOLS");
   test.equal(close20[3].descript, "POSS OF PROHIBITED WEAPON");
+
+  // Any combinations of $near with $or/$and/$nor/$not should throw an error
+  test.throws(function () {
+    coll.find({ location: {
+      $not: {
+        $near: {
+          $geometry: {
+            type: "Point",
+            coordinates: [-122.4154282, 37.7746115]
+          }, $maxDistance: 20 } } } });
+  });
+  test.throws(function () {
+    coll.find({
+      $and: [ { location: { $near: { $geometry: { type: "Point", coordinates: [-122.4154282, 37.7746115] }, $maxDistance: 20 }}},
+              { x: 0 }]
+    });
+  });
+  test.throws(function () {
+    coll.find({
+      $or: [ { location: { $near: { $geometry: { type: "Point", coordinates: [-122.4154282, 37.7746115] }, $maxDistance: 20 }}},
+             { x: 0 }]
+    });
+  });
+  test.throws(function () {
+    coll.find({
+      $nor: [ { location: { $near: { $geometry: { type: "Point", coordinates: [-122.4154282, 37.7746115] }, $maxDistance: 1 }}},
+              { x: 0 }]
+    });
+  });
 });
 

From 3b26a51296bb563571ffd19cc17897a032d64c14 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Thu, 3 Oct 2013 14:13:51 -0700
Subject: [PATCH 219/335] Move url to summary

---
 packages/geojson-utils/package.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/geojson-utils/package.js b/packages/geojson-utils/package.js
index 9cc423db0b..6a4d7be14b 100644
--- a/packages/geojson-utils/package.js
+++ b/packages/geojson-utils/package.js
@@ -1,6 +1,5 @@
 Package.describe({
-  summary: 'GeoJSON utility functions',
-  url: 'https://github.com/maxogden/geojson-js-utils',
+  summary: 'GeoJSON utility functions (from https://github.com/maxogden/geojson-js-utils)',
   internal: true
 });
 

From 2fd6a2b4d2d87070586ba2e69015f7baec76e01a Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Thu, 3 Oct 2013 15:16:43 -0700
Subject: [PATCH 220/335] tweak History.md

---
 History.md | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/History.md b/History.md
index 8d8aa53fb0..84fd300d1a 100644
--- a/History.md
+++ b/History.md
@@ -1,17 +1,19 @@
 ## vNEXT
 
-(XXX format section headers in a more standard way)
-
-SECURITY
+#### Security
 
 * Add `browser-policy` package for configuring and sending Content Security
   Policy and X-Frame-Options HTTP headers.
 
 * Use cryptographically strong pseudorandom number generators when available.
 
-MINIMONGO
+#### MongoDB
 
-* XXX upsert, update/remove return values  #1046
+* Add upsert support. `Collection.update` now supports the `{upsert:
+  true}` option. Additionally, add a `Collection.upsert` method which
+  returns the newly inserted object id if applicable.
+
+* `update` and `remove` now return the number of documents affected.  #1046
 
 * Pass an index and the cursor itself to the callbacks in `cursor.forEach` and
   `cursor.map`, just like the corresponding `Array` methods.  #63
@@ -25,10 +27,10 @@ MINIMONGO
 * Fix various bugs with using Mongo ObjectIds. (XXX bad description! this is
   3cfeed and 008847)
 
-* Improve behavior of `$ne`, $nin`, and `$not` selectors with objects containing
+* Improve behavior of `$ne`, `$nin`, and `$not` selectors with objects containing
   arrays.  #1451
 
-DDP
+#### DDP
 
 * Fix infinite loop if a client disconnects while a long yielding method is
   running.
@@ -38,7 +40,7 @@ DDP
   associated with them as soon as they are disconnected instead of a few minutes
   later.
 
-ACCOUNTS
+#### Accounts
 
 * `restrictCreationByEmailDomain` option in `Accounts.config` to restrict new
   users to emails of specific domain (eg. only users with @meteor.com emails) or
@@ -54,7 +56,7 @@ ACCOUNTS
 * Support OAuth1 services that require request token secrets as well as
   authentication token secrets.  #1253
 
-TOOLS
+#### Tools
 
 * The pre-0.6.5 `Package.register_extension` API has been removed. Use
   `Package._transitional_registerBuildPlugin` instead, which was introduced in
@@ -80,11 +82,11 @@ TOOLS
 * Disable the Mongo http interface. This lets you run meteor on two ports
   differing by 1000 at the same time.
 
-MISC
+#### Misc
 
 * Check that the argument to `EJSON.parse` is a string.  #1401
 
-* `EJSON.stringify` now takes options: #1136
+* `EJSON.stringify` now takes options:
   - `canonical` causes objects keys to be stringified in sorted order
   - `indent` allows formatting control over the EJSON stringification
 
@@ -100,7 +102,7 @@ MISC
 
 * Make `madewith` package work again (broken in 0.6.5).  #1448
 
-* Better error when passing a string to {{#each}}. #722
+* Better error when passing a string to `{{#each}}`. #722
 
 * Upgraded dependencies:
   * Node from 0.8.24 to 0.10.19

From d0a6105272cd6e95fb25e2dedaca0ae9bd53b4d3 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Thu, 3 Oct 2013 15:38:08 -0700
Subject: [PATCH 221/335] Add USE_JSESSIONID environment variable to turn on
 jsessionid in sockjs.

---
 History.md                         | 3 +++
 packages/livedata/stream_server.js | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/History.md b/History.md
index 84fd300d1a..38d13f0f48 100644
--- a/History.md
+++ b/History.md
@@ -104,6 +104,9 @@
 
 * Better error when passing a string to `{{#each}}`. #722
 
+* Add support for JSESSIONID cookies for sticky sessions. Set the
+  `USE_JSESSIONID` environment variable to enable.
+
 * Upgraded dependencies:
   * Node from 0.8.24 to 0.10.19
   * MongoDB from 2.4.4 to 2.4.6
diff --git a/packages/livedata/stream_server.js b/packages/livedata/stream_server.js
index e00a42ada9..a0f10ecb0f 100644
--- a/packages/livedata/stream_server.js
+++ b/packages/livedata/stream_server.js
@@ -38,7 +38,10 @@ StreamServer = function () {
     // combining CPU-heavy processing with SockJS termination (eg a proxy which
     // converts to Unix sockets) but for now, raise the delay.
     disconnect_delay: 60 * 1000,
-    jsessionid: false
+    // Set the USE_JSESSIONID environment variable to enable setting the
+    // JSESSIONID cookie. This is useful for setting up proxies with
+    // session affinity.
+    jsessionid: !!process.env.USE_JSESSIONID
   };
 
   // If you know your server environment (eg, proxies) will prevent websockets

From 664339fdb342a5620af407fc480fd5dcb4dd2706 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Wed, 2 Oct 2013 10:34:49 -0700
Subject: [PATCH 222/335] Yet another Node version bump: to 0.10.20. Fixes tls
 read bug.

---
 History.md                     | 2 +-
 docs/client/concepts.html      | 2 +-
 scripts/generate-dev-bundle.sh | 2 +-
 tools/bundler.js               | 2 +-
 tools/meteor.js                | 2 +-
 tools/server/boot.js           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/History.md b/History.md
index 38d13f0f48..ec7118a0dc 100644
--- a/History.md
+++ b/History.md
@@ -108,7 +108,7 @@
   `USE_JSESSIONID` environment variable to enable.
 
 * Upgraded dependencies:
-  * Node from 0.8.24 to 0.10.19
+  * Node from 0.8.24 to 0.10.20
   * MongoDB from 2.4.4 to 2.4.6
   * http-proxy from 0.10.1 to a pre-release of 1.0.0
   * stylus from 0.30.1 to 0.37.0
diff --git a/docs/client/concepts.html b/docs/client/concepts.html
index 67e13a9852..375bf90e9c 100644
--- a/docs/client/concepts.html
+++ b/docs/client/concepts.html
@@ -826,7 +826,7 @@ To get started, run
 This command will generate a fully-contained Node.js application in the form of
 a tarball.  To run this application, you need to provide Node.js 0.10 and a
 MongoDB server.  (The current release of Meteor has been tested with Node
-0.10.19.) You can then run the application by invoking node, specifying the HTTP
+0.10.20.) You can then run the application by invoking node, specifying the HTTP
 port for the application to listen on, and the MongoDB endpoint.  If you don't
 already have a MongoDB server, we can recommend our friends at
 [MongoHQ](http://mongohq.com).
diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh
index 86bea06977..fd22347b47 100755
--- a/scripts/generate-dev-bundle.sh
+++ b/scripts/generate-dev-bundle.sh
@@ -76,7 +76,7 @@ cd node
 # When upgrading node versions, also update the values of MIN_NODE_VERSION at
 # the top of tools/meteor.js and tools/server/boot.js, and the text in
 # docs/client/concepts.html and the README in tools/bundler.js.
-git checkout v0.10.19
+git checkout v0.10.20
 
 ./configure --prefix="$DIR"
 make -j4
diff --git a/tools/bundler.js b/tools/bundler.js
index 22527a7cca..30b0459d5b 100644
--- a/tools/bundler.js
+++ b/tools/bundler.js
@@ -1443,7 +1443,7 @@ var writeSiteArchive = function (targets, outputPath, options) {
       builder.write('README', { data: new Buffer(
 "This is a Meteor application bundle. It has only one dependency:\n" +
 "Node.js 0.10 (with the 'fibers' package). The current release of Meteor\n" +
-"has been tested with Node 0.10.19. To run the application:\n" +
+"has been tested with Node 0.10.20. To run the application:\n" +
 "\n" +
 "  $ npm install fibers@1.0.1\n" +
 "  $ export MONGO_URL='mongodb://user:password@host:port/databasename'\n" +
diff --git a/tools/meteor.js b/tools/meteor.js
index db2d770aa7..7b24fb4167 100644
--- a/tools/meteor.js
+++ b/tools/meteor.js
@@ -24,7 +24,7 @@ Fiber(function () {
 
   var Future = require('fibers/future');
   // This code is duplicated in app/server/server.js.
-  var MIN_NODE_VERSION = 'v0.10.19';
+  var MIN_NODE_VERSION = 'v0.10.20';
   if (require('semver').lt(process.version, MIN_NODE_VERSION)) {
     process.stderr.write(
       'Meteor requires Node ' + MIN_NODE_VERSION + ' or later.\n');
diff --git a/tools/server/boot.js b/tools/server/boot.js
index 091aee0ff1..32859e084b 100644
--- a/tools/server/boot.js
+++ b/tools/server/boot.js
@@ -6,7 +6,7 @@ var _ = require('underscore');
 var sourcemap_support = require('source-map-support');
 
 // This code is duplicated in tools/server/server.js.
-var MIN_NODE_VERSION = 'v0.10.19';
+var MIN_NODE_VERSION = 'v0.10.20';
 if (require('semver').lt(process.version, MIN_NODE_VERSION)) {
   process.stderr.write(
     'Meteor requires Node ' + MIN_NODE_VERSION + ' or later.\n');

From c03879f7804edc0944f746f61b9e3580c5dc9650 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Wed, 2 Oct 2013 11:09:39 -0700
Subject: [PATCH 223/335] Upgrade lots of dev bundle NPM modules.

Needs a license review.
---
 History.md                        |  12 ++-
 packages/underscore/underscore.js | 148 ++++++++++++++++++------------
 scripts/generate-dev-bundle.sh    |  32 +++----
 3 files changed, 112 insertions(+), 80 deletions(-)

diff --git a/History.md b/History.md
index ec7118a0dc..5e4deb3178 100644
--- a/History.md
+++ b/History.md
@@ -113,8 +113,16 @@
   * http-proxy from 0.10.1 to a pre-release of 1.0.0
   * stylus from 0.30.1 to 0.37.0
   * nib from 0.8.2 to 1.0.0  #1121 #1315
-  * XXX: we should try to do more upgrades in this release if possible (in
-    conjunction with the Node upgrade)
+  * optimist from 0.3.5 to 0.6.0
+  * semver from 1.1.0 to 2.1.0
+  * request from 2.12.0 to 2.27.0
+  * keypress from 0.1.0 to 0.2.1
+  * underscore from 1.5.1 to 1.5.2
+  * fstream from 0.1.21 to 0.1.24
+  * tar from 0.1.14 to 0.1.18
+  * byline from 2.0.3 to 3.1.2
+  * source-map from 0.1.26 to 0.1.30
+  * source-map-support from a fork of 0.1.8 to 0.2.3
 
 Patches contributed by GitHub users ansman, awwx, codeinthehole, jacott,
 Maxhodges, meawoppl, mitar, mizzao, mquandalle, nathan-muir, RobertLowe, ryw,
diff --git a/packages/underscore/underscore.js b/packages/underscore/underscore.js
index 7d4ee27c7d..b50115df5c 100644
--- a/packages/underscore/underscore.js
+++ b/packages/underscore/underscore.js
@@ -1,4 +1,4 @@
-//     Underscore.js 1.5.1
+//     Underscore.js 1.5.2
 //     http://underscorejs.org
 //     (c) 2009-2013 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
 //     Underscore may be freely distributed under the MIT license.
@@ -8,7 +8,7 @@
   // Baseline setup
   // --------------
 
-  // Establish the root object, `window` in the browser, or `global` on the server.
+  // Establish the root object, `window` in the browser, or `exports` on the server.
   var root = this;
 
   // Save the previous value of the `_` variable.
@@ -65,7 +65,7 @@
   }
 
   // Current version.
-  _.VERSION = '1.5.1';
+  _.VERSION = '1.5.2';
 
   // Collection Functions
   // --------------------
@@ -78,14 +78,13 @@
     if (nativeForEach && obj.forEach === nativeForEach) {
       obj.forEach(iterator, context);
     } else if (obj.length === +obj.length) {
-      for (var i = 0, l = obj.length; i < l; i++) {
+      for (var i = 0, length = obj.length; i < length; i++) {
         if (iterator.call(context, obj[i], i, obj) === breaker) return;
       }
     } else {
-      for (var key in obj) {
-        if (_.has(obj, key)) {
-          if (iterator.call(context, obj[key], key, obj) === breaker) return;
-        }
+      var keys = _.keys(obj);
+      for (var i = 0, length = keys.length; i < length; i++) {
+        if (iterator.call(context, obj[keys[i]], keys[i], obj) === breaker) return;
       }
     }
   };
@@ -284,7 +283,8 @@
     return result.value;
   };
 
-  // Shuffle an array.
+  // Shuffle an array, using the modern version of the 
+  // [Fisher-Yates shuffle](http://en.wikipedia.org/wiki/Fisher–Yates_shuffle).
   _.shuffle = function(obj) {
     var rand;
     var index = 0;
@@ -297,6 +297,16 @@
     return shuffled;
   };
 
+  // Sample **n** random values from an array.
+  // If **n** is not specified, returns a single random element from the array.
+  // The internal `guard` argument allows it to work with `map`.
+  _.sample = function(obj, n, guard) {
+    if (arguments.length < 2 || guard) {
+      return obj[_.random(obj.length - 1)];
+    }
+    return _.shuffle(obj).slice(0, Math.max(0, n));
+  };
+
   // An internal function to generate lookup iterators.
   var lookupIterator = function(value) {
     return _.isFunction(value) ? value : function(obj){ return obj[value]; };
@@ -307,9 +317,9 @@
     var iterator = lookupIterator(value);
     return _.pluck(_.map(obj, function(value, index, list) {
       return {
-        value : value,
-        index : index,
-        criteria : iterator.call(context, value, index, list)
+        value: value,
+        index: index,
+        criteria: iterator.call(context, value, index, list)
       };
     }).sort(function(left, right) {
       var a = left.criteria;
@@ -318,38 +328,41 @@
         if (a > b || a === void 0) return 1;
         if (a < b || b === void 0) return -1;
       }
-      return left.index < right.index ? -1 : 1;
+      return left.index - right.index;
     }), 'value');
   };
 
   // An internal function used for aggregate "group by" operations.
-  var group = function(obj, value, context, behavior) {
-    var result = {};
-    var iterator = lookupIterator(value == null ? _.identity : value);
-    each(obj, function(value, index) {
-      var key = iterator.call(context, value, index, obj);
-      behavior(result, key, value);
-    });
-    return result;
+  var group = function(behavior) {
+    return function(obj, value, context) {
+      var result = {};
+      var iterator = value == null ? _.identity : lookupIterator(value);
+      each(obj, function(value, index) {
+        var key = iterator.call(context, value, index, obj);
+        behavior(result, key, value);
+      });
+      return result;
+    };
   };
 
   // Groups the object's values by a criterion. Pass either a string attribute
   // to group by, or a function that returns the criterion.
-  _.groupBy = function(obj, value, context) {
-    return group(obj, value, context, function(result, key, value) {
-      (_.has(result, key) ? result[key] : (result[key] = [])).push(value);
-    });
-  };
+  _.groupBy = group(function(result, key, value) {
+    (_.has(result, key) ? result[key] : (result[key] = [])).push(value);
+  });
+
+  // Indexes the object's values by a criterion, similar to `groupBy`, but for
+  // when you know that your index values will be unique.
+  _.indexBy = group(function(result, key, value) {
+    result[key] = value;
+  });
 
   // Counts instances of an object that group by a certain criterion. Pass
   // either a string attribute to count by, or a function that returns the
   // criterion.
-  _.countBy = function(obj, value, context) {
-    return group(obj, value, context, function(result, key) {
-      if (!_.has(result, key)) result[key] = 0;
-      result[key]++;
-    });
-  };
+  _.countBy = group(function(result, key) {
+    _.has(result, key) ? result[key]++ : result[key] = 1;
+  });
 
   // Use a comparator function to figure out the smallest index at which
   // an object should be inserted so as to maintain order. Uses binary search.
@@ -386,7 +399,7 @@
   // allows it to work with `_.map`.
   _.first = _.head = _.take = function(array, n, guard) {
     if (array == null) return void 0;
-    return (n != null) && !guard ? slice.call(array, 0, n) : array[0];
+    return (n == null) || guard ? array[0] : slice.call(array, 0, n);
   };
 
   // Returns everything but the last entry of the array. Especially useful on
@@ -401,10 +414,10 @@
   // values in the array. The **guard** check allows it to work with `_.map`.
   _.last = function(array, n, guard) {
     if (array == null) return void 0;
-    if ((n != null) && !guard) {
-      return slice.call(array, Math.max(array.length - n, 0));
-    } else {
+    if ((n == null) || guard) {
       return array[array.length - 1];
+    } else {
+      return slice.call(array, Math.max(array.length - n, 0));
     }
   };
 
@@ -436,7 +449,7 @@
     return output;
   };
 
-  // Return a completely flattened version of an array.
+  // Flatten out an array, either recursively (by default), or just one level.
   _.flatten = function(array, shallow) {
     return flatten(array, shallow, []);
   };
@@ -508,7 +521,7 @@
   _.object = function(list, values) {
     if (list == null) return {};
     var result = {};
-    for (var i = 0, l = list.length; i < l; i++) {
+    for (var i = 0, length = list.length; i < length; i++) {
       if (values) {
         result[list[i]] = values[i];
       } else {
@@ -526,17 +539,17 @@
   // for **isSorted** to use binary search.
   _.indexOf = function(array, item, isSorted) {
     if (array == null) return -1;
-    var i = 0, l = array.length;
+    var i = 0, length = array.length;
     if (isSorted) {
       if (typeof isSorted == 'number') {
-        i = (isSorted < 0 ? Math.max(0, l + isSorted) : isSorted);
+        i = (isSorted < 0 ? Math.max(0, length + isSorted) : isSorted);
       } else {
         i = _.sortedIndex(array, item);
         return array[i] === item ? i : -1;
       }
     }
     if (nativeIndexOf && array.indexOf === nativeIndexOf) return array.indexOf(item, isSorted);
-    for (; i < l; i++) if (array[i] === item) return i;
+    for (; i < length; i++) if (array[i] === item) return i;
     return -1;
   };
 
@@ -562,11 +575,11 @@
     }
     step = arguments[2] || 1;
 
-    var len = Math.max(Math.ceil((stop - start) / step), 0);
+    var length = Math.max(Math.ceil((stop - start) / step), 0);
     var idx = 0;
-    var range = new Array(len);
+    var range = new Array(length);
 
-    while(idx < len) {
+    while(idx < length) {
       range[idx++] = start;
       start += step;
     }
@@ -678,17 +691,24 @@
   // N milliseconds. If `immediate` is passed, trigger the function on the
   // leading edge, instead of the trailing.
   _.debounce = function(func, wait, immediate) {
-    var result;
-    var timeout = null;
+    var timeout, args, context, timestamp, result;
     return function() {
-      var context = this, args = arguments;
+      context = this;
+      args = arguments;
+      timestamp = new Date();
       var later = function() {
-        timeout = null;
-        if (!immediate) result = func.apply(context, args);
+        var last = (new Date()) - timestamp;
+        if (last < wait) {
+          timeout = setTimeout(later, wait - last);
+        } else {
+          timeout = null;
+          if (!immediate) result = func.apply(context, args);
+        }
       };
       var callNow = immediate && !timeout;
-      clearTimeout(timeout);
-      timeout = setTimeout(later, wait);
+      if (!timeout) {
+        timeout = setTimeout(later, wait);
+      }
       if (callNow) result = func.apply(context, args);
       return result;
     };
@@ -754,22 +774,33 @@
 
   // Retrieve the values of an object's properties.
   _.values = function(obj) {
-    var values = [];
-    for (var key in obj) if (_.has(obj, key)) values.push(obj[key]);
+    var keys = _.keys(obj);
+    var length = keys.length;
+    var values = new Array(length);
+    for (var i = 0; i < length; i++) {
+      values[i] = obj[keys[i]];
+    }
     return values;
   };
 
   // Convert an object into a list of `[key, value]` pairs.
   _.pairs = function(obj) {
-    var pairs = [];
-    for (var key in obj) if (_.has(obj, key)) pairs.push([key, obj[key]]);
+    var keys = _.keys(obj);
+    var length = keys.length;
+    var pairs = new Array(length);
+    for (var i = 0; i < length; i++) {
+      pairs[i] = [keys[i], obj[keys[i]]];
+    }
     return pairs;
   };
 
   // Invert the keys and values of an object. The values must be serializable.
   _.invert = function(obj) {
     var result = {};
-    for (var key in obj) if (_.has(obj, key)) result[obj[key]] = key;
+    var keys = _.keys(obj);
+    for (var i = 0, length = keys.length; i < length; i++) {
+      result[obj[keys[i]]] = keys[i];
+    }
     return result;
   };
 
@@ -1053,8 +1084,7 @@
       '<': '&lt;',
       '>': '&gt;',
       '"': '&quot;',
-      "'": '&#x27;',
-      '/': '&#x2F;'
+      "'": '&#x27;'
     }
   };
   entityMap.unescape = _.invert(entityMap.escape);
@@ -1085,7 +1115,7 @@
 
   // Add your own custom functions to the Underscore object.
   _.mixin = function(obj) {
-    each(_.functions(obj), function(name){
+    each(_.functions(obj), function(name) {
       var func = _[name] = obj[name];
       _.prototype[name] = function() {
         var args = [this._wrapped];
diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh
index fd22347b47..22e9384ded 100755
--- a/scripts/generate-dev-bundle.sh
+++ b/scripts/generate-dev-bundle.sh
@@ -97,34 +97,28 @@ which npm
 # you update version numbers.
 
 cd "$DIR/lib/node_modules"
-npm install optimist@0.3.5
-npm install semver@1.1.0
+npm install optimist@0.6.0
+npm install semver@2.1.0
 npm install handlebars@1.0.7
-npm install request@2.12.0
-npm install keypress@0.1.0
-npm install underscore@1.5.1
-npm install fstream@0.1.21
-npm install tar@0.1.14
+npm install request@2.27.0
+npm install keypress@0.2.1
+npm install underscore@1.5.2
+npm install fstream@0.1.24
+npm install tar@0.1.18
 npm install kexec@0.1.1
 npm install shell-quote@0.0.1   # now at 1.3.3, which adds plenty of options to parse but doesn't change quote
-npm install byline@2.0.3  # v3 requires node 0.10
-npm install source-map@0.1.26
+npm install byline@3.1.2
+npm install source-map@0.1.30
+npm install source-map-support@0.2.3
 
-# Using the unreleased "caronte" rewrite of http-proxy (which is even called
-# 'caronte', though this may change when this eventually hopefully becomes
-# http-proxy 1.0).
-npm install https://github.com/nodejitsu/node-http-proxy/tarball/94ec6fa5ce6826ca1e8974f7e99b31541aaad76a
+# Using the unreleased "caronte" branch rewrite of http-proxy (which will become
+# 1.0.0).
+npm install https://github.com/nodejitsu/node-http-proxy/tarball/a51b0622780f48160001f9e74340f7d720cbfce6
 
 # Using the unreleased 1.1 branch. We can probably switch to a built NPM version
 # when it gets released.
 npm install https://github.com/ariya/esprima/tarball/5044b87f94fb802d9609f1426c838874ec2007b3
 
-# Fork of node-source-map-support which allows us to specify our own
-# retrieveSourceMap function, and uses source-map 0.1.26.
-#   https://github.com/evanw/node-source-map-support/pull/18
-#   https://github.com/evanw/node-source-map-support/pull/17
-npm install https://github.com/meteor/node-source-map-support/tarball/980e444c8346bbe29992fd3086bab0456b8d8667
-
 # If you update the version of fibers in the dev bundle, also update the "npm
 # install" command in docs/client/concepts.html and in the README in
 # tools/bundler.js.

From 26af82fcf0deb20e06f55798491ca1daf5c356df Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Wed, 2 Oct 2013 11:33:35 -0700
Subject: [PATCH 224/335] Upgrade lots of package Npm dependencies.

---
 History.md                         | 12 ++++++++++++
 packages/ctl-helper/package.js     |  2 +-
 packages/email/package.js          |  9 ++++++---
 packages/js-analyze/js_analyze.js  |  3 ++-
 packages/js-analyze/package.js     |  4 ++--
 packages/livedata/package.js       |  2 +-
 packages/logging/package.js        |  2 +-
 packages/minifiers/package.js      |  5 ++---
 packages/mongo-livedata/package.js |  2 +-
 packages/webapp/package.js         |  6 +++---
 10 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/History.md b/History.md
index 5e4deb3178..46022a352c 100644
--- a/History.md
+++ b/History.md
@@ -110,6 +110,7 @@
 * Upgraded dependencies:
   * Node from 0.8.24 to 0.10.20
   * MongoDB from 2.4.4 to 2.4.6
+  * MongoDB driver from 1.3.17 to 1.3.19
   * http-proxy from 0.10.1 to a pre-release of 1.0.0
   * stylus from 0.30.1 to 0.37.0
   * nib from 0.8.2 to 1.0.0  #1121 #1315
@@ -123,6 +124,17 @@
   * byline from 2.0.3 to 3.1.2
   * source-map from 0.1.26 to 0.1.30
   * source-map-support from a fork of 0.1.8 to 0.2.3
+  * escope from a fork of 0.0.15 to 1.0.0
+  * estraverse from 1.1.2-1 to 1.3.1
+  * simplesmtp from 0.1.25 to 0.3.10
+  * stream-buffers from 0.2.3 to 0.2.5
+  * websocket from 1.0.7 to 1.0.8
+  * cli-color from 0.2.2 to 0.2.3
+  * clean-css from 1.0.11 to 1.1.2
+  * UglifyJS2 from a fork of 2.3.6 to 2.4.0
+  * connect from 2.7.10 to 2.9.0
+  * send from 0.1.0 to 0.1.4
+  * useragent from 2.0.1 to 2.0.7
 
 Patches contributed by GitHub users ansman, awwx, codeinthehole, jacott,
 Maxhodges, meawoppl, mitar, mizzao, mquandalle, nathan-muir, RobertLowe, ryw,
diff --git a/packages/ctl-helper/package.js b/packages/ctl-helper/package.js
index 52a5394237..f60625cea7 100644
--- a/packages/ctl-helper/package.js
+++ b/packages/ctl-helper/package.js
@@ -2,7 +2,7 @@ Package.describe({
   summary: "Helpers for control programs"
 });
 
-Npm.depends({optimist: '0.4.0'});
+Npm.depends({optimist: '0.6.0'});
 
 Package.on_use(function (api) {
   api.use(['underscore', 'livedata', 'mongo-livedata'], 'server');
diff --git a/packages/email/package.js b/packages/email/package.js
index 89982dfce3..d88a91f7e0 100644
--- a/packages/email/package.js
+++ b/packages/email/package.js
@@ -2,9 +2,12 @@ Package.describe({
   summary: "Send email messages"
 });
 
-// Pinned at older version. 0.1.16+ uses mimelib, not mimelib-noiconv
-// which is much bigger. We need a better solution.
-Npm.depends({mailcomposer: "0.1.15", simplesmtp: "0.1.25", "stream-buffers": "0.2.3"});
+Npm.depends({
+  // Pinned at older version. 0.1.16+ uses mimelib, not mimelib-noiconv which is
+  // much bigger. We need a better solution.
+  mailcomposer: "0.1.15",
+  simplesmtp: "0.3.10",
+  "stream-buffers": "0.2.5"});
 
 Package.on_use(function (api) {
   api.use('underscore', 'server');
diff --git a/packages/js-analyze/js_analyze.js b/packages/js-analyze/js_analyze.js
index 5e612b25f0..6f00196020 100644
--- a/packages/js-analyze/js_analyze.js
+++ b/packages/js-analyze/js_analyze.js
@@ -184,7 +184,8 @@ JSAnalyze.findAssignedGlobals = function (source) {
   //
   // Unfortunately, escope's ImplicitGlobalVariable search has several bugs.
   //   https://github.com/Constellation/escope/issues/17
-
+  // This may have been fixed in 1.0.0, though the syntax to use has changed:
+  //   https://github.com/Constellation/escope/commit/6a4c33364fb1643e12285fb9daa04c015c00af63
 
   // Traverse the tree looking for assignments to unreferenced variables.
   estraverse.traverse(parseTree, {
diff --git a/packages/js-analyze/package.js b/packages/js-analyze/package.js
index 8bc4b460b6..39fc211459 100644
--- a/packages/js-analyze/package.js
+++ b/packages/js-analyze/package.js
@@ -14,10 +14,10 @@ Npm.depends({
   // This code was originally written against the unreleased 1.1 branch. We can
   // probably switch to a built NPM version when it gets released.
   esprima: "https://github.com/ariya/esprima/tarball/2a41dbf0ddadade0b09a9a7cc9a0c8df9c434018",
-  estraverse: "1.1.2-1",
+  estraverse: "1.3.1",
   // Fork to add ignoreEval option.
   // https://github.com/Constellation/escope/pull/18
-  escope: "https://github.com/meteor/escope/tarball/fef31f03797be5718080f811f9ca6e5297c90d2a"
+  escope: "1.0.0"
 });
 
 // This package may not depend on ANY other Meteor packages, even in the test
diff --git a/packages/livedata/package.js b/packages/livedata/package.js
index 709ee84e39..a827a081af 100644
--- a/packages/livedata/package.js
+++ b/packages/livedata/package.js
@@ -4,7 +4,7 @@ Package.describe({
 });
 
 Npm.depends({sockjs: "0.3.7",
-             websocket: "1.0.7"});
+             websocket: "1.0.8"});
 
 Package.on_use(function (api) {
   api.use(['check', 'random', 'ejson', 'json', 'underscore', 'deps', 'logging'],
diff --git a/packages/logging/package.js b/packages/logging/package.js
index f3883e7b98..6e9f172e93 100644
--- a/packages/logging/package.js
+++ b/packages/logging/package.js
@@ -4,7 +4,7 @@ Package.describe({
 });
 
 Npm.depends({
-  "cli-color": "0.2.2"
+  "cli-color": "0.2.3"
 });
 
 Package.on_use(function (api) {
diff --git a/packages/minifiers/package.js b/packages/minifiers/package.js
index 91f474d798..803dc7dd89 100644
--- a/packages/minifiers/package.js
+++ b/packages/minifiers/package.js
@@ -4,9 +4,8 @@ Package.describe({
 });
 
 Npm.depends({
-  "clean-css": "1.0.11",
-  // We depend on this commit, which has not been released yet.
-  "uglify-js": "https://github.com/mishoo/UglifyJS2/tarball/b1febde3e9be32b9d88918ed733efc3796e3f143"
+  "clean-css": "1.1.2",
+  "uglify-js": "2.4.0"
 });
 
 Package.on_use(function (api) {
diff --git a/packages/mongo-livedata/package.js b/packages/mongo-livedata/package.js
index ad0c073275..ce94ac1c37 100644
--- a/packages/mongo-livedata/package.js
+++ b/packages/mongo-livedata/package.js
@@ -12,7 +12,7 @@ Package.describe({
   internal: true
 });
 
-Npm.depends({mongodb: "1.3.17"});
+Npm.depends({mongodb: "1.3.19"});
 
 Package.on_use(function (api) {
   api.use(['random', 'ejson', 'json', 'underscore', 'minimongo', 'logging',
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index ea662b2be8..64df6f0886 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -3,9 +3,9 @@ Package.describe({
   internal: true
 });
 
-Npm.depends({connect: "2.7.10",
-             send: "0.1.0",
-             useragent: "2.0.1"});
+Npm.depends({connect: "2.9.0",
+             send: "0.1.4",
+             useragent: "2.0.7"});
 
 Package.on_use(function (api) {
   api.use(['logging', 'underscore', 'routepolicy'], 'server');

From 60d55667631541693fa2703affe615a355a40df7 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Wed, 2 Oct 2013 11:37:02 -0700
Subject: [PATCH 225/335] http-proxy is called http-proxy again.

---
 tools/run.js | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/tools/run.js b/tools/run.js
index 311bcbbb40..676034a271 100644
--- a/tools/run.js
+++ b/tools/run.js
@@ -109,15 +109,12 @@ var startProxy = function (outerPort, innerPort, callback) {
   callback = callback || function () {};
 
   var http = require('http');
-  // caronte is the code name for http-proxy 1.0 while it's under
-  // development. Once it's released, we may need to adjust the APIs slightly.
-  // (eg, the name of the event on proxy.ev will probably no longer say
-  // "caronte")
-  var caronte = require('caronte');
+  // Note: this uses the pre-release 1.0.0 API.
+  var httpProxy = require('http-proxy');
 
-  var proxy = caronte.createProxyServer({
-    // agent is required to handle keep-alive, and caronte is a little buggy
-    // without it: https://github.com/nodejitsu/node-http-proxy/pull/488
+  var proxy = httpProxy.createProxyServer({
+    // agent is required to handle keep-alive, and http-proxy 1.0 is a little
+    // buggy without it: https://github.com/nodejitsu/node-http-proxy/pull/488
     agent: new http.Agent({maxSockets: 100})
   });
 
@@ -184,9 +181,9 @@ var startProxy = function (outerPort, innerPort, callback) {
   // don't crash if the app doesn't respond. instead return an error
   // immediately. This shouldn't happen much since we try to not send requests
   // if the app is down.
-  // XXX should we also handle caronte:outgoing:ws:error, for a failed
+  // XXX should we also handle http-proxy:outgoing:ws:error, for a failed
   // websocket?
-  proxy.ee.on('caronte:outgoing:web:error', function (err, req, res) {
+  proxy.ee.on('http-proxy:outgoing:web:error', function (err, req, res) {
     res.writeHead(503, {
       'Content-Type': 'text/plain'
     });

From 85a42e908c506fb0ce363a184ac4088911d11d18 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Wed, 2 Oct 2013 12:05:22 -0700
Subject: [PATCH 226/335] remove outdated comment

---
 packages/js-analyze/package.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/js-analyze/package.js b/packages/js-analyze/package.js
index 39fc211459..e18dbb9ecb 100644
--- a/packages/js-analyze/package.js
+++ b/packages/js-analyze/package.js
@@ -15,8 +15,6 @@ Npm.depends({
   // probably switch to a built NPM version when it gets released.
   esprima: "https://github.com/ariya/esprima/tarball/2a41dbf0ddadade0b09a9a7cc9a0c8df9c434018",
   estraverse: "1.3.1",
-  // Fork to add ignoreEval option.
-  // https://github.com/Constellation/escope/pull/18
   escope: "1.0.0"
 });
 

From 000c5f3a9b41023502265a3c48f28a15181b91bf Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Wed, 2 Oct 2013 12:44:38 -0700
Subject: [PATCH 227/335] Whoops, forgot to increment the dev bundle version
 number.

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 58177c2493..8848753ed7 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-BUNDLE_VERSION=0.3.16
+BUNDLE_VERSION=0.3.17
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From ceb37b48c6fe48c84af3f547f8f7bb181d9dcbc6 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Thu, 3 Oct 2013 12:27:43 -0700
Subject: [PATCH 228/335] Shrinkwrap update.

---
 .../.npm/package/npm-shrinkwrap.json          |  5 ++-
 .../email/.npm/package/npm-shrinkwrap.json    |  4 +-
 .../.npm/package/npm-shrinkwrap.json          |  4 +-
 .../livedata/.npm/package/npm-shrinkwrap.json |  2 +-
 .../logging/.npm/package/npm-shrinkwrap.json  |  2 +-
 .../.npm/package/npm-shrinkwrap.json          | 18 ++++----
 .../.npm/package/npm-shrinkwrap.json          |  2 +-
 .../webapp/.npm/package/npm-shrinkwrap.json   | 43 +++++++++++++------
 8 files changed, 50 insertions(+), 30 deletions(-)

diff --git a/packages/ctl-helper/.npm/package/npm-shrinkwrap.json b/packages/ctl-helper/.npm/package/npm-shrinkwrap.json
index 2608d0fcd0..18e7c137ad 100644
--- a/packages/ctl-helper/.npm/package/npm-shrinkwrap.json
+++ b/packages/ctl-helper/.npm/package/npm-shrinkwrap.json
@@ -1,10 +1,13 @@
 {
   "dependencies": {
     "optimist": {
-      "version": "0.4.0",
+      "version": "0.6.0",
       "dependencies": {
         "wordwrap": {
           "version": "0.0.2"
+        },
+        "minimist": {
+          "version": "0.0.5"
         }
       }
     }
diff --git a/packages/email/.npm/package/npm-shrinkwrap.json b/packages/email/.npm/package/npm-shrinkwrap.json
index e5d3a7cb30..3d84231100 100644
--- a/packages/email/.npm/package/npm-shrinkwrap.json
+++ b/packages/email/.npm/package/npm-shrinkwrap.json
@@ -9,7 +9,7 @@
       }
     },
     "simplesmtp": {
-      "version": "0.1.25",
+      "version": "0.3.10",
       "dependencies": {
         "rai": {
           "version": "0.1.7"
@@ -20,7 +20,7 @@
       }
     },
     "stream-buffers": {
-      "version": "0.2.3"
+      "version": "0.2.5"
     }
   }
 }
diff --git a/packages/js-analyze/.npm/package/npm-shrinkwrap.json b/packages/js-analyze/.npm/package/npm-shrinkwrap.json
index 52f2263019..ae22ab72c5 100644
--- a/packages/js-analyze/.npm/package/npm-shrinkwrap.json
+++ b/packages/js-analyze/.npm/package/npm-shrinkwrap.json
@@ -4,10 +4,10 @@
       "from": "https://github.com/ariya/esprima/tarball/2a41dbf0ddadade0b09a9a7cc9a0c8df9c434018"
     },
     "estraverse": {
-      "version": "1.1.2-1"
+      "version": "1.3.1"
     },
     "escope": {
-      "from": "https://github.com/meteor/escope/tarball/fef31f03797be5718080f811f9ca6e5297c90d2a"
+      "version": "1.0.0"
     }
   }
 }
diff --git a/packages/livedata/.npm/package/npm-shrinkwrap.json b/packages/livedata/.npm/package/npm-shrinkwrap.json
index d7e6d5434d..032c64a7a1 100644
--- a/packages/livedata/.npm/package/npm-shrinkwrap.json
+++ b/packages/livedata/.npm/package/npm-shrinkwrap.json
@@ -12,7 +12,7 @@
       }
     },
     "websocket": {
-      "version": "1.0.7"
+      "version": "1.0.8"
     }
   }
 }
diff --git a/packages/logging/.npm/package/npm-shrinkwrap.json b/packages/logging/.npm/package/npm-shrinkwrap.json
index f0eafa1381..7bbbfcf6bb 100644
--- a/packages/logging/.npm/package/npm-shrinkwrap.json
+++ b/packages/logging/.npm/package/npm-shrinkwrap.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "cli-color": {
-      "version": "0.2.2",
+      "version": "0.2.3",
       "dependencies": {
         "es5-ext": {
           "version": "0.9.2"
diff --git a/packages/minifiers/.npm/package/npm-shrinkwrap.json b/packages/minifiers/.npm/package/npm-shrinkwrap.json
index b8040d824d..ca0ff43bc8 100644
--- a/packages/minifiers/.npm/package/npm-shrinkwrap.json
+++ b/packages/minifiers/.npm/package/npm-shrinkwrap.json
@@ -1,29 +1,24 @@
 {
   "dependencies": {
     "clean-css": {
-      "version": "1.0.11",
+      "version": "1.1.2",
       "dependencies": {
         "commander": {
-          "version": "1.2.0",
-          "dependencies": {
-            "keypress": {
-              "version": "0.1.0"
-            }
-          }
+          "version": "2.0.0"
         }
       }
     },
     "uglify-js": {
-      "from": "https://github.com/mishoo/UglifyJS2/tarball/b1febde3e9be32b9d88918ed733efc3796e3f143",
+      "version": "2.4.0",
       "dependencies": {
         "async": {
           "version": "0.2.9"
         },
         "source-map": {
-          "version": "0.1.26",
+          "version": "0.1.30",
           "dependencies": {
             "amdefine": {
-              "version": "0.0.5"
+              "version": "0.0.8"
             }
           }
         },
@@ -34,6 +29,9 @@
               "version": "0.0.2"
             }
           }
+        },
+        "uglify-to-browserify": {
+          "version": "1.0.1"
         }
       }
     }
diff --git a/packages/mongo-livedata/.npm/package/npm-shrinkwrap.json b/packages/mongo-livedata/.npm/package/npm-shrinkwrap.json
index 8670dc1fec..fbddd059bb 100644
--- a/packages/mongo-livedata/.npm/package/npm-shrinkwrap.json
+++ b/packages/mongo-livedata/.npm/package/npm-shrinkwrap.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "mongodb": {
-      "version": "1.3.17",
+      "version": "1.3.19",
       "dependencies": {
         "bson": {
           "version": "0.2.2"
diff --git a/packages/webapp/.npm/package/npm-shrinkwrap.json b/packages/webapp/.npm/package/npm-shrinkwrap.json
index 887dcb5e04..1cd8fc28af 100644
--- a/packages/webapp/.npm/package/npm-shrinkwrap.json
+++ b/packages/webapp/.npm/package/npm-shrinkwrap.json
@@ -1,14 +1,11 @@
 {
   "dependencies": {
     "connect": {
-      "version": "2.7.10",
+      "version": "2.9.0",
       "dependencies": {
         "qs": {
           "version": "0.6.5"
         },
-        "formidable": {
-          "version": "1.0.14"
-        },
         "cookie-signature": {
           "version": "1.0.1"
         },
@@ -16,13 +13,13 @@
           "version": "0.2.1"
         },
         "cookie": {
-          "version": "0.0.5"
+          "version": "0.1.0"
         },
         "send": {
-          "version": "0.1.0",
+          "version": "0.1.4",
           "dependencies": {
             "mime": {
-              "version": "1.2.6"
+              "version": "1.2.11"
             },
             "range-parser": {
               "version": "0.0.4"
@@ -33,27 +30,44 @@
           "version": "0.2.0"
         },
         "fresh": {
-          "version": "0.1.0"
+          "version": "0.2.0"
         },
         "pause": {
           "version": "0.0.1"
         },
+        "uid2": {
+          "version": "0.0.2"
+        },
         "debug": {
           "version": "0.7.2"
+        },
+        "methods": {
+          "version": "0.0.1"
+        },
+        "multiparty": {
+          "version": "2.1.8",
+          "dependencies": {
+            "readable-stream": {
+              "version": "1.0.17"
+            },
+            "stream-counter": {
+              "version": "0.1.0"
+            }
+          }
         }
       }
     },
     "send": {
-      "version": "0.1.0",
+      "version": "0.1.4",
       "dependencies": {
         "debug": {
           "version": "0.7.2"
         },
         "mime": {
-          "version": "1.2.6"
+          "version": "1.2.11"
         },
         "fresh": {
-          "version": "0.1.0"
+          "version": "0.2.0"
         },
         "range-parser": {
           "version": "0.0.4"
@@ -61,7 +75,12 @@
       }
     },
     "useragent": {
-      "version": "2.0.1"
+      "version": "2.0.7",
+      "dependencies": {
+        "lru-cache": {
+          "version": "2.2.4"
+        }
+      }
     }
   }
 }

From 0f0542efb1754b9412b7d79733f25c6a2f950528 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Thu, 3 Oct 2013 13:48:55 -0700
Subject: [PATCH 229/335] Replace byline npm module with eachline.

Node 0.10-compatible versions of byline (eg 3.1.2) drop empty lines.
---
 History.md                     | 2 +-
 LICENSE.txt                    | 7 -------
 scripts/generate-dev-bundle.sh | 2 +-
 tools/run.js                   | 9 +++------
 4 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/History.md b/History.md
index 46022a352c..dba1a3b159 100644
--- a/History.md
+++ b/History.md
@@ -121,7 +121,6 @@
   * underscore from 1.5.1 to 1.5.2
   * fstream from 0.1.21 to 0.1.24
   * tar from 0.1.14 to 0.1.18
-  * byline from 2.0.3 to 3.1.2
   * source-map from 0.1.26 to 0.1.30
   * source-map-support from a fork of 0.1.8 to 0.2.3
   * escope from a fork of 0.0.15 to 1.0.0
@@ -135,6 +134,7 @@
   * connect from 2.7.10 to 2.9.0
   * send from 0.1.0 to 0.1.4
   * useragent from 2.0.1 to 2.0.7
+  * replaced byline with eachline 2.3.3
 
 Patches contributed by GitHub users ansman, awwx, codeinthehole, jacott,
 Maxhodges, meawoppl, mitar, mizzao, mquandalle, nathan-muir, RobertLowe, ryw,
diff --git a/LICENSE.txt b/LICENSE.txt
index 319a50a963..a2e435a9d7 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -377,13 +377,6 @@ buffer-crc32: https://github.com/brianloveswords/buffer-crc32
 Copyright (c) 2013 Brian J. Brennan
 
 
-----------
-byline: https://github.com/jahewson/node-byline
-----------
-
-node-byline (C) 2011-2013 John Hewson
-
-
 ----------
 child-process-close: https://github.com/piscisaureus/child-process-close
 ----------
diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh
index 22e9384ded..766063b6ae 100755
--- a/scripts/generate-dev-bundle.sh
+++ b/scripts/generate-dev-bundle.sh
@@ -107,7 +107,7 @@ npm install fstream@0.1.24
 npm install tar@0.1.18
 npm install kexec@0.1.1
 npm install shell-quote@0.0.1   # now at 1.3.3, which adds plenty of options to parse but doesn't change quote
-npm install byline@3.1.2
+npm install eachline@2.3.3
 npm install source-map@0.1.30
 npm install source-map-support@0.2.3
 
diff --git a/tools/run.js b/tools/run.js
index 676034a271..328908d984 100644
--- a/tools/run.js
+++ b/tools/run.js
@@ -293,10 +293,8 @@ var startServer = function (options) {
   // print directly in the same format as log messages from other apps
   Log.outputFormat = 'colored-text';
 
-  proc.stdout.setEncoding('utf8');
-  // The byline module ensures that each 'data' call will receive one
-  // line.
-  require('byline')(proc.stdout).on('data', function (line) {
+  var eachline = require('eachline');
+  eachline(proc.stdout, 'utf8', function (line) {
     if (!line) return;
     // string must match server.js
     if (line.match(/^LISTENING\s*$/)) {
@@ -309,8 +307,7 @@ var startServer = function (options) {
     saveLog({stdout: Log.format(obj)});
   });
 
-  proc.stderr.setEncoding('utf8');
-  require('byline')(proc.stderr).on('data', function (line) {
+  eachline(proc.stderr, 'utf8', function (line) {
     if (!line) return;
     var obj = Log.objFromText(line, { level: 'warn', stderr: true });
     console.log(Log.format(obj, { color: true }));

From 6528f9eef7732181652d8d04ff746e88036123ea Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Thu, 3 Oct 2013 14:17:51 -0700
Subject: [PATCH 230/335] Avoid calling _.each on numbers (Underscore 1.5.2
 doesn't like it).

Simplify NaN detection.
---
 packages/ejson/ejson.js             | 36 ++++++++++++++++++-----------
 packages/livedata/livedata_tests.js |  2 ++
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/packages/ejson/ejson.js b/packages/ejson/ejson.js
index 40bc2b22c7..7bb28ef20b 100644
--- a/packages/ejson/ejson.js
+++ b/packages/ejson/ejson.js
@@ -18,6 +18,10 @@ EJSON.addType = function (name, factory) {
   customTypes[name] = factory;
 };
 
+var isInfOrNan = function (obj) {
+  return _.isNaN(obj) || obj === Infinity || obj === -Infinity;
+};
+
 var builtinConverters = [
   { // Date
     matchJSONValue: function (obj) {
@@ -33,13 +37,12 @@ var builtinConverters = [
       return new Date(obj.$date);
     }
   },
-  { //NaN, Inf, -Inf
+  { // NaN, Inf, -Inf. (These are the only objects with typeof !== 'object'
+    // which we match.)
     matchJSONValue: function (obj) {
       return _.has(obj, '$InfNaN') && _.size(obj) === 1;
     },
-    matchObject: function (obj) {
-      return _.isNaN(obj) || obj === Infinity || obj === -Infinity;
-    },
+    matchObject: isInfOrNan,
     toJSONValue: function (obj) {
       var sign;
       if (_.isNaN(obj))
@@ -125,23 +128,23 @@ EJSON._isCustomType = function (obj) {
 // for both arrays and objects, in-place modification.
 var adjustTypesToJSONValue =
 EJSON._adjustTypesToJSONValue = function (obj) {
+  // Is it an atom that we need to adjust?
   if (obj === null)
     return null;
   var maybeChanged = toJSONValueHelper(obj);
   if (maybeChanged !== undefined)
     return maybeChanged;
+
+  // Other atoms are unchanged.
+  if (typeof obj !== 'object')
+    return obj;
+
+  // Iterate over array or object structure.
   _.each(obj, function (value, key) {
-    if (typeof value === 'number') {
-      if (_.isNaN(value))
-        obj[key] = {$InfNaN: 0};
-      else if (value === Infinity)
-        obj[key] = {$InfNaN: 1};
-      else if (value === -Infinity)
-        obj[key] = {$InfNaN: -1};
-      return; // continue
-    }
-    if (typeof value !== 'object' && value !== undefined)
+    if (typeof value !== 'object' && value !== undefined &&
+        !isInfOrNan(value))
       return; // continue
+
     var changed = toJSONValueHelper(value);
     if (changed) {
       obj[key] = changed;
@@ -188,6 +191,11 @@ EJSON._adjustTypesFromJSONValue = function (obj) {
   var maybeChanged = fromJSONValueHelper(obj);
   if (maybeChanged !== obj)
     return maybeChanged;
+
+  // Other atoms are unchanged.
+  if (typeof obj !== 'object')
+    return obj;
+
   _.each(obj, function (value, key) {
     if (typeof value === 'object') {
       var changed = fromJSONValueHelper(value);
diff --git a/packages/livedata/livedata_tests.js b/packages/livedata/livedata_tests.js
index 3fd1cd0c87..0118e4d7e1 100644
--- a/packages/livedata/livedata_tests.js
+++ b/packages/livedata/livedata_tests.js
@@ -124,6 +124,8 @@ testAsyncMulti("livedata - basic method invocation", [
   echoTest({$date: 30}), // literal
   echoTest({$literal: {$date: 30}}),
   echoTest(12),
+  echoTest(Infinity),
+  echoTest(-Infinity),
 
   function (test, expect) {
     if (Meteor.isServer)

From ee220b1da71ada62b1d664b67c0ec3a9542276a9 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Thu, 3 Oct 2013 14:48:06 -0700
Subject: [PATCH 231/335] fix cli-test

---
 scripts/cli-test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/cli-test.sh b/scripts/cli-test.sh
index 9ca96016fb..ee8ed9af06 100755
--- a/scripts/cli-test.sh
+++ b/scripts/cli-test.sh
@@ -124,7 +124,7 @@ tar tvzf foo.tar.gz >>$OUTPUT
 cd .. # we're now back to $DIR
 echo "... run"
 
-MONGOMARK='--bind_ip 127.0.0.1 --smallfiles --port 9102'
+MONGOMARK='--bind_ip 127.0.0.1 --smallfiles --nohttpinterface --port 9102'
 # kill any old test meteor
 # there is probably a better way to do this, but it is at least portable across macos and linux
 # (the || true is needed on linux, whose xargs will invoke kill even with no args)

From 741ad1d1d650c32f07cadd82cbb8ffb61b387004 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Thu, 3 Oct 2013 14:50:42 -0700
Subject: [PATCH 232/335] one more dev bundle version bump (for
 byline->eachline)

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 8848753ed7..8d5075e2ad 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-BUNDLE_VERSION=0.3.17
+BUNDLE_VERSION=0.3.18
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From 8062d65730ad09edda445440ce279fb40e08c18f Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Thu, 3 Oct 2013 16:59:44 -0700
Subject: [PATCH 233/335] Update for new 'keypress' API.

---
 tools/deploy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/deploy.js b/tools/deploy.js
index caf8ccc627..ee2ff43a52 100644
--- a/tools/deploy.js
+++ b/tools/deploy.js
@@ -293,7 +293,7 @@ var read_password = function (callback) {
   var keypress = require('keypress');
   keypress(process.stdin);
   process.stdin.on('keypress', inFiber(function(c, key){
-    if (key && 'enter' === key.name) {
+    if (key && (key.name === 'enter' || key.name === 'return')) {
       console.log();
       process.stdin.pause();
       process.stdin.removeAllListeners('keypress');

From 14e93abce3cdbfc64319321d568b0f2fbcc49752 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Thu, 3 Oct 2013 17:06:55 -0700
Subject: [PATCH 234/335] Use a fork of Uglify again.

---
 History.md                                          | 2 +-
 packages/minifiers/.npm/package/npm-shrinkwrap.json | 2 +-
 packages/minifiers/package.js                       | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/History.md b/History.md
index dba1a3b159..b66a33d229 100644
--- a/History.md
+++ b/History.md
@@ -130,7 +130,7 @@
   * websocket from 1.0.7 to 1.0.8
   * cli-color from 0.2.2 to 0.2.3
   * clean-css from 1.0.11 to 1.1.2
-  * UglifyJS2 from a fork of 2.3.6 to 2.4.0
+  * UglifyJS2 from a fork of 2.3.6 to a different fork of 2.4.0
   * connect from 2.7.10 to 2.9.0
   * send from 0.1.0 to 0.1.4
   * useragent from 2.0.1 to 2.0.7
diff --git a/packages/minifiers/.npm/package/npm-shrinkwrap.json b/packages/minifiers/.npm/package/npm-shrinkwrap.json
index ca0ff43bc8..b23b2cea61 100644
--- a/packages/minifiers/.npm/package/npm-shrinkwrap.json
+++ b/packages/minifiers/.npm/package/npm-shrinkwrap.json
@@ -9,7 +9,7 @@
       }
     },
     "uglify-js": {
-      "version": "2.4.0",
+      "from": "https://github.com/meteor/UglifyJS2/tarball/bb0a762d12d2ecd058b9d7b57f16b4c289378d9c",
       "dependencies": {
         "async": {
           "version": "0.2.9"
diff --git a/packages/minifiers/package.js b/packages/minifiers/package.js
index 803dc7dd89..6a3eb50d59 100644
--- a/packages/minifiers/package.js
+++ b/packages/minifiers/package.js
@@ -5,7 +5,8 @@ Package.describe({
 
 Npm.depends({
   "clean-css": "1.1.2",
-  "uglify-js": "2.4.0"
+  // Fork of 2.4.0 fixing https://github.com/mishoo/UglifyJS2/pull/308
+  "uglify-js": "https://github.com/meteor/UglifyJS2/tarball/bb0a762d12d2ecd058b9d7b57f16b4c289378d9c"
 });
 
 Package.on_use(function (api) {

From 7864aa77a1303ec23fd37f20ca7bcb9548962b86 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Thu, 3 Oct 2013 19:46:10 -0700
Subject: [PATCH 235/335] Update LICENSE.txt.

---
 LICENSE.txt | 47 +++++++++++++++++++++++++++++++++++++----------
 1 file changed, 37 insertions(+), 10 deletions(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index a2e435a9d7..5ea8dd9809 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -90,6 +90,7 @@ github-url-from-git: https://github.com/visionmedia/node-github-url-from-git
 pause: https://github.com/visionmedia/node-pause
 range-parser: https://github.com/visionmedia/node-range-parser
 send: https://github.com/visionmedia/send
+methods: https://github.com/visionmedia/node-methods
 ----------
 
 Copyright (c) 2010 TJ Holowaychuk <tj@vision-media.ca>
@@ -191,13 +192,6 @@ rbytes: https://github.com/akdubya/rbytes
 Copyright (c) 2010 Aleksander Williams
 
 
-----------
-formidable: https://github.com/felixge/node-formidable
-----------
-
-By Felix Geisendörfer and Tim Koschuetzki, Debuggable, Ltd.
-
-
 ----------
 colors: https://github.com/Marak/colors.js
 ----------
@@ -291,6 +285,7 @@ archy: https://github.com/substack/node-archy
 shell-quote: https://github.com/substack/node-shell-quote
 deep-equal: https://github.com/substack/node-deep-equal
 editor: https://github.com/substack/node-editor
+minimist: https://github.com/substack/node-minimist
 ----------
 
 Copyright 2010, 2011, 2012, 2013 James Halliday (mail@substack.net)
@@ -328,6 +323,7 @@ Felix Geisendörfer (felix@debuggable.com)
 
 ----------
 form-data: https://github.com/felixge/node-form-data
+multiparty: https://github.com/superjoe30/node-multiparty
 ----------
 
 Copyright (c) 2012 Felix Geisendörfer (felix@debuggable.com) and contributors
@@ -468,6 +464,8 @@ Copyright (c) 2011 SDA Software Associates Inc.
 
 ----------
 sha: https://github.com/ForbesLindesay/sha
+type-of: https://github.com/ForbesLindesay/type-of
+uglify-to-browserify: https://github.com/ForbesLindesay/uglify-to-browserify
 ----------
 
 Copyright (c) 2013 Forbes Lindesay
@@ -509,6 +507,33 @@ Copyright 2011, Robert Mustacchi. All rights reserved.
 Copyright 2011, Joyent, Inc. All rights reserved.
 
 
+----------
+eachline: https://github.com/williamwicks/node-eachline
+----------
+
+Copyright (c) 2013 William Wicks
+
+
+----------
+eventemitter2: https://github.com/hij1nx/EventEmitter2
+----------
+
+Copyright (c) 2011 hij1nx http://www.twitter.com/hij1nx
+
+
+----------
+stream-counter: https://github.com/superjoe30/node-stream-counter
+----------
+
+Copyright (c) 2013 Andrew Kelley
+
+----------
+uid2: https://github.com/coreh/uid2
+----------
+
+Copyright (c) 2013 Marco Aurelio
+
+
 ==============
 Apache License
 ==============
@@ -524,7 +549,8 @@ Unless required by applicable law or agreed to in writing, software distributed
 """
 
 ----------
-mongo-drivers: https://github.com/mongodb/node-mongodb-native
+mongodb: (Node driver) https://github.com/mongodb/node-mongodb-native
+kerberos: https://github.com/christkv/kerberos
 ----------
 
 Copyright 2009 - 2010 Christian Amor Kvalheim.
@@ -1302,7 +1328,7 @@ Other
 =====
 
 ----------
-mimelib: https://github.com/andris9/mimelib
+mimelib-noiconv: https://github.com/andris9/mimelib
 mailcomposer: https://github.com/andris9/mailcomposer
 simplesmtp: https://github.com/andris9/simplesmtp
 rai: https://github.com/andris9/rai
@@ -1400,7 +1426,7 @@ For more information, please refer to <http://unlicense.org/>
 
 
 ----------
-mongodb: http://www.mongodb.org/
+MongoDB: http://www.mongodb.org/
 ----------
 
 LICENSE
@@ -1704,6 +1730,7 @@ The externally maintained libraries used by libuv are:
 
 ----------
 nodejs: http://nodejs.org/
+readable-stream: https://github.com/isaacs/readable-stream/
 ----------
 
 

From 6a836cca941b3638f827f2b694d84f614610ca0b Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Fri, 4 Oct 2013 09:31:58 -0700
Subject: [PATCH 236/335] Use escope's native implicit global variable search
 code instead of our own.

That code was buggy when we first wrote linker; we reported the bugs and the
maintainer fixed it. Yay!
---
 packages/js-analyze/js_analyze.js | 77 ++-----------------------------
 1 file changed, 4 insertions(+), 73 deletions(-)

diff --git a/packages/js-analyze/js_analyze.js b/packages/js-analyze/js_analyze.js
index 6f00196020..c2f74eed64 100644
--- a/packages/js-analyze/js_analyze.js
+++ b/packages/js-analyze/js_analyze.js
@@ -158,81 +158,12 @@ JSAnalyze.findAssignedGlobals = function (source) {
   // But it can't pull references outward, so for our purposes it is safe to
   // ignore.
   var scoper = escope.analyze(parseTree, {ignoreEval: true});
+  var globalScope = scoper.scopes[0];
 
-  var currentScope = null;
   var assignedGlobals = {};
-
-  // XXX This whole traversal is somewhat overkill. escope actually already
-  // calculates the implicit global variables. The following code ALMOST works,
-  // and doesn't even require ignoreEval:
-  //
-  //  var globalScope = scoper.acquire(parseTree);
-  //  if (globalScope.type !== 'global')
-  //    throw new Error("Unexpected scope type " + globalScope.type);
-  //
-  //  // can't use underscore because we want to have no dependencies
-  //  for (var i = 0; i < globalScope.variables.length; ++i) {
-  //    var variable = globalScope.variables[i];
-  //    // Because this is the global scope, and we wrap source in a function,
-  //    // the only variables in it should have a single implicit definition.
-  //    if (variable.defs.length !== 1)
-  //      throw new Error("Unexpected def length", variable.defs.length);
-  //    if (variable.defs[0].type !== escope.Variable.ImplicitGlobalVariable)
-  //      throw new Error("Unexpected def type", variable.defs[0].type);
-  //    assignedGlobals[variable.name] = true;
-  //  }
-  //
-  // Unfortunately, escope's ImplicitGlobalVariable search has several bugs.
-  //   https://github.com/Constellation/escope/issues/17
-  // This may have been fixed in 1.0.0, though the syntax to use has changed:
-  //   https://github.com/Constellation/escope/commit/6a4c33364fb1643e12285fb9daa04c015c00af63
-
-  // Traverse the tree looking for assignments to unreferenced variables.
-  estraverse.traverse(parseTree, {
-    enter: function (node, parent) {
-      currentScope = scoper.acquire(node) || currentScope;
-
-      // We only care about identifiers.
-      if (node.type !== Syntax.Identifier)
-        return;
-      // We already know this one is an assigned global.
-      // (Avoid using _.has here so that we have no Meteor package
-      // dependencies.)
-      if (assignedGlobals.hasOwnProperty(node.name))
-        return;
-
-      var ref = null;
-      // Find an `escope.Reference` in the current Scope whose identifier node
-      // is `===` to `node`.  If found, this means escope determined this site
-      // to be a reference rather than some other identifier (like the `x` in
-      // `var x` or `a.x`).
-      for (var i = 0; i < currentScope.references.length; i++) {
-        if (currentScope.references[i].identifier === node) {
-          ref = currentScope.references[i];
-          break;
-        }
-      }
-      // If this isn't a reference at all, or it's been resolved to a local, do
-      // nothing.
-      if (!ref || ref.resolved)
-        return;
-
-      // OK, it's a global. But is it being assigned to? The situations where a
-      // global is assigned to are:
-      //    - left-hand side of an '=' assignment
-      //    - the `x` in `for (x in y)` (without a `var`)
-      // (You might think that ++, --, and the += family of operators also
-      // write to globals, but they can't in and of themselves conjure up
-      // a reference where none existed before.)
-      if ((parent.type === Syntax.AssignmentExpression && parent.left === node
-           && parent.operator === '=')
-          || (parent.type === Syntax.ForInStatement && parent.left === node)) {
-        assignedGlobals[node.name] = true;
-      }
-    },
-    leave: function (node, parent) {
-      currentScope = scoper.release(node) || currentScope;
-    }
+  // Underscore is not available in this package.
+  globalScope.implicit.variables.forEach(function (variable) {
+    assignedGlobals[variable.name] = true;
   });
 
   return assignedGlobals;

From 94c7833c82ac6ab62c36b4a39ee315199233aef9 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Fri, 4 Oct 2013 09:46:48 -0700
Subject: [PATCH 237/335] Delete unused JSAnalyze.findGlobalDottedRefs.

Because it is currently unused and was the only direct use of the 'estraverse'
module, it seems better to minimize the number of dependencies shipped with
Meteor. Admittedly, estraverse is still a dependency of escope, but if we
upgrade escope to a version that has a more specific version requirement for
estraverse that conflicts with our Npm.depends, we'll be shipping two copies for
no reason.
---
 packages/js-analyze-tests/js_analyze_tests.js |  39 ------
 .../.npm/package/npm-shrinkwrap.json          |  10 +-
 packages/js-analyze/js_analyze.js             | 111 ------------------
 packages/js-analyze/package.js                |   1 -
 tools/packages.js                             |   2 +-
 5 files changed, 7 insertions(+), 156 deletions(-)

diff --git a/packages/js-analyze-tests/js_analyze_tests.js b/packages/js-analyze-tests/js_analyze_tests.js
index 416f9e1fe2..ea1add3533 100644
--- a/packages/js-analyze-tests/js_analyze_tests.js
+++ b/packages/js-analyze-tests/js_analyze_tests.js
@@ -1,42 +1,3 @@
-Tinytest.add("js-analyze - findGlobalDottedRefs", function (test) {
-
-  var R = JSAnalyze.READ;
-  var W = JSAnalyze.WRITE;
-  var run = function (source) {
-    return JSAnalyze.findGlobalDottedRefs(source);
-  };
-
-  test.equal(run('x'), {x: R});
-  test.equal(run('x + y'), {x: R, y: R});
-  test.equal(run('x = y'), {x: W, y: R});
-  test.equal(run('var x; x = y'), {y: R});
-  test.equal(run('var y; x = y'), {x: W});
-  test.equal(run('var x,y; x = y'), {});
-  test.equal(run('for (x in y);'), {x: W, y: R});
-  test.equal(run('for (var x in y);'), {y: R});
-  test.equal(run('x++'), {x: W});
-  test.equal(run('var x = y'), {y: R});
-  test.equal(run('a.b[c.d]'), {'a.b': R, 'c.d': R});
-  test.equal(run('foo.bar[baz][c.d].z = 3'), {'foo.bar': W, baz: R, 'c.d': R});
-  test.equal(run('foo.bar(baz)[c.d].z = 3'), {'foo.bar': R, baz: R, 'c.d': R});
-  test.equal(run('var x = y.z; x.a = y; z.b;'), {'y.z': R, 'z.b': R, 'y': R});
-  test.equal(run('Foo.Bar'), {'Foo.Bar': R});
-  test.equal(run('Foo.Bar = 3'), {'Foo.Bar': W});
-  test.equal(run(
-    '(function (a, d) { var b = a, c; return f(a.z, b.z, c.z, d.z, e.z); })()'),
-             { 'f': R, 'e.z': R });
-  test.equal(run('try { Foo } catch (e) { e }'), {'Foo': R});
-  test.equal(run('try { Foo } catch (e) { Foo }'), {'Foo': R});
-  test.equal(run('try { Foo } catch (Foo) { Foo }'), {'Foo': R});
-  test.equal(run('try { e } catch (Foo) { Foo }'), {'e': R});
-  test.equal(run('var x = function y () { return String(y); }'), {'String': R});
-  test.equal(run('a[b=c] = d'), {a: W, b: W, c: R, d: R});
-  test.equal(run('a.a.a[b.b.b=c.c.c] = d.d.d'),
-             {'a.a.a': W, 'b.b.b': W, 'c.c.c': R, 'd.d.d': R});
-  // Without ignoreEval, this thinks J is global.
-  test.equal(run('function x(){var J;J=3;eval("foo");}'), {eval: R});
-});
-
 Tinytest.add("js-analyze - findAssignedGlobals", function (test) {
 
   var run = function (source, expected) {
diff --git a/packages/js-analyze/.npm/package/npm-shrinkwrap.json b/packages/js-analyze/.npm/package/npm-shrinkwrap.json
index ae22ab72c5..29842c42b1 100644
--- a/packages/js-analyze/.npm/package/npm-shrinkwrap.json
+++ b/packages/js-analyze/.npm/package/npm-shrinkwrap.json
@@ -3,11 +3,13 @@
     "esprima": {
       "from": "https://github.com/ariya/esprima/tarball/2a41dbf0ddadade0b09a9a7cc9a0c8df9c434018"
     },
-    "estraverse": {
-      "version": "1.3.1"
-    },
     "escope": {
-      "version": "1.0.0"
+      "version": "1.0.0",
+      "dependencies": {
+        "estraverse": {
+          "version": "1.3.1"
+        }
+      }
     }
   }
 }
diff --git a/packages/js-analyze/js_analyze.js b/packages/js-analyze/js_analyze.js
index c2f74eed64..ce4a2c3406 100644
--- a/packages/js-analyze/js_analyze.js
+++ b/packages/js-analyze/js_analyze.js
@@ -1,14 +1,8 @@
 var esprima = Npm.require('esprima');
 var escope = Npm.require('escope');
-var estraverse = Npm.require('estraverse');
-
-var Syntax = estraverse.Syntax;
 
 JSAnalyze = {};
 
-JSAnalyze.READ = 1;
-JSAnalyze.WRITE = 2;
-
 // Like esprima.parse, but annotates any thrown error with $ParseError = true.
 var esprimaParse = function (source) {
   try {
@@ -22,111 +16,6 @@ var esprimaParse = function (source) {
   }
 };
 
-// Analyze the JavaScript source code `source` and return a dictionary
-// of all the global dotted references.
-//
-// A global dotted reference is an expression of the form `Foo` or
-// `Foo.Bar.Baz`, where `Foo` is an access to a global variable not defined
-// in `source`.
-//
-// The value in the dictionary is either `JSAnalyze.READ`, if the reference
-// is only ever read and not written, or `JSAnalyze.WRITE` if the reference
-// is written (only or in addition).  A dotted reference is mapped to WRITE
-// if it is every assigned to, or if it is part of a larger
-// expression that is assigned to which consists of a series of dotted
-// or bracketed member access expressions.  For example, in
-// `Foo.Bar[baz].blah = 3`, the dotted reference `Foo.Bar` is reported
-// as WRITE.
-JSAnalyze.findGlobalDottedRefs = function (source) {
-  // escope's analyzer treats vars in the top-level "Program" node as globals.
-  // The newline is necessary in case source ends with a comment.
-  source = '(function () {' + source + '\n})';
-
-  var parseTree = esprimaParse(source);
-  var scoper = escope.analyze(parseTree, {ignoreEval: true});
-
-  var currentScope = null;
-  var dottedExpressionStack = [];
-
-  var globalsFound = {};
-
-  // Add _parent pointers to the tree
-  estraverse.traverse(parseTree, {
-    enter: function (node, parent) {
-      node._parent = parent;
-    }
-  });
-
-  estraverse.traverse(parseTree, {
-    enter: function (node, parent) {
-      currentScope = scoper.acquire(node) || currentScope;
-
-      if (node.type === Syntax.Identifier) {
-        var ref = null;
-        // Find an `escope.Reference` in the current Scope whose
-        // identifier node is `===` to `node`.  If found, this
-        // means escope determined this site to be a reference
-        // rather than some other identifier (like the `x` in
-        // `var x` or `a.x`).
-        for (var i = 0; i < currentScope.references.length; i++) {
-          if (currentScope.references[i].identifier === node) {
-            ref = currentScope.references[i];
-            break;
-          }
-        }
-        if (ref && ! ref.resolved) {
-          // global; not resolved to a local
-          var name = node.name;
-          var expr = node;
-          // find outer expression with dots, e.g. Foo.Bar.Baz
-          while (expr._parent &&
-                 expr._parent.type === Syntax.MemberExpression &&
-                 expr._parent.object === expr &&
-                 ! expr._parent.computed) {
-            expr = expr._parent;
-            name += '.' + expr.property.name;
-          }
-          // now expand expression to include bracketed access,
-          // e.g. Foo.Bar.Baz[3].blah
-          while (expr._parent &&
-                 expr._parent.type === Syntax.MemberExpression &&
-                 expr._parent.object === expr) {
-            expr = expr._parent;
-          }
-          var accessType;
-          // position of `expr`, aka `outer`, now determines whether this
-          // access is a READ or WRITE (which encompasses read/write)
-          var outer = expr;
-          var outerParent = expr._parent;
-          switch (outerParent.type) {
-          case Syntax.AssignmentExpression:
-            accessType = ((outerParent.left === outer) ? JSAnalyze.WRITE
-                          : JSAnalyze.READ);
-            break;
-          case Syntax.UpdateExpression: // prefix or postfix `++` or `--`
-            accessType = JSAnalyze.WRITE;
-            break;
-          case Syntax.ForInStatement:
-            accessType = (outerParent.left === outer ?
-                          JSAnalyze.WRITE : JSAnalyze.READ);
-            break;
-          default:
-            accessType = JSAnalyze.READ;
-            break;
-          }
-          globalsFound[name] = Math.max(globalsFound[name] || 0, accessType);
-        }
-      }
-    },
-    leave: function (node, parent) {
-      currentScope = scoper.release(node) || currentScope;
-    }
-  });
-
-  return globalsFound;
-};
-
-
 // Analyze the JavaScript source code `source` and return a dictionary of all
 // globals which are assigned to in the package. The values in the dictionary
 // are all `true`.
diff --git a/packages/js-analyze/package.js b/packages/js-analyze/package.js
index e18dbb9ecb..ca2bdd40ef 100644
--- a/packages/js-analyze/package.js
+++ b/packages/js-analyze/package.js
@@ -14,7 +14,6 @@ Npm.depends({
   // This code was originally written against the unreleased 1.1 branch. We can
   // probably switch to a built NPM version when it gets released.
   esprima: "https://github.com/ariya/esprima/tarball/2a41dbf0ddadade0b09a9a7cc9a0c8df9c434018",
-  estraverse: "1.3.1",
   escope: "1.0.0"
 });
 
diff --git a/tools/packages.js b/tools/packages.js
index 677cb40d00..2645a27ef7 100644
--- a/tools/packages.js
+++ b/tools/packages.js
@@ -26,7 +26,7 @@ var sourcemap = require('source-map');
 // end up as watched dependencies. (At least for now, packages only used in
 // target creation (eg minifiers and dev-bundle-fetcher) don't require you to
 // update BUILT_BY, though you will need to quit and rerun "meteor run".)
-exports.BUILT_BY = 'meteor/9';
+exports.BUILT_BY = 'meteor/10';
 
 // Like Perl's quotemeta: quotes all regexp metacharacters. See
 //   https://github.com/substack/quotemeta/blob/master/index.js

From 95d8bde496898d25e1a8ff80b4b34bf16bec9e61 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Fri, 4 Oct 2013 09:52:00 -0700
Subject: [PATCH 238/335] History.md change for implicit-global-variable
 rewrite.

While I tested that the change (6a836cc) has no effect on the packages shipped
with Meteor, it's worth mentioning in History.md in case it affects other
packages.
---
 History.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/History.md b/History.md
index b66a33d229..a9df0299ca 100644
--- a/History.md
+++ b/History.md
@@ -107,6 +107,8 @@
 * Add support for JSESSIONID cookies for sticky sessions. Set the
   `USE_JSESSIONID` environment variable to enable.
 
+* Simplify the static analysis used to detect package-scope variables.
+
 * Upgraded dependencies:
   * Node from 0.8.24 to 0.10.20
   * MongoDB from 2.4.4 to 2.4.6

From 6fcff6d85d0eea6397c6084a26d932797522a050 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Fri, 4 Oct 2013 12:41:45 -0700
Subject: [PATCH 239/335] Warn if `Accounts.config` is only called on the
 client.

---
 History.md                                |  2 ++
 packages/accounts-base/accounts_common.js | 17 +++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/History.md b/History.md
index a9df0299ca..67addea432 100644
--- a/History.md
+++ b/History.md
@@ -56,6 +56,8 @@
 * Support OAuth1 services that require request token secrets as well as
   authentication token secrets.  #1253
 
+* Warn if `Accounts.config` is only called on the client.
+
 #### Tools
 
 * The pre-0.6.5 `Package.register_extension` API has been removed. Use
diff --git a/packages/accounts-base/accounts_common.js b/packages/accounts-base/accounts_common.js
index 704924ac28..9c2a881692 100644
--- a/packages/accounts-base/accounts_common.js
+++ b/packages/accounts-base/accounts_common.js
@@ -31,11 +31,28 @@ CONNECTION_CLOSE_DELAY_MS = 10 * 1000;
 //     client signups.
 // - forbidClientAccountCreation {Boolean}
 //     Do not allow clients to create accounts directly.
+// - restrictCreationByEmailDomain {Function or String}
+//     Require created users to have an email matching the function or
+//     having the string as domain.
 // - loginExpirationInDays {Number}
 //     Number of days since login until a user is logged out (login token
 //     expires).
 //
 Accounts.config = function(options) {
+  // We don't want users to accidentally only call Accounts.config on the
+  // client, where some of the options will have partial effects (eg removing
+  // the "create account" button from accounts-ui if forbidClientAccountCreation
+  // is set, or redirecting Google login to a specific-domain page) without
+  // having their full effects.
+  if (Meteor.isServer) {
+    __meteor_runtime_config__.accountsConfigCalled = true;
+  } else if (!__meteor_runtime_config__.accountsConfigCalled) {
+    // XXX would be nice to "crash" the client and replace the UI with an error
+    // message, but there's no trivial way to do this.
+    Meteor._debug("Accounts.config was called on the client but not on the " +
+                  "server; some configuration options may not take effect.");
+  }
+
   // validate option keys
   var VALID_KEYS = ["sendVerificationEmail", "forbidClientAccountCreation",
                     "restrictCreationByEmailDomain", "loginExpirationInDays"];

From 38ed624909a8ec0857178033f5dff595cce16086 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Fri, 4 Oct 2013 12:46:17 -0700
Subject: [PATCH 240/335] Don't do Google domain redirect if
 restrictCreationByEmailDomain is function.

---
 packages/google/google_client.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/google/google_client.js b/packages/google/google_client.js
index 06ad03e00c..50e65c65db 100644
--- a/packages/google/google_client.js
+++ b/packages/google/google_client.js
@@ -44,7 +44,12 @@ Google.requestCredential = function (options, credentialRequestCompleteCallback)
         '&access_type=' + accessType +
         '&approval_prompt=' + approvalPrompt;
 
-  if (Accounts._options.restrictCreationByEmailDomain) {
+  // Use Google's domain-specific login page if we want to restrict creation to
+  // a particular email domain. (Don't use it if restrictCreationByEmailDomain
+  // is a function.) Note that all this does is change Google's UI ---
+  // accounts-base/accounts_server.js still checks server-side that the server
+  // has the proper email address after the OAuth conversation.
+  if (typeof Accounts._options.restrictCreationByEmailDomain === 'string') {
     loginUrl += '&hd=' + encodeURIComponent(Accounts._options.restrictCreationByEmailDomain);
   }
 

From 52e59350dba4add4df4e2490f82878127f299288 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Fri, 4 Oct 2013 12:47:16 -0700
Subject: [PATCH 241/335] Minor refactorings to restrictCreationByEmailDomain:

- test all emails if there is more than one (instead of relying on
  accounts-password to only set one)
- simplify boolean logic
- typo fix
---
 packages/accounts-base/accounts_server.js | 31 +++++++++++------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index 9fc42adc9b..2f06183498 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -351,26 +351,25 @@ Accounts.validateNewUser(function (user) {
   if (!domain)
     return true;
 
-  var emailIsGood = true;
-  // User with password can have only one email on creation
-  if (user.emails)
-    emailIsGood = emailIsGood && testEmailDomain(user.emails[0].address);
-  else {
+  var emailIsGood = false;
+  if (!_.isEmpty(user.emails)) {
+    emailIsGood = _.any(user.emails, function (email) {
+      return testEmailDomain(email.address);
+    });
+  } else if (!_.isEmpty(user.services)) {
     // Find any email of any service and check it
-    if (!_.isEmpty(user.services))
-      emailIsGood = emailIsGood && _.any(user.services, function (service) {
-        return service.email && testEmailDomain(service.email); });
+    emailIsGood = _.any(user.services, function (service) {
+      return service.email && testEmailDomain(service.email);
+    });
   }
 
+  if (emailIsGood)
+    return true;
 
-  if (!emailIsGood) {
-    if (_.isString(domain))
-      throw new Meteor.Error(403, "@" + domain + " email required");
-    else
-      throw new Meteor.Error(403, "Email doesn't match the criterias.");
-  }
-
-  return true;
+  if (_.isString(domain))
+    throw new Meteor.Error(403, "@" + domain + " email required");
+  else
+    throw new Meteor.Error(403, "Email doesn't match the criteria.");
 });
 
 ///

From 234ae59840629c1a4b8f3f7beab13138a4b2cca4 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Fri, 4 Oct 2013 13:25:19 -0700
Subject: [PATCH 242/335] Bump version in history file.

---
 History.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/History.md b/History.md
index 67addea432..f0785708b2 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,7 @@
 ## vNEXT
 
+## v0.6.6
+
 #### Security
 
 * Add `browser-policy` package for configuring and sending Content Security

From a4d96c68b27302002271a182219c21e2abf843de Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Fri, 4 Oct 2013 14:19:45 -0700
Subject: [PATCH 243/335] Add issue number to History.

---
 History.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/History.md b/History.md
index f0785708b2..db86e5344e 100644
--- a/History.md
+++ b/History.md
@@ -58,7 +58,7 @@
 * Support OAuth1 services that require request token secrets as well as
   authentication token secrets.  #1253
 
-* Warn if `Accounts.config` is only called on the client.
+* Warn if `Accounts.config` is only called on the client.  #828
 
 #### Tools
 

From 35fc8bf5f545948f2905f775fd7ab66bb1cbd1ab Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Fri, 4 Oct 2013 15:47:55 -0700
Subject: [PATCH 244/335] Rename warehouse S3 bucket to be SSL-compatible.

---
 scripts/admin/bless-release.js                |  8 +++----
 .../publish-release/server/publish-release.js | 24 ++++++++++---------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/scripts/admin/bless-release.js b/scripts/admin/bless-release.js
index f6f1e1d023..4464b5e676 100644
--- a/scripts/admin/bless-release.js
+++ b/scripts/admin/bless-release.js
@@ -57,7 +57,7 @@ var execFileSync = function (binary, args) {
 
 var getWarehouseFile = function (path, json) {
   return files.getUrl({
-    url: "https://s3.amazonaws.com/com.meteor.warehouse/" + path,
+    url: "https://s3.amazonaws.com/meteor-warehouse/" + path,
     json: json
   });
 };
@@ -172,12 +172,12 @@ var writeGlobalManifest = function (blessedReleaseName, banner) {
 var writeBigRedButton = function (blessedReleaseName, gitTagSourceSha, gitTag) {
   var s3Files = _.map(PLATFORMS, function (platform) {
     return [bootstrapTarballFilename(platform),
-            'com.meteor.warehouse/bootstrap/' + blessedReleaseName];
+            'meteor-warehouse/bootstrap/' + blessedReleaseName];
   });
   s3Files.push([blessedReleaseName + '.notices.json',
-                'com.meteor.warehouse/releases']);
+                'meteor-warehouse/releases']);
   s3Files.push([blessedReleaseName + '.release.json',
-                'com.meteor.warehouse/releases']);
+                'meteor-warehouse/releases']);
   s3Files.push(['manifest.json', 'com.meteor.static/update']);
   var scriptText =
         "#!/bin/bash\n" +
diff --git a/scripts/admin/publish-release/server/publish-release.js b/scripts/admin/publish-release/server/publish-release.js
index d4db8cbdfa..19b8c8abf5 100644
--- a/scripts/admin/publish-release/server/publish-release.js
+++ b/scripts/admin/publish-release/server/publish-release.js
@@ -4,6 +4,8 @@ var Fiber = Npm.require("fibers");
 var Future = Npm.require("fibers/future");
 var child_process = Npm.require("child_process");
 
+var WAREHOUSE_BUCKET = "meteor-warehouse";
+
 var die = function (msg) {
   console.error(msg);
   process.exit(1);
@@ -73,7 +75,7 @@ var getManifest = function(s3, gitSha) {
     s3, ["unpublished", gitSha, "release.json-"].join("/"));
   var manifests = _.map(manifestMetas, function (meta) {
     return s3.GetObject({
-      BucketName: "com.meteor.warehouse",
+      BucketName: WAREHOUSE_BUCKET,
       ObjectName: meta.Key
     }).Body;
   });
@@ -89,7 +91,7 @@ var getManifest = function(s3, gitSha) {
 // are there any files with this prefix?
 var anyWithPrefix = function(s3, prefix) {
   var files = s3.ListObjects({
-    BucketName: "com.meteor.warehouse",
+    BucketName: WAREHOUSE_BUCKET,
     Prefix: prefix
   });
   return !_.isEmpty(files.Body.ListBucketResult.Contents);
@@ -97,7 +99,7 @@ var anyWithPrefix = function(s3, prefix) {
 
 var list3FilesWithPrefix = function (s3, prefix) {
   var artifacts = s3.ListObjects({
-    BucketName: "com.meteor.warehouse",
+    BucketName: WAREHOUSE_BUCKET,
     Prefix: prefix
   }).Body.ListBucketResult.Contents;
 
@@ -117,9 +119,9 @@ var copy3FilesWithPrefix = function (s3, prefix, destDir) {
     var destKey = [destDir, filename].join("/");
 
     var opts = {
-      BucketName: "com.meteor.warehouse",
+      BucketName: WAREHOUSE_BUCKET,
       ObjectName: destKey,
-      SourceBucket: "com.meteor.warehouse",
+      SourceBucket: WAREHOUSE_BUCKET,
       SourceObject: sourceKey,
       Acl: "public-read"
     };
@@ -128,8 +130,8 @@ var copy3FilesWithPrefix = function (s3, prefix, destDir) {
 };
 
 // publish a given tools, copying multiple files from
-// s3://com.meteor.warehouse/unpublished/GITSHA/ to
-// s3://com.meteor.warehouse/tools/VERSION/
+// s3://meteor-warehouse/unpublished/GITSHA/ to
+// s3://meteor-warehouse/tools/VERSION/
 var publishTools = function(s3, gitSha, version) {
   var destDir = ["tools", version].join("/");
 
@@ -147,8 +149,8 @@ var publishTools = function(s3, gitSha, version) {
 };
 
 // publish a given package, copying from
-// s3://com.meteor.warehouse/unpublished/GITSHA/NAME-VERSION-{PLATFORM}.tar.gz to
-// s3://com.meteor.warehouse/packages/NAME-VERSION-{PLATFORM}.tar.gz
+// s3://meteor-warehouse/unpublished/GITSHA/NAME-VERSION-{PLATFORM}.tar.gz to
+// s3://meteor-warehouse/packages/NAME-VERSION-{PLATFORM}.tar.gz
 var publishPackage = function(s3, gitSha, name, version) {
   var destDir = ["packages", name, version].join("/");
   var sourcePrefix = ["unpublished", gitSha,
@@ -166,7 +168,7 @@ var publishPackage = function(s3, gitSha, name, version) {
 };
 
 // publish the release manifest at
-// s3://com.meteor.warehouse/releases/RELEASE.release.json
+// s3://meteor-warehouse/releases/RELEASE.release.json
 var publishManifest = function(s3, manifestText, release) {
   var destKey = ["releases", release + ".release.json"].join("/");
 
@@ -180,7 +182,7 @@ var publishManifest = function(s3, manifestText, release) {
   }
 
   var opts = {
-    BucketName: "com.meteor.warehouse",
+    BucketName: WAREHOUSE_BUCKET,
     ObjectName: destKey,
     ContentLength: manifestText.length,
     Body: manifestText,

From c604a8dd808d967873c6b00b0983e5ca106a93d3 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Fri, 4 Oct 2013 15:47:55 -0700
Subject: [PATCH 245/335] Rename warehouse S3 bucket to be SSL-compatible.

---
 scripts/admin/bless-release.js                |  8 +++----
 .../publish-release/server/publish-release.js | 24 ++++++++++---------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/scripts/admin/bless-release.js b/scripts/admin/bless-release.js
index f6f1e1d023..4464b5e676 100644
--- a/scripts/admin/bless-release.js
+++ b/scripts/admin/bless-release.js
@@ -57,7 +57,7 @@ var execFileSync = function (binary, args) {
 
 var getWarehouseFile = function (path, json) {
   return files.getUrl({
-    url: "https://s3.amazonaws.com/com.meteor.warehouse/" + path,
+    url: "https://s3.amazonaws.com/meteor-warehouse/" + path,
     json: json
   });
 };
@@ -172,12 +172,12 @@ var writeGlobalManifest = function (blessedReleaseName, banner) {
 var writeBigRedButton = function (blessedReleaseName, gitTagSourceSha, gitTag) {
   var s3Files = _.map(PLATFORMS, function (platform) {
     return [bootstrapTarballFilename(platform),
-            'com.meteor.warehouse/bootstrap/' + blessedReleaseName];
+            'meteor-warehouse/bootstrap/' + blessedReleaseName];
   });
   s3Files.push([blessedReleaseName + '.notices.json',
-                'com.meteor.warehouse/releases']);
+                'meteor-warehouse/releases']);
   s3Files.push([blessedReleaseName + '.release.json',
-                'com.meteor.warehouse/releases']);
+                'meteor-warehouse/releases']);
   s3Files.push(['manifest.json', 'com.meteor.static/update']);
   var scriptText =
         "#!/bin/bash\n" +
diff --git a/scripts/admin/publish-release/server/publish-release.js b/scripts/admin/publish-release/server/publish-release.js
index d4db8cbdfa..19b8c8abf5 100644
--- a/scripts/admin/publish-release/server/publish-release.js
+++ b/scripts/admin/publish-release/server/publish-release.js
@@ -4,6 +4,8 @@ var Fiber = Npm.require("fibers");
 var Future = Npm.require("fibers/future");
 var child_process = Npm.require("child_process");
 
+var WAREHOUSE_BUCKET = "meteor-warehouse";
+
 var die = function (msg) {
   console.error(msg);
   process.exit(1);
@@ -73,7 +75,7 @@ var getManifest = function(s3, gitSha) {
     s3, ["unpublished", gitSha, "release.json-"].join("/"));
   var manifests = _.map(manifestMetas, function (meta) {
     return s3.GetObject({
-      BucketName: "com.meteor.warehouse",
+      BucketName: WAREHOUSE_BUCKET,
       ObjectName: meta.Key
     }).Body;
   });
@@ -89,7 +91,7 @@ var getManifest = function(s3, gitSha) {
 // are there any files with this prefix?
 var anyWithPrefix = function(s3, prefix) {
   var files = s3.ListObjects({
-    BucketName: "com.meteor.warehouse",
+    BucketName: WAREHOUSE_BUCKET,
     Prefix: prefix
   });
   return !_.isEmpty(files.Body.ListBucketResult.Contents);
@@ -97,7 +99,7 @@ var anyWithPrefix = function(s3, prefix) {
 
 var list3FilesWithPrefix = function (s3, prefix) {
   var artifacts = s3.ListObjects({
-    BucketName: "com.meteor.warehouse",
+    BucketName: WAREHOUSE_BUCKET,
     Prefix: prefix
   }).Body.ListBucketResult.Contents;
 
@@ -117,9 +119,9 @@ var copy3FilesWithPrefix = function (s3, prefix, destDir) {
     var destKey = [destDir, filename].join("/");
 
     var opts = {
-      BucketName: "com.meteor.warehouse",
+      BucketName: WAREHOUSE_BUCKET,
       ObjectName: destKey,
-      SourceBucket: "com.meteor.warehouse",
+      SourceBucket: WAREHOUSE_BUCKET,
       SourceObject: sourceKey,
       Acl: "public-read"
     };
@@ -128,8 +130,8 @@ var copy3FilesWithPrefix = function (s3, prefix, destDir) {
 };
 
 // publish a given tools, copying multiple files from
-// s3://com.meteor.warehouse/unpublished/GITSHA/ to
-// s3://com.meteor.warehouse/tools/VERSION/
+// s3://meteor-warehouse/unpublished/GITSHA/ to
+// s3://meteor-warehouse/tools/VERSION/
 var publishTools = function(s3, gitSha, version) {
   var destDir = ["tools", version].join("/");
 
@@ -147,8 +149,8 @@ var publishTools = function(s3, gitSha, version) {
 };
 
 // publish a given package, copying from
-// s3://com.meteor.warehouse/unpublished/GITSHA/NAME-VERSION-{PLATFORM}.tar.gz to
-// s3://com.meteor.warehouse/packages/NAME-VERSION-{PLATFORM}.tar.gz
+// s3://meteor-warehouse/unpublished/GITSHA/NAME-VERSION-{PLATFORM}.tar.gz to
+// s3://meteor-warehouse/packages/NAME-VERSION-{PLATFORM}.tar.gz
 var publishPackage = function(s3, gitSha, name, version) {
   var destDir = ["packages", name, version].join("/");
   var sourcePrefix = ["unpublished", gitSha,
@@ -166,7 +168,7 @@ var publishPackage = function(s3, gitSha, name, version) {
 };
 
 // publish the release manifest at
-// s3://com.meteor.warehouse/releases/RELEASE.release.json
+// s3://meteor-warehouse/releases/RELEASE.release.json
 var publishManifest = function(s3, manifestText, release) {
   var destKey = ["releases", release + ".release.json"].join("/");
 
@@ -180,7 +182,7 @@ var publishManifest = function(s3, manifestText, release) {
   }
 
   var opts = {
-    BucketName: "com.meteor.warehouse",
+    BucketName: WAREHOUSE_BUCKET,
     ObjectName: destKey,
     ContentLength: manifestText.length,
     Body: manifestText,

From 82994d06e49ed6cc25476b94bf8396e6265513a3 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Fri, 4 Oct 2013 17:55:08 -0700
Subject: [PATCH 246/335] more history tweaks

---
 History.md | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/History.md b/History.md
index db86e5344e..2be76124ef 100644
--- a/History.md
+++ b/History.md
@@ -44,17 +44,24 @@
 
 #### Accounts
 
+* [Behavior Change] Write dates generated by Meteor Accounts to Mongo as
+  Date instead of number; existing data can be converted by passing it
+  through `new Date()`. #1228
+
+* [Behavior Change] Expire login tokens periodically. Defaults to 90
+  days. Use `Accounts.config({loginExpirationInDays: null})` to disable
+  token expiration.
+
+* Log out and close connections for users if they are deleted from the
+  database.
+
+* Add Meteor.logoutOtherClients() for logging out other connections
+  logged in as the current user.
+
 * `restrictCreationByEmailDomain` option in `Accounts.config` to restrict new
   users to emails of specific domain (eg. only users with @meteor.com emails) or
   a custom validator. #1332
 
-* Write dates generated by Meteor Accounts to Mongo as Date instead of number;
-  existing data can be converted by passing it through `new Date()`. #1228
-
-* Login token deletion: Expire login tokens periodically. Add
-  Meteor.logoutOtherClients() for logging out other connections logged in as the
-  current user. Log out and close connections for deleted users and tokens.
-
 * Support OAuth1 services that require request token secrets as well as
   authentication token secrets.  #1253
 

From c2b2deb0d60f88d1cf9407b43f32567b25593fd5 Mon Sep 17 00:00:00 2001
From: Geoff Schmidt <geoff@geoffschmidt.com>
Date: Fri, 4 Oct 2013 18:19:57 -0700
Subject: [PATCH 247/335] parties example: force selection to an
 actually-existing party. This handles the case where the selected party is
 deleted by another user, and also the case where the server rejects the party
 creation request.

---
 examples/parties/client/client.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/examples/parties/client/client.js b/examples/parties/client/client.js
index a78350d36f..972b5538d4 100644
--- a/examples/parties/client/client.js
+++ b/examples/parties/client/client.js
@@ -3,13 +3,16 @@
 Meteor.subscribe("directory");
 Meteor.subscribe("parties");
 
-// If no party selected, select one.
+// If no party selected, or if the selected party was deleted, select one.
 Meteor.startup(function () {
   Deps.autorun(function () {
-    if (! Session.get("selected")) {
+    var selected = Session.get("selected");
+    if (! selected || ! Parties.findOne(selected)) {
       var party = Parties.findOne();
       if (party)
         Session.set("selected", party._id);
+      else
+        Session.set("selected", null);
     }
   });
 });

From 77d50e4f3d79ec86c85a0e9be2ab81ea72b891b1 Mon Sep 17 00:00:00 2001
From: Geoff Schmidt <geoff@geoffschmidt.com>
Date: Fri, 4 Oct 2013 18:19:57 -0700
Subject: [PATCH 248/335] parties example: force selection to an
 actually-existing party. This handles the case where the selected party is
 deleted by another user, and also the case where the server rejects the party
 creation request.

---
 examples/parties/client/client.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/examples/parties/client/client.js b/examples/parties/client/client.js
index a78350d36f..972b5538d4 100644
--- a/examples/parties/client/client.js
+++ b/examples/parties/client/client.js
@@ -3,13 +3,16 @@
 Meteor.subscribe("directory");
 Meteor.subscribe("parties");
 
-// If no party selected, select one.
+// If no party selected, or if the selected party was deleted, select one.
 Meteor.startup(function () {
   Deps.autorun(function () {
-    if (! Session.get("selected")) {
+    var selected = Session.get("selected");
+    if (! selected || ! Parties.findOne(selected)) {
       var party = Parties.findOne();
       if (party)
         Session.set("selected", party._id);
+      else
+        Session.set("selected", null);
     }
   });
 });

From bda5113fa5bb529a4c8be1811adef9df3a37fddb Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Mon, 7 Oct 2013 14:18:29 -0700
Subject: [PATCH 249/335] meteor run: Handle errors in the websocket proxy by
 closing socket instead of throwing

---
 tools/run.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/run.js b/tools/run.js
index 328908d984..c9d8b7f19b 100644
--- a/tools/run.js
+++ b/tools/run.js
@@ -181,14 +181,15 @@ var startProxy = function (outerPort, innerPort, callback) {
   // don't crash if the app doesn't respond. instead return an error
   // immediately. This shouldn't happen much since we try to not send requests
   // if the app is down.
-  // XXX should we also handle http-proxy:outgoing:ws:error, for a failed
-  // websocket?
   proxy.ee.on('http-proxy:outgoing:web:error', function (err, req, res) {
     res.writeHead(503, {
       'Content-Type': 'text/plain'
     });
     res.end('Unexpected error.');
   });
+  proxy.ee.on('http-proxy:outgoing:ws:error', function (err, req, socket) {
+    socket.close();
+  });
 
   server.listen(outerPort, callback);
 };

From 7c9122ef09cadeca9b14783454a0bed796b44ee5 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Mon, 7 Oct 2013 14:30:54 -0700
Subject: [PATCH 250/335] Make geojson-utils a strong dependency of minimongo.

---
 packages/minimongo/package.js  | 4 ++--
 packages/minimongo/selector.js | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index 2c881346e3..dec89d4788 100644
--- a/packages/minimongo/package.js
+++ b/packages/minimongo/package.js
@@ -7,8 +7,8 @@ Package.on_use(function (api) {
   api.export('LocalCollection');
   api.use(['underscore', 'json', 'ejson', 'ordered-dict', 'deps',
            'random', 'ordered-dict']);
-  // If you really want geolocation queries to work, add this package
-  api.use('geojson-utils', { weak: true });
+  // This package is used for geo-location queries such as $near
+  api.use('geojson-utils');
   api.add_files([
     'minimongo.js',
     'selector.js',
diff --git a/packages/minimongo/selector.js b/packages/minimongo/selector.js
index dd116f22c5..38416cf1af 100644
--- a/packages/minimongo/selector.js
+++ b/packages/minimongo/selector.js
@@ -341,8 +341,6 @@ var VALUE_OPERATORS = {
           dist = distanceCoordinatePairs(point, value);
           break;
         case "2dsphere":
-          if (!_.has(Package, 'geojson-utils'))
-            throw new Error('Need geojson-utils package for GeoJSON calculations (such as $near)');
           var GeoJSON = Package['geojson-utils'].GeoJSON;
           // XXX: for now, we don't calculate the actual distance between, say,
           // polygon and circle. If people care about this use-case it will get

From b414cd15bbe01f94e2e2ad1a138e6dc0f0c09373 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Mon, 7 Oct 2013 15:12:44 -0700
Subject: [PATCH 251/335] Fix README instructions about running docs app.

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9545721dba..f128f12057 100644
--- a/README.md
+++ b/README.md
@@ -56,8 +56,8 @@ From your checkout, you can read the docs locally. The `/docs` directory is a
 meteor application, so simply change into the `/docs` directory and launch
 the app:
 
-	cd docs/
-	meteor
+    cd docs/
+    ../meteor
 
 You'll then be able to read the docs locally in your browser at
 `http://localhost:3000/`

From d1518f4f17924f7760f2a8ae53d584b0fee32559 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Mon, 7 Oct 2013 14:45:00 -0700
Subject: [PATCH 252/335] Package wrapper for geojson-utils package to keep
 original code unchanged.

---
 packages/geojson-utils/geojson-utils.js | 3 ---
 packages/geojson-utils/package.js       | 5 +++--
 packages/geojson-utils/post.js          | 4 ++++
 packages/geojson-utils/pre.js           | 4 ++++
 4 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 packages/geojson-utils/post.js
 create mode 100644 packages/geojson-utils/pre.js

diff --git a/packages/geojson-utils/geojson-utils.js b/packages/geojson-utils/geojson-utils.js
index 28ce187606..82d8068263 100644
--- a/packages/geojson-utils/geojson-utils.js
+++ b/packages/geojson-utils/geojson-utils.js
@@ -6,9 +6,6 @@
     module.exports = gju;
   }
 
-  // Export for Meteor uni-package
-  GeoJSON = gju;
-
   // adapted from http://www.kevlindev.com/gui/math/intersection/Intersection.js
   gju.lineStringsIntersect = function (l1, l2) {
     var intersects = [];
diff --git a/packages/geojson-utils/package.js b/packages/geojson-utils/package.js
index 6a4d7be14b..a82fb5e62d 100644
--- a/packages/geojson-utils/package.js
+++ b/packages/geojson-utils/package.js
@@ -5,11 +5,12 @@ Package.describe({
 
 Package.on_use(function (api) {
   api.export('GeoJSON');
-  api.add_files(['geojson-utils.js']);
+  api.add_files(['pre.js', 'geojson-utils.js', 'post.js']);
 });
 
 Package.on_test(function (api) {
   api.use('tinytest');
-  api.add_files(['geojson-utils.js', 'geojson-utils.tests.js'], 'client');
+  api.use('geojson-utils');
+  api.add_files(['geojson-utils.tests.js'], 'client');
 });
 
diff --git a/packages/geojson-utils/post.js b/packages/geojson-utils/post.js
new file mode 100644
index 0000000000..7ac8bff75e
--- /dev/null
+++ b/packages/geojson-utils/post.js
@@ -0,0 +1,4 @@
+// This exports object was created in pre.js.  Now copy the `exports` object
+// from it into the package-scope variable `GeoJSON`, which will get exported.
+GeoJSON = module.exports;
+
diff --git a/packages/geojson-utils/pre.js b/packages/geojson-utils/pre.js
new file mode 100644
index 0000000000..99ad3ca65d
--- /dev/null
+++ b/packages/geojson-utils/pre.js
@@ -0,0 +1,4 @@
+// Define an object named exports. This will cause geojson-utils.js to put `gju`
+// as a field on it, instead of in the global namespace.  See also post.js.
+module = {exports:{}};
+

From 24b3ca13e1c0bbb4ad1e7acc9bf2e7194d9f25a7 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Mon, 7 Oct 2013 16:19:45 -0700
Subject: [PATCH 253/335] Another test for minimongo $near inside $and clause

It throws no matter how deep is $near.
---
 packages/minimongo/minimongo.js       |  2 ++
 packages/minimongo/minimongo_tests.js | 17 +++++++++++++++++
 packages/minimongo/selector.js        |  1 -
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index 1329a12006..b355ccb9b4 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -1186,6 +1186,7 @@ LocalCollection._compileProjection = function (fields) {
 // (including all $or/$and/$nor/$not branches)
 var isGeoQuery = function (selector) {
   return _.any(selector, function (val, key) {
+    // Note: _.isObject matches objects and arrays
     return key === "$near" || (_.isObject(val) && isGeoQuery(val));
   });
 };
@@ -1195,6 +1196,7 @@ var isGeoQuerySpecial = function (selector) {
   return _.any(selector, function (val, key) {
     if (_.contains(['$or', '$and', '$nor', '$not'], key))
       return isGeoQuery(val);
+    // Note: _.isObject matches objects and arrays
     return _.isObject(val) && isGeoQuerySpecial(val);
   });
 };
diff --git a/packages/minimongo/minimongo_tests.js b/packages/minimongo/minimongo_tests.js
index c8a5a13e72..34df9dba0b 100644
--- a/packages/minimongo/minimongo_tests.js
+++ b/packages/minimongo/minimongo_tests.js
@@ -2342,5 +2342,22 @@ Tinytest.add("minimongo - $near operator tests", function (test) {
               { x: 0 }]
     });
   });
+  test.throws(function () {
+    coll.find({
+      $and: [{
+        $and: [{
+          location: {
+            $near: {
+              $geometry: {
+                type: "Point",
+                coordinates: [-122.4154282, 37.7746115]
+              },
+              $maxDistance: 1
+            }
+          }
+        }]
+      }]
+    });
+  });
 });
 
diff --git a/packages/minimongo/selector.js b/packages/minimongo/selector.js
index 38416cf1af..3a1e5394a8 100644
--- a/packages/minimongo/selector.js
+++ b/packages/minimongo/selector.js
@@ -341,7 +341,6 @@ var VALUE_OPERATORS = {
           dist = distanceCoordinatePairs(point, value);
           break;
         case "2dsphere":
-          var GeoJSON = Package['geojson-utils'].GeoJSON;
           // XXX: for now, we don't calculate the actual distance between, say,
           // polygon and circle. If people care about this use-case it will get
           // a priority.

From 6ca55ec1890def2241e081ddcdf3291b92c125e5 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Mon, 7 Oct 2013 15:04:42 -0700
Subject: [PATCH 254/335] Remember to call this._setLoginToken the other places
 we call this.setUserId

This makes me feel that this._setLoginToken is the wrong pattern even more strongly.
---
 packages/accounts-password/password_server.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/accounts-password/password_server.js b/packages/accounts-password/password_server.js
index 1771cb1e91..b702a36708 100644
--- a/packages/accounts-password/password_server.js
+++ b/packages/accounts-password/password_server.js
@@ -330,6 +330,7 @@ Meteor.methods({resetPassword: function (token, newVerifier) {
   });
 
   this.setUserId(user._id);
+  this._setLoginToken(stampedLoginToken.token);
   return {
     token: stampedLoginToken.token,
     tokenExpires: Accounts._tokenExpiration(stampedLoginToken.when),
@@ -421,6 +422,7 @@ Meteor.methods({verifyEmail: function (token) {
      $push: {'services.resume.loginTokens': stampedLoginToken}});
 
   this.setUserId(user._id);
+  this._setLoginToken(stampedLoginToken.token);
   return {
     token: stampedLoginToken.token,
     tokenExpires: Accounts._tokenExpiration(stampedLoginToken.when),
@@ -499,6 +501,7 @@ Meteor.methods({createUser: function (options) {
 
   // client gets logged in as the new user afterwards.
   this.setUserId(result.id);
+  this._setLoginToken(result.token);
   return result;
 }});
 

From 2deb0e9b625ff0a9cc66c09af4a14f2ac1dcc365 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Mon, 7 Oct 2013 15:05:55 -0700
Subject: [PATCH 255/335] break 'long series' test into smaller tests.

---
 packages/accounts-password/password_tests.js  | 360 +++++++++++-------
 .../accounts-password/password_tests_setup.js |   9 +-
 2 files changed, 224 insertions(+), 145 deletions(-)

diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index 110a37448d..ed8bc27c27 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -20,39 +20,25 @@ if (Meteor.isClient) (function () {
     });
   };
 
-  // declare variable outside the testAsyncMulti, so we can refer to
-  // them from multiple tests, but initialize them to new values inside
-  // the test so when we use the 'debug' link in the tests, they get new
-  // values and the tests don't fail.
-  var username, username2, username3;
-  var userId1, userId3;
-  var email;
-  var password, password2, password3;
 
-  testAsyncMulti("passwords - long series", [
-    function (test, expect) {
-      username = Random.id();
-      username2 = Random.id();
-      username3 = Random.id();
-      // use -intercept so that we don't print to the console
-      email = Random.id() + '-intercept@example.com';
-      password = 'password';
-      password2 = 'password2';
-      password3 = 'password3';
-    },
+  testAsyncMulti("passwords - basic login with password", [
     function (test, expect) {
+      // setup
+      this.username = Random.id();
+      this.email = Random.id() + '-intercept@example.com';
+      this.password = 'password';
+
       Accounts.createUser(
-        {username: username, email: email, password: password},
-        loggedInAs(username, test, expect));
+        {username: this.username, email: this.email, password: this.password},
+        loggedInAs(this.username, test, expect));
     },
     function (test, expect) {
-      userId1 = Meteor.userId();
-      test.notEqual(userId1, null);
+      test.notEqual(Meteor.userId(), null);
     },
     logoutStep,
     function (test, expect) {
-      Meteor.loginWithPassword(username, password,
-                               loggedInAs(username, test, expect));
+      Meteor.loginWithPassword(this.username, this.password,
+                               loggedInAs(this.username, test, expect));
     },
     logoutStep,
     // This next step tests reactive contexts which are reactive on
@@ -67,7 +53,7 @@ if (Meteor.isClient) (function () {
       });
       // At the beginning, we're not logged in.
       test.isFalse(loaded);
-      Meteor.loginWithPassword(username, password, expect(function (error) {
+      Meteor.loginWithPassword(this.username, this.password, expect(function (error) {
         test.equal(error, undefined);
         test.notEqual(Meteor.userId(), null);
         // By the time of the login callback, the user should be loaded.
@@ -80,18 +66,43 @@ if (Meteor.isClient) (function () {
     },
     logoutStep,
     function (test, expect) {
-      Meteor.loginWithPassword({username: username}, password,
-                               loggedInAs(username, test, expect));
+      Meteor.loginWithPassword({username: this.username}, this.password,
+                               loggedInAs(this.username, test, expect));
     },
     logoutStep,
     function (test, expect) {
-      Meteor.loginWithPassword(email, password,
-                               loggedInAs(username, test, expect));
+      Meteor.loginWithPassword(this.email, this.password,
+                               loggedInAs(this.username, test, expect));
     },
     logoutStep,
     function (test, expect) {
-      Meteor.loginWithPassword({email: email}, password,
-                               loggedInAs(username, test, expect));
+      Meteor.loginWithPassword({email: this.email}, this.password,
+                               loggedInAs(this.username, test, expect));
+    },
+    logoutStep
+  ]);
+
+
+  testAsyncMulti("passwords - plain text passwords", [
+    function (test, expect) {
+      // setup
+      this.username = Random.id();
+      this.email = Random.id() + '-intercept@example.com';
+      this.password = 'password';
+
+      // create user with raw password (no API, need to invoke callLoginMethod
+      // directly)
+      Accounts.callLoginMethod({
+        methodName: 'createUser',
+        methodArguments: [{username: this.username, password: this.password}],
+        userCallback: loggedInAs(this.username, test, expect)
+      });
+    },
+    logoutStep,
+    // check can login normally with this password.
+    function(test, expect) {
+      Meteor.loginWithPassword({username: this.username}, this.password,
+                               loggedInAs(this.username, test, expect));
     },
     logoutStep,
     // plain text password. no API for this, have to invoke callLoginMethod
@@ -99,7 +110,7 @@ if (Meteor.isClient) (function () {
     function (test, expect) {
       Accounts.callLoginMethod({
         // wrong password
-        methodArguments: [{user: {email: email}, password: password2}],
+        methodArguments: [{user: {username: this.username}, password: 'wrong'}],
         userCallback: expect(function (error) {
           test.isTrue(error);
           test.isFalse(Meteor.user());
@@ -108,138 +119,127 @@ if (Meteor.isClient) (function () {
     function (test, expect) {
       Accounts.callLoginMethod({
         // right password
-        methodArguments: [{user: {email: email}, password: password}],
-        userCallback: loggedInAs(username, test, expect)
+        methodArguments: [{user: {username: this.username},
+                           password: this.password}],
+        userCallback: loggedInAs(this.username, test, expect)
       });
     },
+    logoutStep
+  ]);
+
+
+  testAsyncMulti("passwords - changing passwords", [
+    function (test, expect) {
+      // setup
+      this.username = Random.id();
+      this.email = Random.id() + '-intercept@example.com';
+      this.password = 'password';
+      this.password2 = 'password2';
+
+      Accounts.createUser(
+        {username: this.username, email: this.email, password: this.password},
+        loggedInAs(this.username, test, expect));
+    },
     // change password with bad old password. we stay logged in.
     function (test, expect) {
-      Accounts.changePassword(password2, password2, expect(function (error) {
+      var self = this;
+      Accounts.changePassword('wrong', 'doesntmatter', expect(function (error) {
         test.isTrue(error);
-        test.equal(Meteor.user().username, username);
+        test.equal(Meteor.user().username, self.username);
       }));
     },
     // change password with good old password.
     function (test, expect) {
-      Accounts.changePassword(password, password2,
-                              loggedInAs(username, test, expect));
+      Accounts.changePassword(this.password, this.password2,
+                              loggedInAs(this.username, test, expect));
     },
     logoutStep,
     // old password, failed login
     function (test, expect) {
-      Meteor.loginWithPassword(email, password, expect(function (error) {
+      Meteor.loginWithPassword(this.email, this.password, expect(function (error) {
         test.isTrue(error);
         test.isFalse(Meteor.user());
       }));
     },
     // new password, success
     function (test, expect) {
-      Meteor.loginWithPassword(email, password2,
-                               loggedInAs(username, test, expect));
+      Meteor.loginWithPassword(this.email, this.password2,
+                               loggedInAs(this.username, test, expect));
     },
-    logoutStep,
-    // create user with raw password (no API, need to invoke callLoginMethod
-    // directly)
+    logoutStep
+  ]);
+
+
+  testAsyncMulti("passwords - new user hooks", [
     function (test, expect) {
-      Accounts.callLoginMethod({
-        methodName: 'createUser',
-        methodArguments: [{username: username2, password: password2}],
-        userCallback: loggedInAs(username2, test, expect)
-      });
+      // setup
+      this.username = Random.id();
+      this.email = Random.id() + '-intercept@example.com';
+      this.password = 'password';
     },
-    logoutStep,
-    function(test, expect) {
-      Meteor.loginWithPassword({username: username2}, password2,
-                               loggedInAs(username2, test, expect));
-    },
-    logoutStep,
     // test Accounts.validateNewUser
     function(test, expect) {
-      Accounts.createUser({username: username3, password: password3,
-                           // should fail the new user validators
-                           profile: {invalid: true}},
-                          expect(function (error) {
-                            test.equal(error.error, 403);
-                            test.equal(
-                              error.reason,
-                              "User validation failed");
-                          }));
+      Accounts.createUser(
+        {username: this.username, password: this.password,
+         // should fail the new user validators
+         profile: {invalid: true}},
+        expect(function (error) {
+          test.equal(error.error, 403);
+          test.equal(error.reason, "User validation failed");
+        }));
     },
     logoutStep,
     function(test, expect) {
-      Accounts.createUser({username: username3, password: password3,
-                           // should fail the new user validator with a special
-                           // exception
-                           profile: {invalidAndThrowException: true}},
-                        expect(function (error) {
-                          test.equal(
-                            error.reason,
-                            "An exception thrown within Accounts.validateNewUser");
-                        }));
+      Accounts.createUser(
+        {username: this.username, password: this.password,
+         // should fail the new user validator with a special
+         // exception
+         profile: {invalidAndThrowException: true}},
+        expect(function (error) {
+          test.equal(
+            error.reason,
+            "An exception thrown within Accounts.validateNewUser");
+        }));
     },
     // test Accounts.onCreateUser
     function(test, expect) {
       Accounts.createUser(
-        {username: username3, password: password3,
+        {username: this.username, password: this.password,
          testOnCreateUserHook: true},
-        loggedInAs(username3, test, expect));
+        loggedInAs(this.username, test, expect));
     },
     function(test, expect) {
       test.equal(Meteor.user().profile.touchedByOnCreateUser, true);
     },
+    logoutStep
+  ]);
+
+
+  testAsyncMulti("passwords - Meteor.user()", [
+    function (test, expect) {
+      // setup
+      this.username = Random.id();
+      this.password = 'password';
+
+      Accounts.createUser(
+        {username: this.username, password: this.password,
+         testOnCreateUserHook: true},
+        loggedInAs(this.username, test, expect));
+    },
     // test Meteor.user(). This test properly belongs in
     // accounts-base/accounts_tests.js, but this is where the tests that
     // actually log in are.
     function(test, expect) {
+      var self = this;
       var clientUser = Meteor.user();
       Meteor.call('testMeteorUser', expect(function (err, result) {
         test.equal(result._id, clientUser._id);
+        test.equal(result.username, clientUser.username);
+        test.equal(result.username, self.username);
         test.equal(result.profile.touchedByOnCreateUser, true);
         test.equal(err, undefined);
       }));
     },
-    // test the default Meteor.users allow rule. This test properly belongs in
-    // accounts-base/accounts_tests.js, but this is where the tests that
-    // actually log in are.
-    function(test, expect) {
-      userId3 = Meteor.userId();
-      test.notEqual(userId3, null);
-      // Can't update fields other than profile.
-      Meteor.users.update(
-        userId3, {$set: {disallowed: true, 'profile.updated': 42}},
-        expect(function (err) {
-          test.isTrue(err);
-          test.equal(err.error, 403);
-          test.isFalse(_.has(Meteor.user(), 'disallowed'));
-          test.isFalse(_.has(Meteor.user().profile, 'updated'));
-        }));
-    },
-    function(test, expect) {
-      // Can't update another user.
-      Meteor.users.update(
-        userId1, {$set: {'profile.updated': 42}},
-        expect(function (err) {
-          test.isTrue(err);
-          test.equal(err.error, 403);
-        }));
-    },
-    function(test, expect) {
-      // Can't update using a non-ID selector. (This one is thrown client-side.)
-      test.throws(function () {
-        Meteor.users.update(
-          {username: username3}, {$set: {'profile.updated': 42}});
-      });
-      test.isFalse(_.has(Meteor.user().profile, 'updated'));
-    },
-    function(test, expect) {
-      // Can update own profile using ID.
-      Meteor.users.update(
-        userId3, {$set: {'profile.updated': 42}},
-        expect(function (err) {
-          test.isFalse(err);
-          test.equal(42, Meteor.user().profile.updated);
-        }));
-    },
     function(test, expect) {
       // Test that even with no published fields, we still have a document.
       Meteor.call('clearUsernameAndProfile', expect(function() {
@@ -256,22 +256,101 @@ if (Meteor.isClient) (function () {
         test.equal(err, undefined);
         test.equal(result, null);
       }));
+    }
+  ]);
+
+  testAsyncMulti("passwords - allow rules", [
+    // create a second user to have an id for in a later test
+    function (test, expect) {
+      this.otherUsername = Random.id();
+      Accounts.createUser(
+        {username: this.otherUsername, password: 'dontcare',
+         testOnCreateUserHook: true},
+        loggedInAs(this.otherUsername, test, expect));
     },
-    logoutStep,
+    function (test, expect) {
+      this.otherUserId = Meteor.userId();
+    },
+    function (test, expect) {
+      // real setup
+      this.username = Random.id();
+      this.password = 'password';
+
+      Accounts.createUser(
+        {username: this.username, password: this.password,
+         testOnCreateUserHook: true},
+        loggedInAs(this.username, test, expect));
+    },
+    // test the default Meteor.users allow rule. This test properly belongs in
+    // accounts-base/accounts_tests.js, but this is where the tests that
+    // actually log in are.
     function(test, expect) {
+      this.userId = Meteor.userId();
+      test.notEqual(this.userId, null);
+      test.notEqual(this.userId, this.otherUserId);
+      // Can't update fields other than profile.
+      Meteor.users.update(
+        this.userId, {$set: {disallowed: true, 'profile.updated': 42}},
+        expect(function (err) {
+          test.isTrue(err);
+          test.equal(err.error, 403);
+          test.isFalse(_.has(Meteor.user(), 'disallowed'));
+          test.isFalse(_.has(Meteor.user().profile, 'updated'));
+        }));
+    },
+    function(test, expect) {
+      // Can't update another user.
+      Meteor.users.update(
+        this.otherUserId, {$set: {'profile.updated': 42}},
+        expect(function (err) {
+          test.isTrue(err);
+          test.equal(err.error, 403);
+        }));
+    },
+    function(test, expect) {
+      // Can't update using a non-ID selector. (This one is thrown client-side.)
+      test.throws(function () {
+        Meteor.users.update(
+          {username: this.username}, {$set: {'profile.updated': 42}});
+      });
+      test.isFalse(_.has(Meteor.user().profile, 'updated'));
+    },
+    function(test, expect) {
+      // Can update own profile using ID.
+      Meteor.users.update(
+        this.userId, {$set: {'profile.updated': 42}},
+        expect(function (err) {
+          test.isFalse(err);
+          test.equal(42, Meteor.user().profile.updated);
+        }));
+    },
+    logoutStep
+  ]);
+
+
+  testAsyncMulti("passwords - tokens", [
+    function (test, expect) {
+      // setup
+      this.username = Random.id();
+      this.password = 'password';
+
+      Accounts.createUser(
+        {username: this.username, password: this.password},
+        loggedInAs(this.username, test, expect));
+    },
+
+    function(test, expect) {
+      // test logging out invalidates our token
       var expectLoginError = expect(function (err) {
         test.isTrue(err);
       });
-      Meteor.loginWithPassword(username, password2, function (error) {
-        test.equal(error, undefined);
-        test.equal(Meteor.user().username, username);
-        var token = Accounts._storedLoginToken();
-        Meteor.logout(function () {
-          Meteor.loginWithToken(token, expectLoginError);
-        });
+      var token = Accounts._storedLoginToken();
+      test.isTrue(token);
+      Meteor.logout(function () {
+        Meteor.loginWithToken(token, expectLoginError);
       });
     },
-    logoutStep,
+
     function(test, expect) {
       // Test that login tokens get expired. We should get logged out when a
       // token expires, and not be able to log in again with the same token.
@@ -281,14 +360,15 @@ if (Meteor.isClient) (function () {
       var expectLoginError = expect(function (err) {
         test.isTrue(err);
       });
+      // XXX XXX this relies on possibly broken behavior on loginWithPassword!
       var firstLoginCallback = true;
 
-      Meteor.loginWithPassword(username, password2, function (error) {
+      Meteor.loginWithPassword(this.username, this.password, function (error) {
         var token = Accounts._storedLoginToken();
         if (firstLoginCallback) {
           test.isTrue(token);
           expectNoError(error);
-          Meteor.call("expireTokens", new Date());
+          Meteor.call("expireTokens");
         } else {
           test.isFalse(token);
           expectLoginError(error);
@@ -304,6 +384,8 @@ if (Meteor.isClient) (function () {
         if (__meteor_runtime_config__.DDP_DEFAULT_CONNECTION_URL)
           ddpUrl = __meteor_runtime_config__.DDP_DEFAULT_CONNECTION_URL;
       }
+      // XXX can we get the url from the existing connection somehow
+      // instead?
 
       // Test that Meteor.logoutOtherClients logs out a second authenticated
       // connection while leaving Meteor.connection logged in.
@@ -330,7 +412,7 @@ if (Meteor.isClient) (function () {
         Meteor.call("logoutOtherClients", expectLoggedIn);
       });
 
-      Meteor.loginWithPassword(username, password2, function (err) {
+      Meteor.loginWithPassword(this.username, this.password, function (err) {
         if (firstLoginCallback) {
           expectNoError(err);
           token = Accounts._storedLoginToken();
@@ -343,15 +425,16 @@ if (Meteor.isClient) (function () {
     },
     logoutStep,
     function (test, expect) {
+      var self = this;
       // Test that deleting a user logs out that user's connections.
       var expectLoginError = expect(function (err) {
         test.isTrue(err);
       });
       var firstLoginCallback = true;
-      Meteor.loginWithPassword(username, password2, function (err) {
+      Meteor.loginWithPassword(this.username, this.password, function (err) {
         if (firstLoginCallback) {
           test.isFalse(err);
-          Meteor.call("removeUser", username);
+          Meteor.call("removeUser", self.username);
           // When the user is deleted, our connection will be closed, triggering
           // a reconnect, which will trigger a login attempt.
         } else {
@@ -359,23 +442,14 @@ if (Meteor.isClient) (function () {
         }
         firstLoginCallback = false;
       });
-    }
+    },
+    logoutStep
   ]);
-
 }) ();
 
 
 if (Meteor.isServer) (function () {
 
-  Meteor.methods({
-    expireTokens: function (oldestValidDate) {
-      Accounts._expireTokens(oldestValidDate);
-    },
-    removeUser: function (username) {
-      Meteor.users.remove({ "username": username });
-    }
-  });
-
   Tinytest.add(
     'passwords - setup more than one onCreateUserHook',
     function (test) {
diff --git a/packages/accounts-password/password_tests_setup.js b/packages/accounts-password/password_tests_setup.js
index e1142de742..848b148e26 100644
--- a/packages/accounts-password/password_tests_setup.js
+++ b/packages/accounts-password/password_tests_setup.js
@@ -32,8 +32,6 @@ Accounts.config({
 });
 
 
-// This test properly belongs in accounts-base/accounts_tests.js, but
-// this is where the tests that actually log in are.
 Meteor.methods({
   testMeteorUser: function () { return Meteor.user(); },
   clearUsernameAndProfile: function () {
@@ -41,5 +39,12 @@ Meteor.methods({
       throw new Error("Not logged in!");
     Meteor.users.update(this.userId,
                         {$unset: {profile: 1, username: 1}});
+  },
+
+  expireTokens: function () {
+    Accounts._expireTokens(new Date());
+  },
+  removeUser: function (username) {
+    Meteor.users.remove({ "username": username });
   }
 });

From bc8406d8a0b681eee2c2ef7755528d983dbb988b Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Mon, 7 Oct 2013 15:06:45 -0700
Subject: [PATCH 256/335] add XXX note

---
 packages/accounts-base/accounts_client.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/accounts-base/accounts_client.js b/packages/accounts-base/accounts_client.js
index 5a7f293468..94622d313a 100644
--- a/packages/accounts-base/accounts_client.js
+++ b/packages/accounts-base/accounts_client.js
@@ -116,6 +116,7 @@ Accounts.callLoginMethod = function (options) {
               if (error) {
                 makeClientLoggedOut();
               }
+              // XXX XXX really? remove? _.once?
               options.userCallback(error);
             }});
         }

From f9504f215e5722b78461cf9a62e6f0564afb5fdb Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Mon, 7 Oct 2013 15:47:09 -0700
Subject: [PATCH 257/335] Add test parameter so we only expire tokens for our
 user, not everyone.

---
 packages/accounts-base/accounts_server.js        | 16 ++++++++++------
 .../accounts-password/password_tests_setup.js    |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index 2f06183498..57efc24ecd 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -197,22 +197,26 @@ var removeLoginToken = function (userId, loginToken) {
 var expireTokenInterval;
 
 // Deletes expired tokens from the database and closes all open connections
-// associated with these tokens. Exported for tests. oldestValidDate is used
-// only by tests to simulate expiring tokens without waiting for them to
-// actually expire.
-var expireTokens = Accounts._expireTokens = function (oldestValidDate) {
+// associated with these tokens.
+//
+// Exported for tests. Also, the arguments are only used by
+// tests. oldestValidDate is simulate expiring tokens without waiting
+// for them to actually expire. userId is used by tests to only expire
+// tokens for the test user.
+var expireTokens = Accounts._expireTokens = function (oldestValidDate, userId) {
   var tokenLifetimeMs = getTokenLifetimeMs();
   oldestValidDate = oldestValidDate ||
     (new Date(new Date() - tokenLifetimeMs));
+  var userFilter = userId ? {_id: userId} : {};
 
   // Backwards compatible with older versions of meteor that stored login token
   // timestamps as numbers.
-  Meteor.users.update({
+  Meteor.users.update(_.extend(userFilter, {
     $or: [
       { "services.resume.loginTokens.when": { $lt: oldestValidDate } },
       { "services.resume.loginTokens.when": { $lt: +oldestValidDate } }
     ]
-  }, {
+  }), {
     $pull: {
       "services.resume.loginTokens": {
         $or: [
diff --git a/packages/accounts-password/password_tests_setup.js b/packages/accounts-password/password_tests_setup.js
index 848b148e26..666819f226 100644
--- a/packages/accounts-password/password_tests_setup.js
+++ b/packages/accounts-password/password_tests_setup.js
@@ -42,7 +42,7 @@ Meteor.methods({
   },
 
   expireTokens: function () {
-    Accounts._expireTokens(new Date());
+    Accounts._expireTokens(new Date(), this.userId);
   },
   removeUser: function (username) {
     Meteor.users.remove({ "username": username });

From 9bad3afcfb79c2d54737de9a07a8f7f056485185 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Mon, 7 Oct 2013 18:51:01 -0700
Subject: [PATCH 258/335] Fix reset email test. NOTE: still needs work on error
 handling.

---
 packages/accounts-password/password_server.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/accounts-password/password_server.js b/packages/accounts-password/password_server.js
index b702a36708..18c6cbc7c0 100644
--- a/packages/accounts-password/password_server.js
+++ b/packages/accounts-password/password_server.js
@@ -316,6 +316,14 @@ Meteor.methods({resetPassword: function (token, newVerifier) {
 
   var stampedLoginToken = Accounts._generateStampedLoginToken();
 
+  // NOTE: this must come _before_ we update the user record. Otherwise,
+  // we may be logged out if we are using a token that just got removed
+  // from the record.
+  //
+  // XXX If for some reason the update fails and throws, the token we're
+  // marked as using will not match the token the client has.
+  this._setLoginToken(stampedLoginToken.token);
+
   // Update the user record by:
   // - Changing the password verifier to the new one
   // - Replacing all valid login tokens with new ones (changing
@@ -330,7 +338,7 @@ Meteor.methods({resetPassword: function (token, newVerifier) {
   });
 
   this.setUserId(user._id);
-  this._setLoginToken(stampedLoginToken.token);
+
   return {
     token: stampedLoginToken.token,
     tokenExpires: Accounts._tokenExpiration(stampedLoginToken.when),

From 468eb6a1bfaae7644fe4f0a5939d98b69cf1494b Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Mon, 7 Oct 2013 18:51:34 -0700
Subject: [PATCH 259/335] Fix typo in index name. We were not indexing password
 reset tokens correctly.

---
 packages/accounts-password/password_server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/accounts-password/password_server.js b/packages/accounts-password/password_server.js
index 18c6cbc7c0..31720c4e4c 100644
--- a/packages/accounts-password/password_server.js
+++ b/packages/accounts-password/password_server.js
@@ -544,5 +544,5 @@ Accounts.createUser = function (options, callback) {
 ///
 Meteor.users._ensureIndex('emails.validationTokens.token',
                           {unique: 1, sparse: 1});
-Meteor.users._ensureIndex('emails.password.reset.token',
+Meteor.users._ensureIndex('services.password.reset.token',
                           {unique: 1, sparse: 1});

From b09f206753c6450bdf7178b788d218fc5b3b4feb Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Mon, 7 Oct 2013 21:38:38 -0700
Subject: [PATCH 260/335] Specify userId in one other expireTokens call. Add a
 check to make sure we don't do it again.

---
 packages/accounts-base/accounts_server.js | 7 +++++++
 packages/accounts-base/accounts_tests.js  | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index 57efc24ecd..1c6ba48ce2 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -205,10 +205,17 @@ var expireTokenInterval;
 // tokens for the test user.
 var expireTokens = Accounts._expireTokens = function (oldestValidDate, userId) {
   var tokenLifetimeMs = getTokenLifetimeMs();
+
+  // when calling from a test with extra arguments, you must specify both!
+  if ((oldestValidDate && !userId) || (!oldestValidDate && userId)) {
+    throw new Error("Bad test. Must specify both oldestValidDate and userId.");
+  }
+
   oldestValidDate = oldestValidDate ||
     (new Date(new Date() - tokenLifetimeMs));
   var userFilter = userId ? {_id: userId} : {};
 
+
   // Backwards compatible with older versions of meteor that stored login token
   // timestamps as numbers.
   Meteor.users.update(_.extend(userFilter, {
diff --git a/packages/accounts-base/accounts_tests.js b/packages/accounts-base/accounts_tests.js
index 9e33faa7bb..5326704e43 100644
--- a/packages/accounts-base/accounts_tests.js
+++ b/packages/accounts-base/accounts_tests.js
@@ -206,5 +206,5 @@ Tinytest.addAsync('accounts - expire numeric token', function (test, onComplete)
       }
     }
   });
-  Accounts._expireTokens(new Date());
+  Accounts._expireTokens(new Date(), result.id);
 });

From e5dd8f4f8ed2b46268776ff0aae77c3569f785f2 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Mon, 7 Oct 2013 23:33:04 -0700
Subject: [PATCH 261/335] Better error handling if resetPassword fails. Also,
 handle setLoginToken(null) better.

---
 packages/accounts-password/password_server.js | 46 +++++++++++--------
 packages/livedata/livedata_server.js          |  8 ++--
 2 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/packages/accounts-password/password_server.js b/packages/accounts-password/password_server.js
index 31720c4e4c..f85676c813 100644
--- a/packages/accounts-password/password_server.js
+++ b/packages/accounts-password/password_server.js
@@ -316,27 +316,33 @@ Meteor.methods({resetPassword: function (token, newVerifier) {
 
   var stampedLoginToken = Accounts._generateStampedLoginToken();
 
-  // NOTE: this must come _before_ we update the user record. Otherwise,
-  // we may be logged out if we are using a token that just got removed
-  // from the record.
-  //
-  // XXX If for some reason the update fails and throws, the token we're
-  // marked as using will not match the token the client has.
+  // NOTE: We're about to invalidate tokens on the user, who we might be
+  // logged in as. Make sure to avoid logging ourselves out if this
+  // happens. But also make sure not to leave the connection in a state
+  // of having a bad token set if things fail.
+  var oldToken = this._getLoginToken();
+  this._setLoginToken(null);
+
+  try {
+    // Update the user record by:
+    // - Changing the password verifier to the new one
+    // - Replacing all valid login tokens with new ones (changing
+    //   password should invalidate existing sessions).
+    // - Forgetting about the reset token that was just used
+    // - Verifying their email, since they got the password reset via email.
+    Meteor.users.update({_id: user._id, 'emails.address': email}, {
+      $set: {'services.password.srp': newVerifier,
+             'services.resume.loginTokens': [stampedLoginToken],
+             'emails.$.verified': true},
+      $unset: {'services.password.reset': 1}
+    });
+  } catch (err) {
+    // update failed somehow. reset to old token.
+    this._setLoginToken(oldToken);
+    throw err;
+  }
+
   this._setLoginToken(stampedLoginToken.token);
-
-  // Update the user record by:
-  // - Changing the password verifier to the new one
-  // - Replacing all valid login tokens with new ones (changing
-  //   password should invalidate existing sessions).
-  // - Forgetting about the reset token that was just used
-  // - Verifying their email, since they got the password reset via email.
-  Meteor.users.update({_id: user._id, 'emails.address': email}, {
-    $set: {'services.password.srp': newVerifier,
-           'services.resume.loginTokens': [stampedLoginToken],
-           'emails.$.verified': true},
-    $unset: {'services.password.reset': 1}
-  });
-
   this.setUserId(user._id);
 
   return {
diff --git a/packages/livedata/livedata_server.js b/packages/livedata/livedata_server.js
index 6f436fc852..cdfed99995 100644
--- a/packages/livedata/livedata_server.js
+++ b/packages/livedata/livedata_server.js
@@ -1269,9 +1269,11 @@ _.extend(Server.prototype, {
       if (_.isEmpty(self.sessionsByLoginToken[oldToken]))
         delete self.sessionsByLoginToken[oldToken];
     }
-    if (! _.has(self.sessionsByLoginToken, newToken))
-      self.sessionsByLoginToken[newToken] = [];
-    self.sessionsByLoginToken[newToken].push(session.id);
+    if (newToken) {
+      if (! _.has(self.sessionsByLoginToken, newToken))
+        self.sessionsByLoginToken[newToken] = [];
+      self.sessionsByLoginToken[newToken].push(session.id);
+    }
   },
 
   // Close all open sessions associated with any of the tokens in

From 28082f33e12956996adbb1991add8750582b689b Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Tue, 8 Oct 2013 00:10:33 -0700
Subject: [PATCH 262/335] Fix issue where login callbacks could be called
 multiple times on reconnect.

---
 History.md                                   |  3 +
 packages/accounts-base/accounts_client.js    | 11 +--
 packages/accounts-password/password_tests.js | 90 +++++++++++---------
 3 files changed, 57 insertions(+), 47 deletions(-)

diff --git a/History.md b/History.md
index e0971b676c..ded6cc7400 100644
--- a/History.md
+++ b/History.md
@@ -60,6 +60,9 @@
 
 * Warn if `Accounts.config` is only called on the client.
 
+* Fix bug where callbacks to login functions could be called multiple
+  times when the client reconnects.
+
 #### Tools
 
 * The pre-0.6.5 `Package.register_extension` API has been removed. Use
diff --git a/packages/accounts-base/accounts_client.js b/packages/accounts-base/accounts_client.js
index 94622d313a..f52d7d0e4a 100644
--- a/packages/accounts-base/accounts_client.js
+++ b/packages/accounts-base/accounts_client.js
@@ -70,6 +70,8 @@ Accounts.callLoginMethod = function (options) {
     if (!options[f])
       options[f] = function () {};
   });
+  // make sure we only call the user's callback once.
+  var onceUserCallback = _.once(options.userCallback);
 
   var reconnected = false;
 
@@ -116,8 +118,7 @@ Accounts.callLoginMethod = function (options) {
               if (error) {
                 makeClientLoggedOut();
               }
-              // XXX XXX really? remove? _.once?
-              options.userCallback(error);
+              onceUserCallback(error);
             }});
         }
       };
@@ -143,19 +144,19 @@ Accounts.callLoginMethod = function (options) {
     if (error || !result) {
       error = error || new Error(
         "No result from call to " + options.methodName);
-      options.userCallback(error);
+      onceUserCallback(error);
       return;
     }
     try {
       options.validateResult(result);
     } catch (e) {
-      options.userCallback(e);
+      onceUserCallback(e);
       return;
     }
 
     // Make the client logged in. (The user data should already be loaded!)
     makeClientLoggedIn(result.id, result.token, result.tokenExpires);
-    options.userCallback();
+    onceUserCallback();
   };
 
   if (!options._suppressLoggingIn)
diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index ed8bc27c27..a4b7569a63 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -19,6 +19,25 @@ if (Meteor.isClient) (function () {
       test.equal(Meteor.user().username, someUsername);
     });
   };
+  var waitForLoggedOutStep = function (test, expect) {
+    var done = expect();
+    var count = 100;
+    var interval = Meteor.setInterval(function () {
+      if (Meteor.userId() === null) {
+        Meteor.clearInterval(interval);
+        test.ok({message: "user is logged out"});
+        done();
+      }
+
+      count -= 1;
+      if (count === 0) {
+        Meteor.clearInterval(interval);
+        test.fail({message: "user did not log out in time"});
+        done();
+      }
+    }, 100);
+  };
+
 
 
   testAsyncMulti("passwords - basic login with password", [
@@ -357,27 +376,22 @@ if (Meteor.isClient) (function () {
       var expectNoError = expect(function (err) {
         test.isFalse(err);
       });
-      var expectLoginError = expect(function (err) {
-        test.isTrue(err);
-      });
-      // XXX XXX this relies on possibly broken behavior on loginWithPassword!
-      var firstLoginCallback = true;
 
       Meteor.loginWithPassword(this.username, this.password, function (error) {
         var token = Accounts._storedLoginToken();
-        if (firstLoginCallback) {
-          test.isTrue(token);
-          expectNoError(error);
-          Meteor.call("expireTokens");
-        } else {
-          test.isFalse(token);
-          expectLoginError(error);
-        }
-        firstLoginCallback = false;
+        test.isTrue(token);
+        expectNoError(error);
+        Meteor.call("expireTokens");
       });
     },
-    logoutStep,
+    waitForLoggedOutStep,
     function (test, expect) {
+      var token = Accounts._storedLoginToken();
+      test.isFalse(token);
+    },
+    function (test, expect) {
+      var self = this;
+
       // copied from livedata/client_convenience.js
       var ddpUrl = '/';
       if (typeof __meteor_runtime_config__ !== "undefined") {
@@ -390,9 +404,9 @@ if (Meteor.isClient) (function () {
       // Test that Meteor.logoutOtherClients logs out a second authenticated
       // connection while leaving Meteor.connection logged in.
       var token;
-      var secondConn = DDP.connect(ddpUrl);
-      var firstLoginCallback = true;
       var userId;
+      self.secondConn = DDP.connect(ddpUrl);
+
 
       var expectNoError = expect(function (err) {
         test.isFalse(err);
@@ -406,44 +420,36 @@ if (Meteor.isClient) (function () {
       var expectSecondConnLoggedIn = expect(function (err, result) {
         test.equal(result.token, token);
         test.isFalse(err);
-        secondConn.onReconnect = function () {
-          secondConn.call("login", { resume: token }, expectLoginError);
+        self.secondConn.onReconnect = function () {
+          self.secondConn.call("login", { resume: token }, expectLoginError);
         };
         Meteor.call("logoutOtherClients", expectLoggedIn);
       });
 
       Meteor.loginWithPassword(this.username, this.password, function (err) {
-        if (firstLoginCallback) {
-          expectNoError(err);
-          token = Accounts._storedLoginToken();
-          test.isTrue(token);
-          userId = Meteor.userId();
-          secondConn.call("login", { resume: token }, expectSecondConnLoggedIn);
-        }
-        firstLoginCallback = false;
+        expectNoError(err);
+        token = Accounts._storedLoginToken();
+        test.isTrue(token);
+        userId = Meteor.userId();
+        self.secondConn.call("login", { resume: token },
+                             expectSecondConnLoggedIn);
       });
     },
-    logoutStep,
+    waitForLoggedOutStep,
+    function (test, expect) {
+      var token = Accounts._storedLoginToken();
+      test.isFalse(token);
+      this.secondConn.close();
+    },
     function (test, expect) {
       var self = this;
       // Test that deleting a user logs out that user's connections.
-      var expectLoginError = expect(function (err) {
-        test.isTrue(err);
-      });
-      var firstLoginCallback = true;
       Meteor.loginWithPassword(this.username, this.password, function (err) {
-        if (firstLoginCallback) {
-          test.isFalse(err);
-          Meteor.call("removeUser", self.username);
-          // When the user is deleted, our connection will be closed, triggering
-          // a reconnect, which will trigger a login attempt.
-        } else {
-          expectLoginError(err);
-        }
-        firstLoginCallback = false;
+        test.isFalse(err);
+        Meteor.call("removeUser", self.username);
       });
     },
-    logoutStep
+    waitForLoggedOutStep
   ]);
 }) ();
 

From 9f2188b5da4e2b55857bd1548833e0f36077d357 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Tue, 8 Oct 2013 00:42:52 -0700
Subject: [PATCH 263/335] Not sure why, but opera is better now (including old
 versions). I guess one of the minimongo changes caused the ordering to be
 different.

---
 packages/minimongo/minimongo_tests.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/minimongo/minimongo_tests.js b/packages/minimongo/minimongo_tests.js
index 34df9dba0b..d446156113 100644
--- a/packages/minimongo/minimongo_tests.js
+++ b/packages/minimongo/minimongo_tests.js
@@ -1678,11 +1678,8 @@ Tinytest.add("minimongo - modify", function (test) {
   modify({a: {b: 12}}, {$rename: {'a.b': 'x'}}, {a: {}, x: 12}); // tested
   modify({a: {b: 12}}, {$rename: {'a.b': 'q.r'}}, {a: {}, q: {r: 12}});
   modify({a: {b: 12}}, {$rename: {'a.b': 'q.2.r'}}, {a: {}, q: {2: {r: 12}}});
-  // Opera weirdly reorders the output. But what it does tends to be close
-  // enough.
   modify({a: {b: 12}, q: {}}, {$rename: {'a.b': 'q.2.r'}},
-         (typeof opera === 'undefined' ? {a: {}, q: {2: {r: 12}}}
-                                       : {q: {2: {r: 12}}, a: {}}));
+         {a: {}, q: {2: {r: 12}}});
   exception({a: {b: 12}, q: []}, {$rename: {'a.b': 'q.2'}}); // tested
   exception({a: {b: 12}, q: []}, {$rename: {'a.b': 'q.2.r'}}); // tested
   test.expect_fail();

From c4b1e6b32453f30a5dc55df47dbc15b4e9434f4c Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Tue, 8 Oct 2013 16:31:36 -0700
Subject: [PATCH 264/335] Hopefully fix ECONNRESET errors again.

---
 meteor                         | 2 +-
 scripts/generate-dev-bundle.sh | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/meteor b/meteor
index 8d5075e2ad..8efdb709e8 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-BUNDLE_VERSION=0.3.18
+BUNDLE_VERSION=0.3.19
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.
diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh
index 766063b6ae..7406330f47 100755
--- a/scripts/generate-dev-bundle.sh
+++ b/scripts/generate-dev-bundle.sh
@@ -112,8 +112,9 @@ npm install source-map@0.1.30
 npm install source-map-support@0.2.3
 
 # Using the unreleased "caronte" branch rewrite of http-proxy (which will become
-# 1.0.0).
-npm install https://github.com/nodejitsu/node-http-proxy/tarball/a51b0622780f48160001f9e74340f7d720cbfce6
+# 1.0.0), plus this PR:
+#   https://github.com/nodejitsu/node-http-proxy/pull/495
+npm install https://github.com/meteor/node-http-proxy/tarball/f17186f781c6f00b359d25df424ad74922cd1977
 
 # Using the unreleased 1.1 branch. We can probably switch to a built NPM version
 # when it gets released.

From 0be428b7311eed1687d16d5304c9de249e33efe4 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Tue, 8 Oct 2013 17:14:32 -0700
Subject: [PATCH 265/335] Build mongo with -j4 on Mac too.

---
 scripts/generate-dev-bundle.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh
index 7406330f47..85b33fdff3 100755
--- a/scripts/generate-dev-bundle.sh
+++ b/scripts/generate-dev-bundle.sh
@@ -170,16 +170,15 @@ git checkout ssl-r$MONGO_VERSION
 
 # Compile
 
-MONGO_FLAGS="--ssl --release "
+MONGO_FLAGS="--ssl --release -j4 "
 MONGO_FLAGS+="--cpppath $DIR/build/openssl-out/include --libpath $DIR/build/openssl-out/lib "
 
 if [ "$MONGO_OS" == "osx" ]; then
     # NOTE: '--64' option breaks the compilation, even it is on by default on x64 mac: https://jira.mongodb.org/browse/SERVER-5575
-    MONGO_FLAGS+="-j4 "
     MONGO_FLAGS+="--openssl $DIR/build/openssl-out/lib "
     /usr/local/bin/scons $MONGO_FLAGS mongo mongod
 elif [ "$MONGO_OS" == "linux" ]; then
-    MONGO_FLAGS+="-j2 --no-glibc-check --prefix=./ "
+    MONGO_FLAGS+="--no-glibc-check --prefix=./ "
     if [ "$ARCH" == "x86_64" ]; then
       MONGO_FLAGS+="--64"
     fi

From 2f42f21dafac1b7df7d8438af2cfdc61efdef003 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Tue, 8 Oct 2013 16:31:36 -0700
Subject: [PATCH 266/335] Hopefully fix ECONNRESET errors again.

---
 meteor                         | 2 +-
 scripts/generate-dev-bundle.sh | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/meteor b/meteor
index 8d5075e2ad..8efdb709e8 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-BUNDLE_VERSION=0.3.18
+BUNDLE_VERSION=0.3.19
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.
diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh
index 766063b6ae..7406330f47 100755
--- a/scripts/generate-dev-bundle.sh
+++ b/scripts/generate-dev-bundle.sh
@@ -112,8 +112,9 @@ npm install source-map@0.1.30
 npm install source-map-support@0.2.3
 
 # Using the unreleased "caronte" branch rewrite of http-proxy (which will become
-# 1.0.0).
-npm install https://github.com/nodejitsu/node-http-proxy/tarball/a51b0622780f48160001f9e74340f7d720cbfce6
+# 1.0.0), plus this PR:
+#   https://github.com/nodejitsu/node-http-proxy/pull/495
+npm install https://github.com/meteor/node-http-proxy/tarball/f17186f781c6f00b359d25df424ad74922cd1977
 
 # Using the unreleased 1.1 branch. We can probably switch to a built NPM version
 # when it gets released.

From 93c23470aabc9cc6b467bd06e75a32da401cd030 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Tue, 8 Oct 2013 19:58:48 -0700
Subject: [PATCH 267/335] make a bunch of packages internal.

please remember to set this when making new packages.
---
 packages/ctl-helper/package.js       | 3 ++-
 packages/ctl/package.js              | 3 ++-
 packages/js-analyze-tests/package.js | 3 ++-
 packages/star-translate/package.js   | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/ctl-helper/package.js b/packages/ctl-helper/package.js
index f60625cea7..d72a7f5180 100644
--- a/packages/ctl-helper/package.js
+++ b/packages/ctl-helper/package.js
@@ -1,5 +1,6 @@
 Package.describe({
-  summary: "Helpers for control programs"
+  summary: "Helpers for control programs",
+  internal: true
 });
 
 Npm.depends({optimist: '0.6.0'});
diff --git a/packages/ctl/package.js b/packages/ctl/package.js
index a8966c19cc..200c4a1408 100644
--- a/packages/ctl/package.js
+++ b/packages/ctl/package.js
@@ -1,5 +1,6 @@
 Package.describe({
-  summary: "Default control program for an application"
+  summary: "Default control program for an application",
+  internal: true
 });
 
 Package.on_use(function (api) {
diff --git a/packages/js-analyze-tests/package.js b/packages/js-analyze-tests/package.js
index a56fdb21d6..01b5b1952b 100644
--- a/packages/js-analyze-tests/package.js
+++ b/packages/js-analyze-tests/package.js
@@ -1,5 +1,6 @@
 Package.describe({
-  summary: "Tests for JavaScript code analysis for Meteor"
+  summary: "Tests for JavaScript code analysis for Meteor",
+  internal: true
 });
 
 // The tests are in a separate package so that it is possible to compile
diff --git a/packages/star-translate/package.js b/packages/star-translate/package.js
index 35f71360dc..d13db65e60 100644
--- a/packages/star-translate/package.js
+++ b/packages/star-translate/package.js
@@ -1,5 +1,6 @@
 Package.describe({
-  summary: "A package for translating old bundles into stars"
+  summary: "A package for translating old bundles into stars",
+  internal: true
 });
 
 Package.on_use(function (api) {

From 57c87a403d15cfeeb2c326318f1e19b5c7ece11e Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Tue, 8 Oct 2013 20:03:02 -0700
Subject: [PATCH 268/335] OCD

---
 packages/accounts-password/package.js | 2 +-
 packages/accounts-ui/package.js       | 2 +-
 packages/appcache/package.js          | 2 +-
 packages/d3/package.js                | 2 +-
 packages/less/package.js              | 2 +-
 packages/spiderable/package.js        | 2 +-
 packages/stylus/package.js            | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 676ac1c91f..f53f8c2d10 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  summary: "Password support for accounts."
+  summary: "Password support for accounts"
 });
 
 Package.on_use(function(api) {
diff --git a/packages/accounts-ui/package.js b/packages/accounts-ui/package.js
index 97d6ec4e26..14560f5e9e 100644
--- a/packages/accounts-ui/package.js
+++ b/packages/accounts-ui/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  summary: "Simple templates to add login widgets to an app."
+  summary: "Simple templates to add login widgets to an app"
 });
 
 Package.on_use(function (api) {
diff --git a/packages/appcache/package.js b/packages/appcache/package.js
index 27700a35ec..9edc1c5bb8 100644
--- a/packages/appcache/package.js
+++ b/packages/appcache/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  summary: "enable the application cache in the browser"
+  summary: "Enable the application cache in the browser"
 });
 
 Package.on_use(function (api) {
diff --git a/packages/d3/package.js b/packages/d3/package.js
index eac342c7e3..c03f6d656a 100644
--- a/packages/d3/package.js
+++ b/packages/d3/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  summary: "Library for manipulating documents based on data."
+  summary: "Library for manipulating documents based on data"
 });
 
 Package.on_use(function (api) {
diff --git a/packages/less/package.js b/packages/less/package.js
index a6c8d7fe62..afe116d38b 100644
--- a/packages/less/package.js
+++ b/packages/less/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  summary: "The dynamic stylesheet language."
+  summary: "The dynamic stylesheet language"
 });
 
 Package._transitional_registerBuildPlugin({
diff --git a/packages/spiderable/package.js b/packages/spiderable/package.js
index 431cc5c77e..6189ea0289 100644
--- a/packages/spiderable/package.js
+++ b/packages/spiderable/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  summary: "Makes the application crawlable to web spiders."
+  summary: "Makes the application crawlable to web spiders"
 });
 
 Package.on_use(function (api) {
diff --git a/packages/stylus/package.js b/packages/stylus/package.js
index 1638e266a0..442639ce94 100644
--- a/packages/stylus/package.js
+++ b/packages/stylus/package.js
@@ -1,5 +1,5 @@
 Package.describe({
-  summary: 'Expressive, dynamic, robust CSS.'
+  summary: 'Expressive, dynamic, robust CSS'
 });
 
 Package._transitional_registerBuildPlugin({

From 4e922fd709e2f8586ba8a6c811b4d90c4bb4f9d3 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Tue, 8 Oct 2013 21:30:39 -0700
Subject: [PATCH 269/335] remove ie8 hack from tests. for some reason it is no
 longer needed.

---
 packages/http/httpcall_tests.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/http/httpcall_tests.js b/packages/http/httpcall_tests.js
index ed6a14985a..c05ad92482 100644
--- a/packages/http/httpcall_tests.js
+++ b/packages/http/httpcall_tests.js
@@ -249,11 +249,16 @@ testAsyncMulti("httpcall - methods", [
           test.equal(result.statusCode, 200);
           var data = result.data;
           test.equal(data.url, "/foo");
+
           // IE <= 8 turns seems to turn POSTs with no body into
           // GETs, inexplicably.
-          if (Meteor.isClient && $.browser.msie && $.browser.version <= 8
-              && meth === "POST")
-            meth = "GET";
+          //
+          // XXX Except now it doesn't!? Not sure what changed, but
+          // these lines now break the test...
+          // if (Meteor.isClient && $.browser.msie && $.browser.version <= 8
+          //     && meth === "POST")
+          //   meth = "GET";
+
           test.equal(data.method, meth);
         }));
     };

From b44f0a61df930855669f1dfad01b86931b4a8b83 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Tue, 8 Oct 2013 21:12:03 -0700
Subject: [PATCH 270/335] Test for invalidated token after expireTokens.

---
 packages/accounts-password/password_tests.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index a4b7569a63..b72714a153 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -371,6 +371,7 @@ if (Meteor.isClient) (function () {
     },
 
     function(test, expect) {
+      var self = this;
       // Test that login tokens get expired. We should get logged out when a
       // token expires, and not be able to log in again with the same token.
       var expectNoError = expect(function (err) {
@@ -378,8 +379,8 @@ if (Meteor.isClient) (function () {
       });
 
       Meteor.loginWithPassword(this.username, this.password, function (error) {
-        var token = Accounts._storedLoginToken();
-        test.isTrue(token);
+        self.token = Accounts._storedLoginToken();
+        test.isTrue(self.token);
         expectNoError(error);
         Meteor.call("expireTokens");
       });
@@ -389,6 +390,14 @@ if (Meteor.isClient) (function () {
       var token = Accounts._storedLoginToken();
       test.isFalse(token);
     },
+    function (test, expect) {
+      // Test that once expireTokens is finished, we can't login again with our
+      // previous token.
+      Meteor.loginWithToken(this.token, expect(function (err, result) {
+        test.isTrue(err);
+        test.equal(Meteor.userId(), null);
+      }));
+    },
     function (test, expect) {
       var self = this;
 

From abd966909993782d288efd543ddabfc07c985665 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Tue, 8 Oct 2013 21:22:06 -0700
Subject: [PATCH 271/335] Minor password test changes

---
 packages/accounts-base/accounts_client.js    | 3 +++
 packages/accounts-password/password_tests.js | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/packages/accounts-base/accounts_client.js b/packages/accounts-base/accounts_client.js
index f52d7d0e4a..579ec34474 100644
--- a/packages/accounts-base/accounts_client.js
+++ b/packages/accounts-base/accounts_client.js
@@ -118,6 +118,9 @@ Accounts.callLoginMethod = function (options) {
               if (error) {
                 makeClientLoggedOut();
               }
+              // Possibly a weird callback to call, but better than nothing if
+              // there is a reconnect between "login result received" and "data
+              // ready".
               onceUserCallback(error);
             }});
         }
diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index b72714a153..c7bf1f55eb 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -271,6 +271,7 @@ if (Meteor.isClient) (function () {
     function(test, expect) {
       var clientUser = Meteor.user();
       test.equal(clientUser, null);
+      test.equal(Meteor.userId(), null);
       Meteor.call('testMeteorUser', expect(function (err, result) {
         test.equal(err, undefined);
         test.equal(result, null);
@@ -429,6 +430,9 @@ if (Meteor.isClient) (function () {
       var expectSecondConnLoggedIn = expect(function (err, result) {
         test.equal(result.token, token);
         test.isFalse(err);
+        // This test will fail if an unrelated reconnect triggers before the
+        // connection is logged out. In general our tests aren't resilient to
+        // mid-test reconnects.
         self.secondConn.onReconnect = function () {
           self.secondConn.call("login", { resume: token }, expectLoginError);
         };

From cd0b6eb22f50643d94a894a696e3b8eb92d5f8c3 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Tue, 8 Oct 2013 21:28:37 -0700
Subject: [PATCH 272/335] Use pollUntil in waitForLoggedOutStep

---
 packages/accounts-password/password_tests.js | 21 +++-----------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index c7bf1f55eb..0fa8c6f8ac 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -20,26 +20,11 @@ if (Meteor.isClient) (function () {
     });
   };
   var waitForLoggedOutStep = function (test, expect) {
-    var done = expect();
-    var count = 100;
-    var interval = Meteor.setInterval(function () {
-      if (Meteor.userId() === null) {
-        Meteor.clearInterval(interval);
-        test.ok({message: "user is logged out"});
-        done();
-      }
-
-      count -= 1;
-      if (count === 0) {
-        Meteor.clearInterval(interval);
-        test.fail({message: "user did not log out in time"});
-        done();
-      }
-    }, 100);
+    pollUntil(expect, function () {
+      return Meteor.userId() === null;
+    }, 10 * 1000, 100);
   };
 
-
-
   testAsyncMulti("passwords - basic login with password", [
     function (test, expect) {
       // setup

From 35cee2d4ea3d07fb73468fb6719e6ab8023972bf Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Tue, 8 Oct 2013 22:00:12 -0700
Subject: [PATCH 273/335] Test that logoutOtherClients returns a new valid
 token.

---
 packages/accounts-password/password_tests.js | 42 +++++++++++++++-----
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index 0fa8c6f8ac..b8d0417221 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -402,15 +402,13 @@ if (Meteor.isClient) (function () {
       var userId;
       self.secondConn = DDP.connect(ddpUrl);
 
-
-      var expectNoError = expect(function (err) {
-        test.isFalse(err);
-      });
       var expectLoginError = expect(function (err) {
         test.isTrue(err);
       });
-      var expectLoggedIn = expect(function () {
-        test.equal(userId, Meteor.userId());
+      var expectValidToken = expect(function (err, result) {
+        test.isFalse(err);
+        test.isTrue(result);
+        self.tokenFromLogoutOthers = result.token;
       });
       var expectSecondConnLoggedIn = expect(function (err, result) {
         test.equal(result.token, token);
@@ -421,24 +419,48 @@ if (Meteor.isClient) (function () {
         self.secondConn.onReconnect = function () {
           self.secondConn.call("login", { resume: token }, expectLoginError);
         };
-        Meteor.call("logoutOtherClients", expectLoggedIn);
+        Meteor.call("logoutOtherClients", expectValidToken);
       });
 
-      Meteor.loginWithPassword(this.username, this.password, function (err) {
-        expectNoError(err);
+      Meteor.loginWithPassword(this.username, this.password, expect(function (err) {
+        test.isFalse(err);
         token = Accounts._storedLoginToken();
+        self.beforeLogoutOthersToken = token;
         test.isTrue(token);
         userId = Meteor.userId();
         self.secondConn.call("login", { resume: token },
                              expectSecondConnLoggedIn);
-      });
+      }));
     },
+    // Test that logoutOtherClients logged out Meteor.connection and that the
+    // previous token is no longer valid.
     waitForLoggedOutStep,
     function (test, expect) {
+      var self = this;
       var token = Accounts._storedLoginToken();
       test.isFalse(token);
       this.secondConn.close();
+      Meteor.loginWithToken(
+        self.beforeLogoutOthersToken,
+        expect(function (err) {
+          test.isTrue(err);
+          test.isFalse(Meteor.userId());
+        })
+      );
     },
+    // Test that logoutOtherClients returned a new token that we can use to
+    // log in.
+    function (test, expect) {
+      var self = this;
+      Meteor.loginWithToken(
+        self.tokenFromLogoutOthers,
+        expect(function (err) {
+          test.isFalse(err);
+          test.isTrue(Meteor.userId());
+        })
+      );
+    },
+    logoutStep,
     function (test, expect) {
       var self = this;
       // Test that deleting a user logs out that user's connections.

From 1214eec099d4b77556d2263b0031f8faaf5b964b Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Tue, 8 Oct 2013 23:34:43 -0700
Subject: [PATCH 274/335] test and bump version numbers for examples and docs.

---
 docs/.meteor/release                 | 2 +-
 docs/lib/release-override.js         | 2 +-
 examples/leaderboard/.meteor/release | 2 +-
 examples/parties/.meteor/release     | 2 +-
 examples/todos/.meteor/release       | 2 +-
 examples/wordplay/.meteor/release    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/.meteor/release b/docs/.meteor/release
index 3f50c3b805..e0d633138e 100644
--- a/docs/.meteor/release
+++ b/docs/.meteor/release
@@ -1 +1 @@
-galaxy-appconfig-2
+0.6.6-rc4
diff --git a/docs/lib/release-override.js b/docs/lib/release-override.js
index fa9c6b7d3b..8aa654904a 100644
--- a/docs/lib/release-override.js
+++ b/docs/lib/release-override.js
@@ -1,5 +1,5 @@
 // While galaxy apps are on their own special meteor releases, override
 // Meteor.release here.
 if (Meteor.isClient) {
-  Meteor.release = Meteor.release ? "0.6.5.1" : undefined;
+  Meteor.release = Meteor.release ? "0.6.6" : undefined;
 }
diff --git a/examples/leaderboard/.meteor/release b/examples/leaderboard/.meteor/release
index dd8bfff626..e0d633138e 100644
--- a/examples/leaderboard/.meteor/release
+++ b/examples/leaderboard/.meteor/release
@@ -1 +1 @@
-0.6.5.1
+0.6.6-rc4
diff --git a/examples/parties/.meteor/release b/examples/parties/.meteor/release
index dd8bfff626..e0d633138e 100644
--- a/examples/parties/.meteor/release
+++ b/examples/parties/.meteor/release
@@ -1 +1 @@
-0.6.5.1
+0.6.6-rc4
diff --git a/examples/todos/.meteor/release b/examples/todos/.meteor/release
index dd8bfff626..e0d633138e 100644
--- a/examples/todos/.meteor/release
+++ b/examples/todos/.meteor/release
@@ -1 +1 @@
-0.6.5.1
+0.6.6-rc4
diff --git a/examples/wordplay/.meteor/release b/examples/wordplay/.meteor/release
index dd8bfff626..e0d633138e 100644
--- a/examples/wordplay/.meteor/release
+++ b/examples/wordplay/.meteor/release
@@ -1 +1 @@
-0.6.5.1
+0.6.6-rc4

From 31669c7dd53150db0e9fbfb67b6fed526c44cd08 Mon Sep 17 00:00:00 2001
From: Stephen Darnell <stephen@darnell.plus.com>
Date: Wed, 9 Oct 2013 09:38:22 +0100
Subject: [PATCH 275/335] Switch to socket.end()

---
 tools/run.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/run.js b/tools/run.js
index c9d8b7f19b..fff230daa6 100644
--- a/tools/run.js
+++ b/tools/run.js
@@ -188,7 +188,7 @@ var startProxy = function (outerPort, innerPort, callback) {
     res.end('Unexpected error.');
   });
   proxy.ee.on('http-proxy:outgoing:ws:error', function (err, req, socket) {
-    socket.close();
+    socket.end();
   });
 
   server.listen(outerPort, callback);

From 5453ca480e5c2933fbadf3dad795ef984fbd7eb4 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Wed, 9 Oct 2013 09:58:57 -0700
Subject: [PATCH 276/335] Update History and mailmap.

---
 .mailmap   | 1 +
 History.md | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index bfef295657..aa646abbd3 100644
--- a/.mailmap
+++ b/.mailmap
@@ -20,6 +20,7 @@ GITHUB: mquandalle <maxime.quandalle@gmail.com>
 GITHUB: nathan-muir <ndmuir@gmail.com>
 GITHUB: RobertLowe <robert@iblargz.com>
 GITHUB: ryw <ry@rywalker.com>
+GITHUB: sdarnell <stephen@darnell.plus.com>
 GITHUB: timhaines <tmhaines@gmail.com>
 
 METEOR: avital <avital@thewe.net>
diff --git a/History.md b/History.md
index 2297788c72..f27bca6d60 100644
--- a/History.md
+++ b/History.md
@@ -156,7 +156,7 @@
 
 Patches contributed by GitHub users ansman, awwx, codeinthehole, jacott,
 Maxhodges, meawoppl, mitar, mizzao, mquandalle, nathan-muir, RobertLowe, ryw,
-and timhaines.
+sdarnell, and timhaines.
 
 
 ## v0.6.5.1

From 8883056bf77febfef6c287dc57d5f2d9128000ff Mon Sep 17 00:00:00 2001
From: Stephen Darnell <stephen@darnell.plus.com>
Date: Wed, 9 Oct 2013 09:38:22 +0100
Subject: [PATCH 277/335] Switch to socket.end()

---
 tools/run.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/run.js b/tools/run.js
index c9d8b7f19b..fff230daa6 100644
--- a/tools/run.js
+++ b/tools/run.js
@@ -188,7 +188,7 @@ var startProxy = function (outerPort, innerPort, callback) {
     res.end('Unexpected error.');
   });
   proxy.ee.on('http-proxy:outgoing:ws:error', function (err, req, socket) {
-    socket.close();
+    socket.end();
   });
 
   server.listen(outerPort, callback);

From de05d27cf381ccfcc4b96ae120d71f49f81e0907 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Wed, 9 Oct 2013 11:59:18 -0700
Subject: [PATCH 278/335] Make browser-policy-content tell webapp about inline
 script policy.

This avoids the need for webapp to probe for browser-policy without
weak-depending on it.
---
 .../browser-policy-content.js                 | 42 +++++++++++--------
 packages/browser-policy-content/package.js    |  2 +-
 .../browser-policy/browser-policy-test.js     | 14 ++++---
 packages/webapp/webapp_server.js              | 21 ++++++----
 4 files changed, 46 insertions(+), 33 deletions(-)

diff --git a/packages/browser-policy-content/browser-policy-content.js b/packages/browser-policy-content/browser-policy-content.js
index 09d4cb7ee9..b9ef18c27b 100644
--- a/packages/browser-policy-content/browser-policy-content.js
+++ b/packages/browser-policy-content/browser-policy-content.js
@@ -94,6 +94,11 @@ var setDefaultPolicy = function () {
                                   "style-src 'self' 'unsafe-inline';");
 };
 
+var setWebAppInlineScripts = function (value) {
+  if (! BrowserPolicy._runningTest())
+    WebAppInternals.setInlineScriptsAllowed(value);
+};
+
 _.extend(BrowserPolicy.content, {
   // Exported for tests and browser-policy-common.
   _constructCsp: function () {
@@ -123,6 +128,9 @@ _.extend(BrowserPolicy.content, {
   setPolicy: function (csp) {
     cachedCsp = null;
     parseCsp(csp);
+    setWebAppInlineScripts(
+      BrowserPolicy.content._keywordAllowed("script-src", unsafeInline)
+    );
   },
 
   _keywordAllowed: function (directive, keyword) {
@@ -130,29 +138,17 @@ _.extend(BrowserPolicy.content, {
             _.indexOf(cspSrcs[directive], keyword) !== -1);
   },
 
-  // Used by webapp to determine whether we need an extra round trip for
-  // __meteor_runtime_config__.  If we're in a test run, we should always return
-  // true, since CSP headers are never sent on tests -- unless the
-  // _calledFromTests flag is set, in which case a test is testing what
-  // inlineScriptsAllowed() would return if we weren't in a test. Wphew.
-  // XXX maybe this test interface could be cleaned up
-  inlineScriptsAllowed: function (_calledFromTests) {
-    if (BrowserPolicy._runningTest() && ! _calledFromTests)
-      return true;
-
-    return BrowserPolicy.content._keywordAllowed("script-src",
-                                                 unsafeInline);
-  },
-
   // Helpers for creating content security policies
 
   allowInlineScripts: function () {
     prepareForCspDirective("script-src");
     cspSrcs["script-src"].push(unsafeInline);
+    setWebAppInlineScripts(true);
   },
   disallowInlineScripts: function () {
     prepareForCspDirective("script-src");
     removeCspSrc("script-src", unsafeInline);
+    setWebAppInlineScripts(false);
   },
   allowEval: function () {
     prepareForCspDirective("script-src");
@@ -189,6 +185,7 @@ _.extend(BrowserPolicy.content, {
     cspSrcs = {
       "default-src": []
     };
+    setWebAppInlineScripts(false);
   }
 });
 
@@ -210,14 +207,23 @@ _.each(["script", "object", "img", "media",
          var allowDataMethodName = "allow" + methodResource + "DataUrl";
          var allowSelfMethodName = "allow" + methodResource + "SameOrigin";
 
+         var disallow = function () {
+           cachedCsp = null;
+           cspSrcs[directive] = [];
+         };
+
          BrowserPolicy.content[allowMethodName] = function (src) {
            prepareForCspDirective(directive);
            cspSrcs[directive].push(src);
          };
-         BrowserPolicy.content[disallowMethodName] = function () {
-           cachedCsp = null;
-           cspSrcs[directive] = [];
-         };
+         if (resource === "script") {
+           BrowserPolicy.content[disallowMethodName] = function () {
+             disallow();
+             setWebAppInlineScripts(false);
+           };
+         } else {
+           BrowserPolicy.content[disallowMethodName] = disallow;
+         }
          BrowserPolicy.content[allowDataMethodName] = function () {
            prepareForCspDirective(directive);
            cspSrcs[directive].push("data:");
diff --git a/packages/browser-policy-content/package.js b/packages/browser-policy-content/package.js
index 542951fb4c..49d29a7a17 100644
--- a/packages/browser-policy-content/package.js
+++ b/packages/browser-policy-content/package.js
@@ -5,5 +5,5 @@ Package.describe({
 Package.on_use(function (api) {
   api.imply(["browser-policy-common"], "server");
   api.add_files("browser-policy-content.js", "server");
-  api.use(["underscore", "browser-policy-common"], "server");
+  api.use(["underscore", "browser-policy-common", "webapp"], "server");
 });
diff --git a/packages/browser-policy/browser-policy-test.js b/packages/browser-policy/browser-policy-test.js
index 08757a3235..e8b00b20a1 100644
--- a/packages/browser-policy/browser-policy-test.js
+++ b/packages/browser-policy/browser-policy-test.js
@@ -27,7 +27,7 @@ Tinytest.add("browser-policy - csp", function (test) {
   BrowserPolicy.content._reset();
   // Default policy
   test.isTrue(cspsEqual(BrowserPolicy.content._constructCsp(), defaultCsp));
-  test.isTrue(BrowserPolicy.content.inlineScriptsAllowed(true /* tests-only flag */));
+  test.isTrue(BrowserPolicy.content._keywordAllowed("script-src", "'unsafe-inline'"));
 
   // Redundant whitelisting (inline scripts already allowed in default policy)
   BrowserPolicy.content.allowInlineScripts();
@@ -38,7 +38,7 @@ Tinytest.add("browser-policy - csp", function (test) {
   test.isTrue(cspsEqual(BrowserPolicy.content._constructCsp(),
                         "default-src 'self'; script-src 'self'; " +
                         "connect-src * 'self'; img-src data: 'self'; style-src 'self' 'unsafe-inline';"));
-  test.isFalse(BrowserPolicy.content.inlineScriptsAllowed(true));
+  test.isFalse(BrowserPolicy.content._keywordAllowed("script-src", "'unsafe-inline'"));
 
   // Allow eval
   BrowserPolicy.content.allowEval();
@@ -59,26 +59,26 @@ Tinytest.add("browser-policy - csp", function (test) {
   // Disallow everything
   BrowserPolicy.content.disallowAll();
   test.isTrue(cspsEqual(BrowserPolicy.content._constructCsp(), "default-src 'none';"));
-  test.isFalse(BrowserPolicy.content.inlineScriptsAllowed(true));
+  test.isFalse(BrowserPolicy.content._keywordAllowed("script-src", "'unsafe-inline'"));
 
   // Put inline scripts back in
   BrowserPolicy.content.allowInlineScripts();
   test.isTrue(cspsEqual(BrowserPolicy.content._constructCsp(),
                         "default-src 'none'; script-src 'unsafe-inline';"));
-  test.isTrue(BrowserPolicy.content.inlineScriptsAllowed(true));
+  test.isTrue(BrowserPolicy.content._keywordAllowed("script-src", "'unsafe-inline'"));
 
   // Add 'self' to all content types
   BrowserPolicy.content.allowSameOriginForAll();
   test.isTrue(cspsEqual(BrowserPolicy.content._constructCsp(),
                         "default-src 'self'; script-src 'self' 'unsafe-inline';"));
-  test.isTrue(BrowserPolicy.content.inlineScriptsAllowed(true));
+  test.isTrue(BrowserPolicy.content._keywordAllowed("script-src", "'unsafe-inline'"));
 
   // Disallow all content except same-origin scripts
   BrowserPolicy.content.disallowAll();
   BrowserPolicy.content.allowScriptSameOrigin();
   test.isTrue(cspsEqual(BrowserPolicy.content._constructCsp(),
                         "default-src 'none'; script-src 'self';"));
-  test.isFalse(BrowserPolicy.content.inlineScriptsAllowed(true));
+  test.isFalse(BrowserPolicy.content._keywordAllowed("script-src", "'unsafe-inline'"));
 
   // Starting with all content same origin, disallowScript() and then allow
   // inline scripts. Result should be that that only inline scripts can execute,
@@ -89,9 +89,11 @@ Tinytest.add("browser-policy - csp", function (test) {
   BrowserPolicy.content.disallowScript();
   test.isTrue(cspsEqual(BrowserPolicy.content._constructCsp(),
                         "default-src 'self'; script-src 'none';"));
+  test.isFalse(BrowserPolicy.content._keywordAllowed("script-src", "'unsafe-inline'"));
   BrowserPolicy.content.allowInlineScripts();
   test.isTrue(cspsEqual(BrowserPolicy.content._constructCsp(),
                         "default-src 'self'; script-src 'unsafe-inline';"));
+  test.isTrue(BrowserPolicy.content._keywordAllowed("script-src", "'unsafe-inline'"));
 
   // Starting with all content same origin, allow inline scripts. (Should result
   // in both same origin and inline scripts allowed.)
diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js
index f801dc669e..2e72e366ed 100644
--- a/packages/webapp/webapp_server.js
+++ b/packages/webapp/webapp_server.js
@@ -231,11 +231,8 @@ var runWebAppServer = function () {
       return;
     }
 
-    var browserPolicyPackage = Package["browser-policy-common"];
     if (pathname === "/meteor_runtime_config.js" &&
-        browserPolicyPackage &&
-        browserPolicyPackage.BrowserPolicy.content &&
-        ! browserPolicyPackage.BrowserPolicy.content.inlineScriptsAllowed()) {
+        ! WebAppInternals.inlineScriptsAllowed()) {
       res.writeHead(200, { 'Content-type': 'application/javascript' });
       res.write("__meteor_runtime_config__ = " +
                 JSON.stringify(__meteor_runtime_config__) + ";");
@@ -403,10 +400,7 @@ var runWebAppServer = function () {
 
     // Include __meteor_runtime_config__ in the app html, as an inline script if
     // it's not forbidden by CSP.
-    var browserPolicyPackage = Package["browser-policy-common"];
-    if (! browserPolicyPackage ||
-        ! browserPolicyPackage.BrowserPolicy.content ||
-        browserPolicyPackage.BrowserPolicy.content.inlineScriptsAllowed()) {
+    if (WebAppInternals.inlineScriptsAllowed()) {
       boilerplateHtml = boilerplateHtml.replace(
           /##RUNTIME_CONFIG##/,
         "<script type='text/javascript'>__meteor_runtime_config__ = " +
@@ -572,3 +566,14 @@ WebAppInternals.bindToProxy = function (proxyConfig) {
 };
 
 runWebAppServer();
+
+
+var inlineScriptsAllowed = true;
+
+WebAppInternals.inlineScriptsAllowed = function () {
+  return inlineScriptsAllowed;
+};
+
+WebAppInternals.setInlineScriptsAllowed = function (value) {
+  inlineScriptsAllowed = value;
+};

From 008b46ac49735577c05a18f0c56252b37fdea486 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Wed, 9 Oct 2013 20:38:58 -0700
Subject: [PATCH 279/335] History tweaks.

---
 History.md | 69 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 37 insertions(+), 32 deletions(-)

diff --git a/History.md b/History.md
index f27bca6d60..cdc72c60cb 100644
--- a/History.md
+++ b/History.md
@@ -4,8 +4,9 @@
 
 #### Security
 
-* Add `browser-policy` package for configuring and sending Content Security
-  Policy and X-Frame-Options HTTP headers.
+* Add `browser-policy` package for configuring and sending
+  Content-Security-Policy and X-Frame-Options HTTP headers.
+  [See the docs](http://docs.meteor.com/#browserpolicy) for more.
 
 * Use cryptographically strong pseudorandom number generators when available.
 
@@ -17,43 +18,33 @@
 
 * `update` and `remove` now return the number of documents affected.  #1046
 
-* Pass an index and the cursor itself to the callbacks in `cursor.forEach` and
-  `cursor.map`, just like the corresponding `Array` methods.  #63
+* `$near` operator for `2d` and `2dsphere` indices.
 
 * The `fields` option to the collection methods `find` and `findOne` now works
   on the client as well.  (Operators such as `$elemMatch` and `$` are not yet
   supported in `fields` projections.) #1287
 
-* Support `c.find(query, {limit: N}).count()` on the client.  #654
+* Pass an index and the cursor itself to the callbacks in `cursor.forEach` and
+  `cursor.map`, just like the corresponding `Array` methods.  #63
 
-* Fix various bugs with using Mongo ObjectIds. (XXX bad description! this is
-  3cfeed and 008847)
+* Support `c.find(query, {limit: N}).count()` on the client.  #654
 
 * Improve behavior of `$ne`, `$nin`, and `$not` selectors with objects containing
   arrays.  #1451
 
-* `$near` operator for `2d` and `2dsphere` indices.
-
-#### DDP
-
-* Fix infinite loop if a client disconnects while a long yielding method is
-  running.
-
-* Unfinished code to support DDP session resumption has been removed. Meteor
-  servers now stop processing messages from clients and reclaim memory
-  associated with them as soon as they are disconnected instead of a few minutes
-  later.
+* Fix various bugs if you had two documents with the same _id field in
+  String and ObjectID form.
 
 #### Accounts
 
-* [Behavior Change] Write dates generated by Meteor Accounts to Mongo as
-  Date instead of number; existing data can be converted by passing it
-  through `new Date()`. #1228
-
 * [Behavior Change] Expire login tokens periodically. Defaults to 90
   days. Use `Accounts.config({loginExpirationInDays: null})` to disable
   token expiration.
 
+* [Behavior Change] Write dates generated by Meteor Accounts to Mongo as
+  Date instead of number; existing data can be converted by passing it
+  through `new Date()`. #1228
+
 * Log out and close connections for users if they are deleted from the
   database.
 
@@ -72,6 +63,16 @@
 * Fix bug where callbacks to login functions could be called multiple
   times when the client reconnects.
 
+#### DDP
+
+* Fix infinite loop if a client disconnects while a long yielding method is
+  running.
+
+* Unfinished code to support DDP session resumption has been removed. Meteor
+  servers now stop processing messages from clients and reclaim memory
+  associated with them as soon as they are disconnected instead of a few minutes
+  later.
+
 #### Tools
 
 * The pre-0.6.5 `Package.register_extension` API has been removed. Use
@@ -84,23 +85,26 @@
   behind a proxy. Use the standard `http_proxy` environment variable to
   specify your proxy endpoint.  #429, #689, #1338
 
-* Install NPM modules with `--force` to avoid corrupted local caches.
-
-* Rebuild NPM modules in packages when upgrading to a version of Meteor that
-  uses a different version of Node.
-
 * Build Linux binaries on an older Linux machine. Meteor now supports
   running on Linux machines with glibc 2.9 or newer (Ubuntu 10.04+, RHEL
   and CentOS 6+, Fedora 10+, Debian 6+). Improve error message when running
   on Linux with unsupported glibc, and include Mongo stderr if it fails
   to start.
 
+* Install NPM modules with `--force` to avoid corrupted local caches.
+
+* Rebuild NPM modules in packages when upgrading to a version of Meteor that
+  uses a different version of Node.
+
 * Disable the Mongo http interface. This lets you run meteor on two ports
   differing by 1000 at the same time.
 
 #### Misc
 
-* Check that the argument to `EJSON.parse` is a string.  #1401
+* [Known issue] Breaks support for pre-release OSX 10.9 'Mavericks'.
+  Will be addressed shortly. See issues:
+  https://github.com/joyent/node/issues/6251
+  https://github.com/joyent/node/issues/6296
 
 * `EJSON.stringify` now takes options:
   - `canonical` causes objects keys to be stringified in sorted order
@@ -108,6 +112,8 @@
 
 * EJSON now supports `Infinity`, `-Infinity` and `NaN`.
 
+* Check that the argument to `EJSON.parse` is a string.  #1401
+
 * Better error from functions that use `Meteor._wrapAsync` (eg collection write
   methods and `HTTP` methods) and in DDP server message processing.  #1387
 
@@ -121,9 +127,8 @@
 * Better error when passing a string to `{{#each}}`. #722
 
 * Add support for JSESSIONID cookies for sticky sessions. Set the
-  `USE_JSESSIONID` environment variable to enable.
-
-* Simplify the static analysis used to detect package-scope variables.
+  `USE_JSESSIONID` environment variable to enable placing a JSESSIONID
+  cookie on sockjs requests.
 
 * Upgraded dependencies:
   * Node from 0.8.24 to 0.10.20
@@ -131,7 +136,7 @@
   * MongoDB driver from 1.3.17 to 1.3.19
   * http-proxy from 0.10.1 to a pre-release of 1.0.0
   * stylus from 0.30.1 to 0.37.0
-  * nib from 0.8.2 to 1.0.0  #1121 #1315
+  * nib from 0.8.2 to 1.0.0
   * optimist from 0.3.5 to 0.6.0
   * semver from 1.1.0 to 2.1.0
   * request from 2.12.0 to 2.27.0

From b9562447bd5e676d237dd7a80f13b7b3c2783a1b Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Wed, 9 Oct 2013 20:58:03 -0700
Subject: [PATCH 280/335] Notices and first draft banner.

---
 scripts/admin/banner.txt   | 8 +++++---
 scripts/admin/notices.json | 3 +++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/scripts/admin/banner.txt b/scripts/admin/banner.txt
index 3f4a24094b..93a5a1a01c 100644
--- a/scripts/admin/banner.txt
+++ b/scripts/admin/banner.txt
@@ -1,5 +1,7 @@
-=> Meteor 0.6.5.1: a few bugfixes, including fixes for lines ending with
-   backslashes, filenames with spaces, and tab characters in d3.
+=> Meteor 0.6.6: Many improvements and upgrades. Mongo support for
+   upsert and $near, new browser-policy package for security headers,
+   NodeJS 0.10, and much much more. For details, see:
+     https://github.com/meteor/meteor/blob/devel/History.md
 
    This is being downloaded in the background. Update your project
-   to Meteor 0.6.5.1 by running 'meteor update'.
+   to Meteor 0.6.6 by running 'meteor update'.
diff --git a/scripts/admin/notices.json b/scripts/admin/notices.json
index 176e5eb606..7e5e104bcf 100644
--- a/scripts/admin/notices.json
+++ b/scripts/admin/notices.json
@@ -54,6 +54,9 @@
   {
     "release": "0.6.5.1"
   },
+  {
+    "release": "0.6.6"
+  },
   {
     "release": "NEXT"
   }

From 82067795f620530bad162d1c431110799ceaa5f8 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Thu, 10 Oct 2013 12:44:36 -0700
Subject: [PATCH 281/335] banner text tweak.

---
 scripts/admin/banner.txt | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/scripts/admin/banner.txt b/scripts/admin/banner.txt
index 93a5a1a01c..5596513cdb 100644
--- a/scripts/admin/banner.txt
+++ b/scripts/admin/banner.txt
@@ -1,7 +1,6 @@
-=> Meteor 0.6.6: Many improvements and upgrades. Mongo support for
-   upsert and $near, new browser-policy package for security headers,
-   NodeJS 0.10, and much much more. For details, see:
-     https://github.com/meteor/meteor/blob/devel/History.md
+=> Meteor 0.6.6: Mongo upsert and $near queries, new browser-policy
+   package for security headers, NodeJS 0.10, and much more. For
+   details, see: https://github.com/meteor/meteor/blob/devel/History.md
 
    This is being downloaded in the background. Update your project
    to Meteor 0.6.6 by running 'meteor update'.

From f1ca859790556e1a7c8a31b99f48c26e3a094200 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Thu, 10 Oct 2013 12:45:22 -0700
Subject: [PATCH 282/335] another history tweak.

---
 History.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/History.md b/History.md
index cdc72c60cb..a512225cef 100644
--- a/History.md
+++ b/History.md
@@ -130,6 +130,8 @@
   `USE_JSESSIONID` environment variable to enable placing a JSESSIONID
   cookie on sockjs requests.
 
+* Simplify the static analysis used to detect package-scope variables.
+
 * Upgraded dependencies:
   * Node from 0.8.24 to 0.10.20
   * MongoDB from 2.4.4 to 2.4.6

From 06b9beab3afdd5706c3a0c8742f78351fa077f96 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Thu, 10 Oct 2013 12:44:18 -0700
Subject: [PATCH 283/335] upgrade docs and examples to 0.6.6

this is premature, as it isn't out yet, but it will be by the time this hits devel
---
 docs/.meteor/release                 | 2 +-
 examples/leaderboard/.meteor/release | 2 +-
 examples/parties/.meteor/release     | 2 +-
 examples/todos/.meteor/release       | 2 +-
 examples/wordplay/.meteor/release    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/.meteor/release b/docs/.meteor/release
index e0d633138e..05e8a4593f 100644
--- a/docs/.meteor/release
+++ b/docs/.meteor/release
@@ -1 +1 @@
-0.6.6-rc4
+0.6.6
diff --git a/examples/leaderboard/.meteor/release b/examples/leaderboard/.meteor/release
index e0d633138e..05e8a4593f 100644
--- a/examples/leaderboard/.meteor/release
+++ b/examples/leaderboard/.meteor/release
@@ -1 +1 @@
-0.6.6-rc4
+0.6.6
diff --git a/examples/parties/.meteor/release b/examples/parties/.meteor/release
index e0d633138e..05e8a4593f 100644
--- a/examples/parties/.meteor/release
+++ b/examples/parties/.meteor/release
@@ -1 +1 @@
-0.6.6-rc4
+0.6.6
diff --git a/examples/todos/.meteor/release b/examples/todos/.meteor/release
index e0d633138e..05e8a4593f 100644
--- a/examples/todos/.meteor/release
+++ b/examples/todos/.meteor/release
@@ -1 +1 @@
-0.6.6-rc4
+0.6.6
diff --git a/examples/wordplay/.meteor/release b/examples/wordplay/.meteor/release
index e0d633138e..05e8a4593f 100644
--- a/examples/wordplay/.meteor/release
+++ b/examples/wordplay/.meteor/release
@@ -1 +1 @@
-0.6.6-rc4
+0.6.6

From 3733ab1c72b46bad0044cf9e85eec98273aca834 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Thu, 10 Oct 2013 12:58:05 -0700
Subject: [PATCH 284/335] fix bless release script for update getUrl function.

---
 scripts/admin/bless-release.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/admin/bless-release.js b/scripts/admin/bless-release.js
index 4464b5e676..9fdc16e557 100644
--- a/scripts/admin/bless-release.js
+++ b/scripts/admin/bless-release.js
@@ -25,6 +25,7 @@ var Future = require('fibers/future');
 var _ = require('underscore');
 
 var files = require('../../tools/files.js');
+var httpHelpers = require('../../tools/http-helpers.js');
 var warehouse = require('../../tools/warehouse.js');
 
 var PLATFORMS = [
@@ -56,7 +57,7 @@ var execFileSync = function (binary, args) {
 };
 
 var getWarehouseFile = function (path, json) {
-  return files.getUrl({
+  return httpHelpers.getUrl({
     url: "https://s3.amazonaws.com/meteor-warehouse/" + path,
     json: json
   });

From 995ccae9678ac6dd38e93292cf5c3afd291ee39b Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Thu, 10 Oct 2013 16:16:43 -0700
Subject: [PATCH 285/335] Bump docs meteor release

---
 docs/.meteor/release | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/.meteor/release b/docs/.meteor/release
index 05e8a4593f..62a4661cc6 100644
--- a/docs/.meteor/release
+++ b/docs/.meteor/release
@@ -1 +1 @@
-0.6.6
+galaxy-follower-5

From 287d43bd994e7f30cf8d8829c04e85aa5b85d0e7 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Fri, 11 Oct 2013 10:01:29 -0700
Subject: [PATCH 286/335] Don't use fs.watch. Poll directory contents instead.

---
 tools/watch.js | 57 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 56 insertions(+), 1 deletion(-)

diff --git a/tools/watch.js b/tools/watch.js
index ea685773cb..ce4a20130b 100644
--- a/tools/watch.js
+++ b/tools/watch.js
@@ -435,7 +435,7 @@ _.extend(Watcher.prototype, {
       // Notice that we poll very frequently (500 ms)
       try {
         self.directoryWatches.push(
-          fs.watch(info.absPath, {interval: 500}, function () {
+          fsWatchDir(info.absPath, {interval: 500}, function () {
             self._fireIfDirectoryChanged(info);
           })
         );
@@ -536,6 +536,61 @@ var sha1 = function (contents) {
   return hash.digest('hex');
 };
 
+
+// Obey the same contract as fs.watch(directory), but don't use
+// fs.watch. On Node 0.10 on MacOS, fs.watch is weird and buggy.
+//
+// https://github.com/meteor/meteor/issues/1483
+// https://github.com/joyent/node/issues/5463
+// https://github.com/joyent/libuv/commit/684e212
+// https://groups.google.com/forum/#!topic/meteor-talk/Zy1XxEcxe8o
+// https://github.com/joyent/libuv/commit/38df93cf
+var fsWatchDir = function (path, options, callback) {
+  if (typeof options === "function") {
+    callback = options;
+    options = {};
+  }
+  callback = callback || function () {};
+
+  // do the first read synchronously. errors (eg, not a directory) will
+  // be thrown.
+  var contents = fs.readdirSync(path);
+
+  // now poll the directory contents periodically.
+  var interval = setInterval(function () {
+    // can do these async. if for some reason it takes longer than the
+    // interval timeout, thats OK.
+    fs.readdir(path, function (err, newContents) {
+      if (err) {
+        // directory no longer exists. fire and stop watching.
+        if (err.code === 'ENOENT' || err.code === 'ENOTDIR') {
+          callback();
+          clearInterval(interval);
+          return;
+        }
+        // unhandled error. rethrow.
+        throw err;
+      }
+
+      if (newContents.length !== contents.length ||
+          _.union(contents, newContents).length !== contents.length) {
+        callback();
+      }
+      contents = newContents;
+    });
+  }, options.interval || 500);
+
+  return {
+    close: function () {
+      // make sure callback is never called again, even if some
+      // fs.readdirs are outstnding.
+      callback = function () {};
+      clearInterval(interval);
+    }
+  };
+};
+
+
 _.extend(exports, {
   WatchSet: WatchSet,
   Watcher: Watcher,

From 135de89282e0d96230de18f1039b6964dbd199f8 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Fri, 11 Oct 2013 13:09:27 -0700
Subject: [PATCH 287/335] Rip out fs.watch entirely.

---
 tools/watch.js | 93 ++++++++++----------------------------------------
 1 file changed, 18 insertions(+), 75 deletions(-)

diff --git a/tools/watch.js b/tools/watch.js
index ce4a20130b..9bd00e25f1 100644
--- a/tools/watch.js
+++ b/tools/watch.js
@@ -274,7 +274,7 @@ var Watcher = function (options) {
   self.justCheckOnce = !!options._justCheckOnce;
 
   self.fileWatches = []; // array of paths
-  self.directoryWatches = []; // array of watch object
+  self.directoryWatches = []; // array of interval handles
 
   // We track all of the currently active timers so that we can cancel
   // them at stop() time. This stops the process from hanging at
@@ -418,7 +418,19 @@ _.extend(Watcher.prototype, {
   _startDirectoryWatches: function () {
     var self = this;
 
-    // Set up a watch for each directory
+    // fs.watchFile doesn't work for directories (as tested on ubuntu)
+    // and fs.watch has serious issues on MacOS (at least in node 0.10)
+    // https://github.com/meteor/meteor/issues/1483
+    // https://groups.google.com/forum/#!topic/meteor-talk/Zy1XxEcxe8o
+    // https://github.com/joyent/node/issues/5463
+    // https://github.com/joyent/libuv/commit/38df93cf
+    //
+    // Instead, just use setInterval. _fireIfDirectoryChanged already
+    // does checking to see if anything really changed. When node has a
+    // stable directory watching API that is more efficient than just
+    // polling, look at the history for this file around release 0.6.5
+    // for a version that uses fs.watch.
+
     _.each(self.watchSet.directories, function (info) {
       if (self.stopped)
         return;
@@ -431,24 +443,10 @@ _.extend(Watcher.prototype, {
       if (self.stopped || self.justCheckOnce)
         return;
 
-      // fs.watchFile doesn't work for directories (as tested on ubuntu)
       // Notice that we poll very frequently (500 ms)
-      try {
-        self.directoryWatches.push(
-          fsWatchDir(info.absPath, {interval: 500}, function () {
-            self._fireIfDirectoryChanged(info);
-          })
-        );
-      } catch (e) {
-        // Can happen if the directory doesn't exist, in which case we should
-        // fire if it should be there.
-        if (e && e.code === "ENOENT") {
-          if (info.contents !== null)
-            self._fire();
-          return;
-        }
-        throw e;
-      }
+      self.directoryWatches.push(
+        setInterval(function () { self._fireIfDirectoryChanged(info) }, 500)
+      );
     });
   },
 
@@ -480,7 +478,7 @@ _.extend(Watcher.prototype, {
 
     // Clean up directory watches
     _.each(self.directoryWatches, function (watch) {
-      watch.close();
+      clearInterval(watch);
     });
     self.directoryWatches = [];
   }
@@ -536,61 +534,6 @@ var sha1 = function (contents) {
   return hash.digest('hex');
 };
 
-
-// Obey the same contract as fs.watch(directory), but don't use
-// fs.watch. On Node 0.10 on MacOS, fs.watch is weird and buggy.
-//
-// https://github.com/meteor/meteor/issues/1483
-// https://github.com/joyent/node/issues/5463
-// https://github.com/joyent/libuv/commit/684e212
-// https://groups.google.com/forum/#!topic/meteor-talk/Zy1XxEcxe8o
-// https://github.com/joyent/libuv/commit/38df93cf
-var fsWatchDir = function (path, options, callback) {
-  if (typeof options === "function") {
-    callback = options;
-    options = {};
-  }
-  callback = callback || function () {};
-
-  // do the first read synchronously. errors (eg, not a directory) will
-  // be thrown.
-  var contents = fs.readdirSync(path);
-
-  // now poll the directory contents periodically.
-  var interval = setInterval(function () {
-    // can do these async. if for some reason it takes longer than the
-    // interval timeout, thats OK.
-    fs.readdir(path, function (err, newContents) {
-      if (err) {
-        // directory no longer exists. fire and stop watching.
-        if (err.code === 'ENOENT' || err.code === 'ENOTDIR') {
-          callback();
-          clearInterval(interval);
-          return;
-        }
-        // unhandled error. rethrow.
-        throw err;
-      }
-
-      if (newContents.length !== contents.length ||
-          _.union(contents, newContents).length !== contents.length) {
-        callback();
-      }
-      contents = newContents;
-    });
-  }, options.interval || 500);
-
-  return {
-    close: function () {
-      // make sure callback is never called again, even if some
-      // fs.readdirs are outstnding.
-      callback = function () {};
-      clearInterval(interval);
-    }
-  };
-};
-
-
 _.extend(exports, {
   WatchSet: WatchSet,
   Watcher: Watcher,

From 085b9bb0e583c0599f1339e6fb44a427bdbc90a2 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Fri, 11 Oct 2013 13:11:22 -0700
Subject: [PATCH 288/335] Remove now unneeded double check.

---
 tools/watch.js | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/tools/watch.js b/tools/watch.js
index 9bd00e25f1..2e507cdb0d 100644
--- a/tools/watch.js
+++ b/tools/watch.js
@@ -334,7 +334,7 @@ _.extend(Watcher.prototype, {
     return true;
   },
 
-  _fireIfDirectoryChanged: function (info, isDoubleCheck) {
+  _fireIfDirectoryChanged: function (info) {
     var self = this;
 
     if (self.stopped)
@@ -352,20 +352,6 @@ _.extend(Watcher.prototype, {
       return true;
     }
 
-    if (!isDoubleCheck && !self.justCheckOnce) {
-      // Whenever a directory changes, scan it soon as we notice,
-      // but then scan it again one secord later just to make sure
-      // that we haven't missed any changes. See commentary at
-      // #WorkAroundLowPrecisionMtimes
-      // XXX not sure why this uses a different strategy than files
-      var timerId = self.nextTimerId++;
-      self.timers[timerId] = setTimeout(function () {
-        delete self.timers[timerId];
-        if (! self.stopped)
-          self._fireIfDirectoryChanged(info, true);
-      }, 1000);
-    }
-
     return false;
   },
 

From 6c0f7dff0230ab2cd2b8bfb7c05f4efe7f54ce54 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Fri, 11 Oct 2013 14:18:05 -0700
Subject: [PATCH 289/335] Yield during background directory watches.

---
 tools/watch.js | 37 ++++++++++++++++++++++++++++++-------
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/tools/watch.js b/tools/watch.js
index 2e507cdb0d..c2007c1f3d 100644
--- a/tools/watch.js
+++ b/tools/watch.js
@@ -1,6 +1,8 @@
 var fs = require("fs");
 var path = require("path");
 var _ = require('underscore');
+var Future = require('fibers/future');
+var fiberHelpers = require('./fiber-helpers.js');
 
 // Watch for changes to a set of files, and the first time that any of
 // the files change, call a user-provided callback. (If you want a
@@ -53,8 +55,6 @@ var _ = require('underscore');
 // nonexistent if they point to something nonexist, etc). Not sure if this is
 // correct.
 
-
-
 var WatchSet = function () {
   var self = this;
 
@@ -209,9 +209,10 @@ WatchSet.fromJSON = function (json) {
 };
 
 var readDirectory = function (options) {
+  var yielding = !!options._yielding;
   // Read the directory.
   try {
-    var contents = fs.readdirSync(options.absPath);
+    var contents = readdirSyncOrYield(options.absPath, yielding);
   } catch (e) {
     // If the path is not a directory, return null; let other errors through.
     if (e && (e.code === 'ENOENT' || e.code === 'ENOTDIR'))
@@ -226,7 +227,7 @@ var readDirectory = function (options) {
       // We do stat instead of lstat here, so that we treat symlinks to
       // directories just like directories themselves.
       // XXX Does the treatment of symlinks make sense?
-      var stats = fs.statSync(path.join(options.absPath, entry));
+      var stats = statSyncOrYield(path.join(options.absPath, entry), yielding);
     } catch (e) {
       if (e && (e.code === 'ENOENT')) {
         // Disappeared after the readdirSync (or a dangling symlink)? Eh,
@@ -334,7 +335,7 @@ _.extend(Watcher.prototype, {
     return true;
   },
 
-  _fireIfDirectoryChanged: function (info) {
+  _fireIfDirectoryChanged: function (info, yielding) {
     var self = this;
 
     if (self.stopped)
@@ -343,7 +344,8 @@ _.extend(Watcher.prototype, {
     var newContents = exports.readDirectory({
       absPath: info.absPath,
       include: info.include,
-      exclude: info.exclude
+      exclude: info.exclude,
+      _yielding: yielding
     });
 
     // If the directory has changed (including being deleted or created).
@@ -431,7 +433,9 @@ _.extend(Watcher.prototype, {
 
       // Notice that we poll very frequently (500 ms)
       self.directoryWatches.push(
-        setInterval(function () { self._fireIfDirectoryChanged(info) }, 500)
+        setInterval(fiberHelpers.inFiber(function () {
+          self._fireIfDirectoryChanged(info, true);
+        }), 500)
       );
     });
   },
@@ -520,6 +524,25 @@ var sha1 = function (contents) {
   return hash.digest('hex');
 };
 
+// XXX We should eventually rewrite the whole meteor tools to use yielding fs
+// calls instead of sync (so that meteor is responsive to C-c during bundling,
+// so that the proxy accepts connections, etc) but we don't want to do this in
+// the point release in which we are adding these functions.
+var readdirSyncOrYield = function (path, yielding) {
+  if (yielding) {
+    return Future.wrap(fs.readdir)(path).wait();
+  } else {
+    return fs.readdirSync(path);
+  }
+};
+var statSyncOrYield = function (path, yielding) {
+  if (yielding) {
+    return Future.wrap(fs.stat)(path).wait();
+  } else {
+    return fs.statSync(path);
+  }
+};
+
 _.extend(exports, {
   WatchSet: WatchSet,
   Watcher: Watcher,

From d05560d12f124894731ad843b4769e6ff33a6201 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Fri, 11 Oct 2013 10:01:29 -0700
Subject: [PATCH 290/335] Don't us fs.watch. Cherry pick and squash 2b8e4a29752

---
 tools/watch.js | 87 +++++++++++++++++++++++++++-----------------------
 1 file changed, 47 insertions(+), 40 deletions(-)

diff --git a/tools/watch.js b/tools/watch.js
index ea685773cb..c2007c1f3d 100644
--- a/tools/watch.js
+++ b/tools/watch.js
@@ -1,6 +1,8 @@
 var fs = require("fs");
 var path = require("path");
 var _ = require('underscore');
+var Future = require('fibers/future');
+var fiberHelpers = require('./fiber-helpers.js');
 
 // Watch for changes to a set of files, and the first time that any of
 // the files change, call a user-provided callback. (If you want a
@@ -53,8 +55,6 @@ var _ = require('underscore');
 // nonexistent if they point to something nonexist, etc). Not sure if this is
 // correct.
 
-
-
 var WatchSet = function () {
   var self = this;
 
@@ -209,9 +209,10 @@ WatchSet.fromJSON = function (json) {
 };
 
 var readDirectory = function (options) {
+  var yielding = !!options._yielding;
   // Read the directory.
   try {
-    var contents = fs.readdirSync(options.absPath);
+    var contents = readdirSyncOrYield(options.absPath, yielding);
   } catch (e) {
     // If the path is not a directory, return null; let other errors through.
     if (e && (e.code === 'ENOENT' || e.code === 'ENOTDIR'))
@@ -226,7 +227,7 @@ var readDirectory = function (options) {
       // We do stat instead of lstat here, so that we treat symlinks to
       // directories just like directories themselves.
       // XXX Does the treatment of symlinks make sense?
-      var stats = fs.statSync(path.join(options.absPath, entry));
+      var stats = statSyncOrYield(path.join(options.absPath, entry), yielding);
     } catch (e) {
       if (e && (e.code === 'ENOENT')) {
         // Disappeared after the readdirSync (or a dangling symlink)? Eh,
@@ -274,7 +275,7 @@ var Watcher = function (options) {
   self.justCheckOnce = !!options._justCheckOnce;
 
   self.fileWatches = []; // array of paths
-  self.directoryWatches = []; // array of watch object
+  self.directoryWatches = []; // array of interval handles
 
   // We track all of the currently active timers so that we can cancel
   // them at stop() time. This stops the process from hanging at
@@ -334,7 +335,7 @@ _.extend(Watcher.prototype, {
     return true;
   },
 
-  _fireIfDirectoryChanged: function (info, isDoubleCheck) {
+  _fireIfDirectoryChanged: function (info, yielding) {
     var self = this;
 
     if (self.stopped)
@@ -343,7 +344,8 @@ _.extend(Watcher.prototype, {
     var newContents = exports.readDirectory({
       absPath: info.absPath,
       include: info.include,
-      exclude: info.exclude
+      exclude: info.exclude,
+      _yielding: yielding
     });
 
     // If the directory has changed (including being deleted or created).
@@ -352,20 +354,6 @@ _.extend(Watcher.prototype, {
       return true;
     }
 
-    if (!isDoubleCheck && !self.justCheckOnce) {
-      // Whenever a directory changes, scan it soon as we notice,
-      // but then scan it again one secord later just to make sure
-      // that we haven't missed any changes. See commentary at
-      // #WorkAroundLowPrecisionMtimes
-      // XXX not sure why this uses a different strategy than files
-      var timerId = self.nextTimerId++;
-      self.timers[timerId] = setTimeout(function () {
-        delete self.timers[timerId];
-        if (! self.stopped)
-          self._fireIfDirectoryChanged(info, true);
-      }, 1000);
-    }
-
     return false;
   },
 
@@ -418,7 +406,19 @@ _.extend(Watcher.prototype, {
   _startDirectoryWatches: function () {
     var self = this;
 
-    // Set up a watch for each directory
+    // fs.watchFile doesn't work for directories (as tested on ubuntu)
+    // and fs.watch has serious issues on MacOS (at least in node 0.10)
+    // https://github.com/meteor/meteor/issues/1483
+    // https://groups.google.com/forum/#!topic/meteor-talk/Zy1XxEcxe8o
+    // https://github.com/joyent/node/issues/5463
+    // https://github.com/joyent/libuv/commit/38df93cf
+    //
+    // Instead, just use setInterval. _fireIfDirectoryChanged already
+    // does checking to see if anything really changed. When node has a
+    // stable directory watching API that is more efficient than just
+    // polling, look at the history for this file around release 0.6.5
+    // for a version that uses fs.watch.
+
     _.each(self.watchSet.directories, function (info) {
       if (self.stopped)
         return;
@@ -431,24 +431,12 @@ _.extend(Watcher.prototype, {
       if (self.stopped || self.justCheckOnce)
         return;
 
-      // fs.watchFile doesn't work for directories (as tested on ubuntu)
       // Notice that we poll very frequently (500 ms)
-      try {
-        self.directoryWatches.push(
-          fs.watch(info.absPath, {interval: 500}, function () {
-            self._fireIfDirectoryChanged(info);
-          })
-        );
-      } catch (e) {
-        // Can happen if the directory doesn't exist, in which case we should
-        // fire if it should be there.
-        if (e && e.code === "ENOENT") {
-          if (info.contents !== null)
-            self._fire();
-          return;
-        }
-        throw e;
-      }
+      self.directoryWatches.push(
+        setInterval(fiberHelpers.inFiber(function () {
+          self._fireIfDirectoryChanged(info, true);
+        }), 500)
+      );
     });
   },
 
@@ -480,7 +468,7 @@ _.extend(Watcher.prototype, {
 
     // Clean up directory watches
     _.each(self.directoryWatches, function (watch) {
-      watch.close();
+      clearInterval(watch);
     });
     self.directoryWatches = [];
   }
@@ -536,6 +524,25 @@ var sha1 = function (contents) {
   return hash.digest('hex');
 };
 
+// XXX We should eventually rewrite the whole meteor tools to use yielding fs
+// calls instead of sync (so that meteor is responsive to C-c during bundling,
+// so that the proxy accepts connections, etc) but we don't want to do this in
+// the point release in which we are adding these functions.
+var readdirSyncOrYield = function (path, yielding) {
+  if (yielding) {
+    return Future.wrap(fs.readdir)(path).wait();
+  } else {
+    return fs.readdirSync(path);
+  }
+};
+var statSyncOrYield = function (path, yielding) {
+  if (yielding) {
+    return Future.wrap(fs.stat)(path).wait();
+  } else {
+    return fs.statSync(path);
+  }
+};
+
 _.extend(exports, {
   WatchSet: WatchSet,
   Watcher: Watcher,

From 47babd170fd702b155f68395a855681f9df3b4cc Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Fri, 11 Oct 2013 17:02:42 -0700
Subject: [PATCH 291/335] banner and notices for 0.6.6.1

---
 scripts/admin/banner.txt   | 6 ++----
 scripts/admin/notices.json | 3 +++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/admin/banner.txt b/scripts/admin/banner.txt
index 5596513cdb..aa8e5f804f 100644
--- a/scripts/admin/banner.txt
+++ b/scripts/admin/banner.txt
@@ -1,6 +1,4 @@
-=> Meteor 0.6.6: Mongo upsert and $near queries, new browser-policy
-   package for security headers, NodeJS 0.10, and much more. For
-   details, see: https://github.com/meteor/meteor/blob/devel/History.md
+=> Meteor 0.6.6.1: Fix file watching on MacOS (work around Node issue #6251)
 
    This is being downloaded in the background. Update your project
-   to Meteor 0.6.6 by running 'meteor update'.
+   to Meteor 0.6.6.1 by running 'meteor update'.
diff --git a/scripts/admin/notices.json b/scripts/admin/notices.json
index 7e5e104bcf..a575ed522e 100644
--- a/scripts/admin/notices.json
+++ b/scripts/admin/notices.json
@@ -57,6 +57,9 @@
   {
     "release": "0.6.6"
   },
+  {
+    "release": "0.6.6.1"
+  },
   {
     "release": "NEXT"
   }

From cb1d30c7e87cd342f7f637acd2c3e2a3472b9c82 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Fri, 11 Oct 2013 17:19:27 -0700
Subject: [PATCH 292/335] History for 0.6.6.1

---
 History.md               | 5 +++++
 scripts/admin/banner.txt | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/History.md b/History.md
index a512225cef..6db60365d5 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,10 @@
 ## vNEXT
 
+## v0.6.6.1
+
+* Fix file watching on OSX. Work around Node issue #6251 by not using
+  fs.watch. #1483
+
 ## v0.6.6
 
 #### Security
diff --git a/scripts/admin/banner.txt b/scripts/admin/banner.txt
index aa8e5f804f..d80bda39c5 100644
--- a/scripts/admin/banner.txt
+++ b/scripts/admin/banner.txt
@@ -1,4 +1,4 @@
-=> Meteor 0.6.6.1: Fix file watching on MacOS (work around Node issue #6251)
+=> Meteor 0.6.6.1: Fix file watching on OSX (work around Node issue #6251)
 
    This is being downloaded in the background. Update your project
    to Meteor 0.6.6.1 by running 'meteor update'.

From ca0e7c3c075105790d905e79a9b9f809260c4f93 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Fri, 11 Oct 2013 18:20:06 -0700
Subject: [PATCH 293/335] Docs version bump.

---
 docs/lib/release-override.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/lib/release-override.js b/docs/lib/release-override.js
index 8aa654904a..153af4fdb2 100644
--- a/docs/lib/release-override.js
+++ b/docs/lib/release-override.js
@@ -1,5 +1,5 @@
 // While galaxy apps are on their own special meteor releases, override
 // Meteor.release here.
 if (Meteor.isClient) {
-  Meteor.release = Meteor.release ? "0.6.6" : undefined;
+  Meteor.release = Meteor.release ? "0.6.6.1" : undefined;
 }

From 958a5475132ba24490bcaada9cd41ec1aa8ed17a Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Fri, 11 Oct 2013 18:43:13 -0700
Subject: [PATCH 294/335] update examples to 0.6.6.1

---
 examples/leaderboard/.meteor/release | 2 +-
 examples/parties/.meteor/release     | 2 +-
 examples/todos/.meteor/release       | 2 +-
 examples/wordplay/.meteor/release    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/leaderboard/.meteor/release b/examples/leaderboard/.meteor/release
index 05e8a4593f..f6895d22a5 100644
--- a/examples/leaderboard/.meteor/release
+++ b/examples/leaderboard/.meteor/release
@@ -1 +1 @@
-0.6.6
+0.6.6.1
diff --git a/examples/parties/.meteor/release b/examples/parties/.meteor/release
index 05e8a4593f..f6895d22a5 100644
--- a/examples/parties/.meteor/release
+++ b/examples/parties/.meteor/release
@@ -1 +1 @@
-0.6.6
+0.6.6.1
diff --git a/examples/todos/.meteor/release b/examples/todos/.meteor/release
index 05e8a4593f..f6895d22a5 100644
--- a/examples/todos/.meteor/release
+++ b/examples/todos/.meteor/release
@@ -1 +1 @@
-0.6.6
+0.6.6.1
diff --git a/examples/wordplay/.meteor/release b/examples/wordplay/.meteor/release
index 05e8a4593f..f6895d22a5 100644
--- a/examples/wordplay/.meteor/release
+++ b/examples/wordplay/.meteor/release
@@ -1 +1 @@
-0.6.6
+0.6.6.1

From 86b978b0f371b2ca32a395f6f4c24bd3317566ea Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Sat, 12 Oct 2013 10:35:33 -0700
Subject: [PATCH 295/335] Upgrade to SockJS 0.3.8.

This includes an upgrade to the underlying websocket driver, and our
base_url in /info patch.
---
 packages/livedata/.npm/package/npm-shrinkwrap.json | 9 +++++++--
 packages/livedata/package.js                       | 3 +--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/livedata/.npm/package/npm-shrinkwrap.json b/packages/livedata/.npm/package/npm-shrinkwrap.json
index 032c64a7a1..ffe3f903e9 100644
--- a/packages/livedata/.npm/package/npm-shrinkwrap.json
+++ b/packages/livedata/.npm/package/npm-shrinkwrap.json
@@ -1,13 +1,18 @@
 {
   "dependencies": {
     "sockjs": {
-      "version": "0.3.7",
+      "version": "0.3.8",
       "dependencies": {
         "node-uuid": {
           "version": "1.3.3"
         },
         "faye-websocket": {
-          "version": "0.4.4"
+          "version": "0.7.0",
+          "dependencies": {
+            "websocket-driver": {
+              "version": "0.3.0"
+            }
+          }
         }
       }
     },
diff --git a/packages/livedata/package.js b/packages/livedata/package.js
index a827a081af..adace40793 100644
--- a/packages/livedata/package.js
+++ b/packages/livedata/package.js
@@ -3,8 +3,7 @@ Package.describe({
   internal: true
 });
 
-Npm.depends({sockjs: "0.3.7",
-             websocket: "1.0.8"});
+Npm.depends({sockjs: "0.3.8", websocket: "1.0.8"});
 
 Package.on_use(function (api) {
   api.use(['check', 'random', 'ejson', 'json', 'underscore', 'deps', 'logging'],

From 8f23f54248100a61982979290864b843505a91a7 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Mon, 14 Oct 2013 12:33:16 -0700
Subject: [PATCH 296/335] comment on 0.3.20 already being made and burned.

---
 meteor | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 8efdb709e8..1ac2d57ed4 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,8 @@
 #!/bin/bash
 
-BUNDLE_VERSION=0.3.19
+BUNDLE_VERSION=0.3.19 # 0.3.20 is already built but was not used. next
+# time you bump this version number, go to 0.3.21 and remove this
+# comment.
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From 0151b3188deebadbca498972bfffff40653ca223 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Mon, 14 Oct 2013 13:16:06 -0700
Subject: [PATCH 297/335] minimongo: clone objects inserted with $addToSet

---
 packages/minimongo/modify.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/minimongo/modify.js b/packages/minimongo/modify.js
index 6edde2ccb7..862ca722ee 100644
--- a/packages/minimongo/modify.js
+++ b/packages/minimongo/modify.js
@@ -210,7 +210,7 @@ LocalCollection._modifiers = {
         for (var i = 0; i < x.length; i++)
           if (LocalCollection._f._equal(value, x[i]))
             return;
-        x.push(value);
+        x.push(EJSON.clone(value));
       });
     }
   },

From 3aca36aac4bfbf0d2f5a5ed34b777c79e2be691e Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Mon, 14 Oct 2013 16:18:04 -0700
Subject: [PATCH 298/335] Implement $each, $slice, and $sort for $push.

---
 packages/minimongo/minimongo_tests.js | 22 +++++++++
 packages/minimongo/modify.js          | 64 ++++++++++++++++++++++++---
 2 files changed, 80 insertions(+), 6 deletions(-)

diff --git a/packages/minimongo/minimongo_tests.js b/packages/minimongo/minimongo_tests.js
index d446156113..3a2d2260eb 100644
--- a/packages/minimongo/minimongo_tests.js
+++ b/packages/minimongo/minimongo_tests.js
@@ -1577,6 +1577,28 @@ Tinytest.add("minimongo - modify", function (test) {
   modify({a: [1]}, {$push: {a: [2]}}, {a: [1, [2]]});
   modify({a: []}, {$push: {'a.1': 99}}, {a: [null, [99]]}); // tested
   modify({a: {}}, {$push: {'a.x': 99}}, {a: {x: [99]}});
+  modify({}, {$push: {a: {$each: [1, 2, 3]}}},
+         {a: [1, 2, 3]});
+  modify({a: []}, {$push: {a: {$each: [1, 2, 3]}}},
+         {a: [1, 2, 3]});
+  modify({a: [true]}, {$push: {a: {$each: [1, 2, 3]}}},
+         {a: [true, 1, 2, 3]});
+  // No positive numbers for $slice
+  exception({}, {$push: {a: {$each: [], $slice: 5}}});
+  modify({a: [true]}, {$push: {a: {$each: [1, 2, 3], $slice: -2}}},
+         {a: [2, 3]});
+  modify({a: [false, true]}, {$push: {a: {$each: [1], $slice: -2}}},
+         {a: [true, 1]});
+  modify(
+    {a: [{x: 3}, {x: 1}]},
+    {$push: {a: {
+      $each: [{x: 4}, {x: 2}],
+      $slice: -2,
+      $sort: {x: 1}
+    }}},
+    {a: [{x: 3}, {x: 4}]});
+  modify({}, {$push: {a: {$each: [1, 2, 3], $slice: 0}}}, {a: []});
+  modify({a: [1, 2]}, {$push: {a: {$each: [1, 2, 3], $slice: 0}}}, {a: []});
 
   // $pushAll
   modify({}, {$pushAll: {a: [1]}}, {a: [1]});
diff --git a/packages/minimongo/modify.js b/packages/minimongo/modify.js
index 862ca722ee..e13c21e666 100644
--- a/packages/minimongo/modify.js
+++ b/packages/minimongo/modify.js
@@ -169,13 +169,65 @@ LocalCollection._modifiers = {
     }
   },
   $push: function (target, field, arg) {
-    var x = target[field];
-    if (x === undefined)
-      target[field] = [arg];
-    else if (!(x instanceof Array))
+    if (target[field] === undefined)
+      target[field] = [];
+    if (!(target[field] instanceof Array))
       throw Error("Cannot apply $push modifier to non-array");
-    else
-      x.push(EJSON.clone(arg));
+
+    if (!(arg && arg.$each)) {
+      // Simple mode: not $each
+      target[field].push(EJSON.clone(arg));
+      return;
+    }
+
+    // Fancy mode: $each (and maybe $slice and $sort)
+    var toPush = arg.$each;
+    if (!(toPush instanceof Array))
+      throw Error("$each must be an array");
+
+    // Parse $slice.
+    var slice = undefined;
+    if ('$slice' in arg) {
+      if (typeof arg.$slice !== "number")
+        throw Error("$slice must be a numeric value");
+      // XXX should check to make sure integer
+      if (arg.$slice > 0)
+        throw Error("$slice in $push must be zero or negative");
+      slice = arg.$slice;
+    }
+
+    // Parse $sort.
+    var sortFunction = undefined;
+    if (arg.$sort) {
+      if (slice === undefined)
+        throw Error("$sort requires $slice to be present");
+      // XXX this allows us to use a $sort whose value is an array, but that's
+      // actually an extension of the Node driver, so it won't work
+      // server-side. Could be confusing!
+      sortFunction = LocalCollection._compileSort(arg.$sort);
+      for (var i = 0; i < toPush.length; i++) {
+        if (LocalCollection._f._type(toPush[i]) !== 3) {
+          throw Error("$push like modifiers using $sort " +
+                      "require all elements to be objects");
+        }
+      }
+    }
+
+    // Actually push.
+    for (var j = 0; j < toPush.length; j++)
+      target[field].push(EJSON.clone(toPush[j]));
+
+    // Actually sort.
+    if (sortFunction)
+      target[field].sort(sortFunction);
+
+    // Actually slice.
+    if (slice !== undefined) {
+      if (slice === 0)
+        target[field] = [];  // differs from Array.slice!
+      else
+        target[field] = target[field].slice(slice);
+    }
   },
   $pushAll: function (target, field, arg) {
     if (!(typeof arg === "object" && arg instanceof Array))

From 71ea032cd99c5850e1e85177ff1c18a8f70effd3 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Mon, 14 Oct 2013 18:26:20 -0700
Subject: [PATCH 299/335] Update History and LICENSE.

---
 History.md  | 8 ++++++++
 LICENSE.txt | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/History.md b/History.md
index 6db60365d5..c4ce9ee3f0 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,12 @@
 ## vNEXT
 
+* Implement `$each`, `$sort`, and `$slice` options for minimongo's `$push`
+  modifier.
+
+* Upgraded dependencies:
+  * SockJS server from 0.3.7 to 0.3.8
+
+
 ## v0.6.6.1
 
 * Fix file watching on OSX. Work around Node issue #6251 by not using
@@ -7,6 +14,7 @@
 
 ## v0.6.6
 
+
 #### Security
 
 * Add `browser-policy` package for configuring and sending
diff --git a/LICENSE.txt b/LICENSE.txt
index 20e02a2541..8facf5235d 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -239,9 +239,11 @@ Copyright (c) 2012 Nathan Rajlich <nathan@tootallnate.net>
 
 ----------
 faye-websocket: https://github.com/faye/faye-websocket-node
+websocket-driver: https://github.com/faye/websocket-driver-node
 ----------
 
-Copyright (c) 2009-2012 James Coglan
+Copyright (c) 2009-2013 James Coglan
+Copyright (c) 2010-2013 James Coglan
 
 
 ----------

From 432907133449460e6c5f612cdce0abb06da2e02b Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Wed, 16 Oct 2013 14:59:38 -0700
Subject: [PATCH 300/335] use a non-default port in tests so we don't fail if
 someone is running an app at the same time.

---
 tools/tests/test_bundler_assets.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/tests/test_bundler_assets.js b/tools/tests/test_bundler_assets.js
index e3771bf089..e841b15568 100644
--- a/tools/tests/test_bundler_assets.js
+++ b/tools/tests/test_bundler_assets.js
@@ -91,7 +91,8 @@ assert.doesNotThrow(function () {
   var cp = require('child_process');
   var meteor = path.join(__dirname, "..", "..", "meteor"); // XXX is this allowed?
   var fut = new Future();
-  var proc = cp.spawn(meteor, ["--once"], {
+  // use a non-default port so we don't fail if someone is running an app now
+  var proc = cp.spawn(meteor, ["--once", "--port", "4123"], {
     cwd: path.join(__dirname, "app-with-private"),
     stdio: 'inherit'
   });

From b242f20ffee9188efa632061b86a5f8aea72dcda Mon Sep 17 00:00:00 2001
From: Avital Oliver <avital@thewe.net>
Date: Thu, 17 Oct 2013 16:36:13 -0700
Subject: [PATCH 301/335] Fix docs on http package

The recent change to throw errors wasn't done to completion.
Update the examples and some of the prose.
---
 docs/.meteor/release |  2 +-
 docs/client/api.html | 31 ++++++++++++++++++-------------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/docs/.meteor/release b/docs/.meteor/release
index 05e8a4593f..f6895d22a5 100644
--- a/docs/.meteor/release
+++ b/docs/.meteor/release
@@ -1 +1 @@
-0.6.6
+0.6.6.1
diff --git a/docs/client/api.html b/docs/client/api.html
index 1d6a2be262..0589b8d9af 100644
--- a/docs/client/api.html
+++ b/docs/client/api.html
@@ -2873,17 +2873,18 @@ these functions, add the HTTP package to your project with `$ meteor add http`.
 
 {{> api_box httpcall}}
 
-This function initiates an HTTP request to a remote server. It returns
-a result object with the contents of the HTTP response.  The result
-object is detailed below.
+This function initiates an HTTP request to a remote server.
 
 On the server, this function can be run either synchronously or
-asynchronously.  If the callback is omitted, it runs synchronously,
-and the results are returned once the request completes. This is
+asynchronously.  If the callback is omitted, it runs synchronously
+and the results are returned once the request completes successfully.
+If the request was not successful, an error is thrown.
+This is
 useful when making server-to-server HTTP API calls from within Meteor
 methods, as the method can succeed or fail based on the results of the
 synchronous HTTP call.  In this case, consider using
-[`this.unblock()`](#method_unblock) to allow other methods to run in
+[`this.unblock()`](#method_unblock) to allow other methods on the same
+connection to run in
 the mean time.  On the client, this function must be used
 asynchronously by passing a callback.
 
@@ -2903,7 +2904,8 @@ standard `x-www-form-urlencoded` content type, unless the `content`
 or `data` option is used to specify a body, in which case the
 parameters will be appended to the URL instead.
 
-The callback receives two arguments, `error` and `result`.  The
+When run in asynchronous mode, the callback receives two arguments,
+`error` and `result`.  The
 `error` argument will contain an Error if the request fails in any
 way, including a network error, time-out, or an HTTP status code in
 the 400 or 500 range.  In case of a 4xx/5xx HTTP status code, the
@@ -2938,11 +2940,14 @@ Example server method:
     Meteor.methods({checkTwitter: function (userId) {
       check(userId, String);
       this.unblock();
-      var result = HTTP.call("GET", "http://api.twitter.com/xyz",
-                             {params: {user: userId}});
-      if (result.statusCode === 200)
-         return true
-      return false;
+      try {
+        var result = HTTP.call("GET", "http://api.twitter.com/xyz",
+                               {params: {user: userId}});
+        return true;
+      } catch (e) {
+        // Got a network error, time-out or HTTP error in the 400 or 500 range.
+        return false;
+      }
     }});
 
 Example asynchronous HTTP call:
@@ -2950,7 +2955,7 @@ Example asynchronous HTTP call:
     HTTP.call("POST", "http://api.twitter.com/xyz",
               {data: {some: "json", stuff: 1}},
               function (error, result) {
-                if (result.statusCode === 200) {
+                if (!error) {
                   Session.set("twizzled", true);
                 }
               });

From 2c8422e441de36704243f72cf3a9e270c3e9c5cf Mon Sep 17 00:00:00 2001
From: Avital Oliver <avital@thewe.net>
Date: Thu, 17 Oct 2013 22:47:58 -0700
Subject: [PATCH 302/335] Fail explicitly when publishing non-cursors

---
 packages/livedata/livedata_server.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/livedata/livedata_server.js b/packages/livedata/livedata_server.js
index cdfed99995..d43c2c46fa 100644
--- a/packages/livedata/livedata_server.js
+++ b/packages/livedata/livedata_server.js
@@ -833,6 +833,12 @@ _.extend(Subscription.prototype, {
         cur._publishCursor(self);
       });
       self.ready();
+    } else if (res) {
+      // truthy values other than cursors or arrays are probably a
+      // user mistake (possible returning a Mongo document via, say,
+      // `coll.findOne()`).
+      self.error(new Error("Publish function can only return a Cursor or "
+                           + "an array of Cursors"));
     }
   },
 

From de3757480673ef0f07ed46f269eb0402f29f53fc Mon Sep 17 00:00:00 2001
From: Avital Oliver <avital@thewe.net>
Date: Thu, 17 Oct 2013 23:17:07 -0700
Subject: [PATCH 303/335] Update History.md

---
 History.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/History.md b/History.md
index c4ce9ee3f0..eb777bb624 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,7 @@
 ## vNEXT
 
+* Fail explicitly when publishing non-cursors.
+
 * Implement `$each`, `$sort`, and `$slice` options for minimongo's `$push`
   modifier.
 

From 8e2cd47c388250dca862d9333604c1946d985e0e Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Thu, 10 Oct 2013 16:16:43 -0700
Subject: [PATCH 304/335] Bump docs meteor release

Conflicts:
	docs/.meteor/release
---
 docs/.meteor/release | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/.meteor/release b/docs/.meteor/release
index f6895d22a5..62a4661cc6 100644
--- a/docs/.meteor/release
+++ b/docs/.meteor/release
@@ -1 +1 @@
-0.6.6.1
+galaxy-follower-5

From fbfcb4859b80aa4c8d31b64f9cc995fb9f18a8f7 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Fri, 18 Oct 2013 13:28:25 -0700
Subject: [PATCH 305/335] Increase buffer size for phantomjs in spiderable. Our
 docs were too big.

---
 History.md                        | 3 +++
 packages/spiderable/spiderable.js | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/History.md b/History.md
index eb777bb624..f569b18a1b 100644
--- a/History.md
+++ b/History.md
@@ -5,6 +5,9 @@
 * Implement `$each`, `$sort`, and `$slice` options for minimongo's `$push`
   modifier.
 
+* Increase the maximum size spiderable will return for a page from 200kB
+  to 5MB.
+
 * Upgraded dependencies:
   * SockJS server from 0.3.7 to 0.3.8
 
diff --git a/packages/spiderable/spiderable.js b/packages/spiderable/spiderable.js
index 9bc8f8118f..0a899f6efc 100644
--- a/packages/spiderable/spiderable.js
+++ b/packages/spiderable/spiderable.js
@@ -19,6 +19,9 @@ Spiderable.userAgentRegExps = [
 
 // how long to let phantomjs run before we kill it
 var REQUEST_TIMEOUT = 15*1000;
+// maximum size of result HTML. node's default is 200k which is too
+// small for our docs.
+var MAX_BUFFER = 5*1024*1024; // 5MB
 
 WebApp.connectHandlers.use(function (req, res, next) {
   if (/\?.*_escaped_fragment_=/.test(req.url) ||
@@ -78,7 +81,7 @@ WebApp.connectHandlers.use(function (req, res, next) {
       ['-c',
        ("exec phantomjs --load-images=no /dev/stdin <<'END'\n" +
         phantomScript + "END\n")],
-      {timeout: REQUEST_TIMEOUT},
+      {timeout: REQUEST_TIMEOUT, maxBuffer: MAX_BUFFER},
       function (error, stdout, stderr) {
         if (!error && /<html/i.test(stdout)) {
           res.writeHead(200, {'Content-Type': 'text/html; charset=UTF-8'});

From 5a8ab31f43aa1a9fcd99e28529de650f84c340d2 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Fri, 18 Oct 2013 14:59:27 -0700
Subject: [PATCH 306/335] Clone Meteor.Errors properly. Fixes #1482.

This fixes #1482 because EJSON.stringify clones its argument; this
change ensures that when it does that, it gets a Meteor.Error rather
than just an Object with some fields from the old Meteor.Error (which,
if the Meteor.Error was passed through a Future, will not include all
the fields we expect because they are not all enumerable).
---
 packages/livedata/livedata_test_service.js | 19 ++++++++++++++++---
 packages/livedata/livedata_tests.js        | 22 +++++++++++++++++++---
 packages/meteor/errors.js                  | 10 ++++++++++
 3 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/packages/livedata/livedata_test_service.js b/packages/livedata/livedata_test_service.js
index 6c472f391b..59efe39972 100644
--- a/packages/livedata/livedata_test_service.js
+++ b/packages/livedata/livedata_test_service.js
@@ -10,9 +10,13 @@ Meteor.methods({
     check(arguments, [Match.Any]);
     return arguments[0];
   },
-  exception: function (where, intended) {
+  exception: function (where, options) {
     check(where, String);
-    check(intended, Match.Optional(Boolean));
+    check(options, Match.Optional({
+      intended: Match.Optional(Boolean),
+      throwThroughFuture: Match.Optional(Boolean)
+    }));
+    options = options || {};
     var shouldThrow =
       (Meteor.isServer && where === "server") ||
       (Meteor.isClient && where === "client") ||
@@ -20,11 +24,20 @@ Meteor.methods({
 
     if (shouldThrow) {
       var e;
-      if (intended)
+      if (options.intended)
         e = new Meteor.Error(999, "Client-visible test exception");
       else
         e = new Error("Test method throwing an exception");
       e.expected = true;
+
+      // We used to improperly serialize errors that were thrown through a
+      // future first.
+      if (Meteor.isServer && options.throwThroughFuture) {
+        var Future = Npm.require('fibers/future');
+        var f = new Future;
+        f['throw'](e);
+        e = f.wait();
+      }
       throw e;
     }
   },
diff --git a/packages/livedata/livedata_tests.js b/packages/livedata/livedata_tests.js
index 0118e4d7e1..3bbd58de7a 100644
--- a/packages/livedata/livedata_tests.js
+++ b/packages/livedata/livedata_tests.js
@@ -216,7 +216,17 @@ testAsyncMulti("livedata - basic method invocation", [
     if (Meteor.isServer) {
       var threw = false;
       try {
-        Meteor.call("exception", "both", true);
+        Meteor.call("exception", "both", {intended: true});
+      } catch (e) {
+        threw = true;
+        test.equal(e.error, 999);
+        test.equal(e.reason, "Client-visible test exception");
+      }
+      test.isTrue(threw);
+      threw = false;
+      try {
+        Meteor.call("exception", "both", {intended: true,
+                                          throwThroughFuture: true});
       } catch (e) {
         threw = true;
         test.equal(e.error, 999);
@@ -227,12 +237,18 @@ testAsyncMulti("livedata - basic method invocation", [
 
     if (Meteor.isClient) {
       test.equal(
-        Meteor.call("exception", "both", true,
+        Meteor.call("exception", "both", {intended: true},
                     expect(failure(test, 999,
                                    "Client-visible test exception"))),
         undefined);
       test.equal(
-        Meteor.call("exception", "server", true,
+        Meteor.call("exception", "server", {intended: true},
+                    expect(failure(test, 999,
+                                   "Client-visible test exception"))),
+        undefined);
+      test.equal(
+        Meteor.call("exception", "server", {intended: true,
+                                            throwThroughFuture: true},
                     expect(failure(test, 999,
                                    "Client-visible test exception"))),
         undefined);
diff --git a/packages/meteor/errors.js b/packages/meteor/errors.js
index cdeb8a5abb..06e315f94b 100644
--- a/packages/meteor/errors.js
+++ b/packages/meteor/errors.js
@@ -79,3 +79,13 @@ Meteor.Error = Meteor.makeErrorType(
     else
       self.message = '[' + self.error + ']';
   });
+
+// Meteor.Error is basically data and is sent over DDP, so you should be able to
+// properly EJSON-clone it. This is especially important because if a
+// Meteor.Error is thrown through a Future, the error, reason, and details
+// properties become non-enumerable so a standard Object clone won't preserve
+// them and they will be lost from DDP.
+Meteor.Error.prototype.clone = function () {
+  var self = this;
+  return new Meteor.Error(self.error, self.reason, self.details);
+};

From dcfd00fe2f51852f68eb944c62b1ae6bb8f4933a Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Fri, 18 Oct 2013 15:39:47 -0700
Subject: [PATCH 307/335] Tests for update/upsert with $push/$each.

Test adapted by mcbain's test from #1492.
---
 History.md                                    |  4 +-
 .../mongo-livedata/mongo_livedata_tests.js    | 52 +++++++++++++++++++
 2 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/History.md b/History.md
index f569b18a1b..480b112b93 100644
--- a/History.md
+++ b/History.md
@@ -3,7 +3,7 @@
 * Fail explicitly when publishing non-cursors.
 
 * Implement `$each`, `$sort`, and `$slice` options for minimongo's `$push`
-  modifier.
+  modifier.  #1492
 
 * Increase the maximum size spiderable will return for a page from 200kB
   to 5MB.
@@ -11,6 +11,8 @@
 * Upgraded dependencies:
   * SockJS server from 0.3.7 to 0.3.8
 
+Patches contributed by GitHub user mcbain.
+
 
 ## v0.6.6.1
 
diff --git a/packages/mongo-livedata/mongo_livedata_tests.js b/packages/mongo-livedata/mongo_livedata_tests.js
index 33877d6218..9e3cd712b1 100644
--- a/packages/mongo-livedata/mongo_livedata_tests.js
+++ b/packages/mongo-livedata/mongo_livedata_tests.js
@@ -1815,3 +1815,55 @@ Tinytest.addAsync("mongo-livedata - local collection with null connection, w/o c
   test.equal(coll1.findOne(doc)._id, docId);
   onComplete();
 });
+
+Tinytest.add("mongo-livedata - update handles $push with $each correctly", function (test) {
+  var collection = new Meteor.Collection(Random.id());
+
+  var id = collection.insert({name: 'jens', elements: ['X', 'Y']});
+
+  var result = collection.update(id, {
+    $push: {
+      elements: {
+        $each: ['A', 'B', 'C'],
+        $slice: -4
+      }}});
+
+  test.equal(collection.findOne(id), {
+    _id: id,
+    name: 'jens',
+    elements: ['Y', 'A', 'B', 'C']
+  });
+});
+
+if (Meteor.isServer) {
+  Tinytest.add("mongo-livedata - upsert handles $push with $each correctly", function (test) {
+    var collection = new Meteor.Collection(Random.id());
+
+    var result = collection.upsert(
+      {name: 'jens'},
+      {$push: {
+        elements: {
+          $each: ['A', 'B', 'C'],
+          $slice: -4
+        }}});
+
+    test.equal(collection.findOne(result.insertedId),
+               {_id: result.insertedId,
+                name: 'jens',
+                elements: ['A', 'B', 'C']});
+
+    var id = collection.insert({name: "david", elements: ['X', 'Y']});
+    result = collection.upsert(
+      {name: 'david'},
+      {$push: {
+        elements: {
+          $each: ['A', 'B', 'C'],
+          $slice: -4
+        }}});
+
+    test.equal(collection.findOne(id),
+               {_id: id,
+                name: 'david',
+                elements: ['Y', 'A', 'B', 'C']});
+  });
+}

From ad64ec17b0cd7ce7e01f57235497675289b101d3 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Fri, 18 Oct 2013 16:00:41 -0700
Subject: [PATCH 308/335] remove duplicated sleep function in tests. Fixes
 #1496.

---
 packages/mongo-livedata/mongo_livedata_tests.js | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/packages/mongo-livedata/mongo_livedata_tests.js b/packages/mongo-livedata/mongo_livedata_tests.js
index 9e3cd712b1..d25464e6ce 100644
--- a/packages/mongo-livedata/mongo_livedata_tests.js
+++ b/packages/mongo-livedata/mongo_livedata_tests.js
@@ -265,15 +265,6 @@ Tinytest.addAsync("mongo-livedata - basics, " + idGeneration, function (test, on
   test.equal(coll.findOne({run: run}, {sort: {x: -1}, skip: 0}).x, 4);
   test.equal(coll.findOne({run: run}, {sort: {x: -1}, skip: 1}).x, 1);
 
-  // sleep function from fibers docs.
-  var sleep = function(ms) {
-    var Fiber = Npm.require('fibers');
-    var fiber = Fiber.current;
-    setTimeout(function() {
-      fiber.run();
-    }, ms);
-    Fiber.yield();
-  };
 
   var cur = coll.find({run: run}, {sort: ["x"]});
   var total = 0;
@@ -291,7 +282,7 @@ Tinytest.addAsync("mongo-livedata - basics, " + idGeneration, function (test, on
       // callback's sleep sleep and the *= 10 will occur before the += 1, then
       // total (at test.equal time) will be 5. If forEach does not wait for the
       // callbacks to complete, then total (at test.equal time) will be 0.
-      sleep(5);
+      Meteor._sleepForMs(5);
     }
     total += doc.x;
     // verify the meteor environment is set up here

From 606a94b41d9589aba906acb6f2ee254a8a784d0a Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Fri, 18 Oct 2013 16:15:17 -0700
Subject: [PATCH 309/335] Calculate settings file hash properly. Fixes #1497.

Previously we were hashing the Unicode string, not the bytes.

This also removes a race condition. Now there is only one use of
watchSet.addFile which does not go through
watch.readAndWatchFile (adding package.js hashes to multiple watch sets
at once), and that use does correctly hash the bytes.
---
 tools/run.js   | 35 ++++++++++++-----------------------
 tools/watch.js |  5 ++++-
 2 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/tools/run.js b/tools/run.js
index fff230daa6..e23abc6ab9 100644
--- a/tools/run.js
+++ b/tools/run.js
@@ -359,18 +359,18 @@ var killServer = function (handle) {
 
 // Also used by "meteor deploy" in meteor.js.
 
-exports.getSettings = function (filename) {
-  var str;
-  try {
-    str = fs.readFileSync(filename, "utf8");
-  } catch (e) {
+exports.getSettings = function (filename, watchSet) {
+  var absPath = path.resolve(filename);
+  var buffer = watch.readAndWatchFile(watchSet, absPath);
+  if (!buffer)
     throw new Error("Could not find settings file " + filename);
-  }
-  if (str.length > 0x10000) {
+  if (buffer.length > 0x10000)
     throw new Error("Settings file must be less than 64 KB long");
-  }
-  // Ensure that the string is parseable in JSON, but there's
-  // no reason to use the object value of it yet.
+
+  var str = buffer.toString('utf8');
+
+  // Ensure that the string is parseable in JSON, but there's no reason to use
+  // the object value of it yet.
   if (str.match(/\S/)) {
     JSON.parse(str);
     return str;
@@ -518,19 +518,8 @@ exports.run = function (context, options) {
 
     // Read the settings file, if any
     var settings = null;
-    if (options.settingsFile) {
-      settings = exports.getSettings(options.settingsFile);
-
-      // 'getSettings' will collapse any amount of whitespace down to
-      // the empty string, so to get the sha1 for change monitoring,
-      // we need to reread the file, which creates a tiny race
-      // condition (not a big enough deal to care about right now.)
-      var settingsHash =
-        Builder.sha1(fs.readFileSync(options.settingsFile, "utf8"));
-
-      // Reload if the setting file changes
-      watchSet.addFile(path.resolve(options.settingsFile), settingsHash);
-    }
+    if (options.settingsFile)
+      settings = exports.getSettings(options.settingsFile, watchSet);
 
     // Start the server
     Status.running = true;
diff --git a/tools/watch.js b/tools/watch.js
index c2007c1f3d..bdf6a6782e 100644
--- a/tools/watch.js
+++ b/tools/watch.js
@@ -501,7 +501,10 @@ var readAndWatchDirectory = function (watchSet, options) {
 var readAndWatchFile = function (watchSet, absPath) {
   var contents = readFile(absPath);
   var hash = contents === null ? null : sha1(contents);
-  watchSet.addFile(absPath, hash);
+  // Allow null watchSet, if we want to use a readFile-style error handling in a
+  // context where we might not always have a WatchSet (eg, reading
+  // settings.json where we watch for "meteor run" but not for "meteor deploy").
+  watchSet && watchSet.addFile(absPath, hash);
   return contents;
 };
 

From 67a7c2786bcd82ea8c048ca25bbf53a70e32d7b3 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Sat, 19 Oct 2013 01:03:50 -0700
Subject: [PATCH 310/335] Don't hash settings file during deploy.

---
 tools/watch.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tools/watch.js b/tools/watch.js
index bdf6a6782e..4ab2c9a6c5 100644
--- a/tools/watch.js
+++ b/tools/watch.js
@@ -500,11 +500,13 @@ var readAndWatchDirectory = function (watchSet, options) {
 
 var readAndWatchFile = function (watchSet, absPath) {
   var contents = readFile(absPath);
-  var hash = contents === null ? null : sha1(contents);
-  // Allow null watchSet, if we want to use a readFile-style error handling in a
+  // Allow null watchSet, if we want to use readFile-style error handling in a
   // context where we might not always have a WatchSet (eg, reading
   // settings.json where we watch for "meteor run" but not for "meteor deploy").
-  watchSet && watchSet.addFile(absPath, hash);
+  if (watchSet) {
+    var hash = contents === null ? null : sha1(contents);
+    watchSet.addFile(absPath, hash);
+  }
   return contents;
 };
 

From 219056f0e83b16d9d52a1c631220ceac95496cdd Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Sat, 19 Oct 2013 01:09:49 -0700
Subject: [PATCH 311/335] History updates.

---
 History.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/History.md b/History.md
index 480b112b93..23a2cc9d13 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,10 @@
 ## vNEXT
 
+* Fix `meteor run` with settings files containing non-ASCII characters.  #1497
+
+* Support `EJSON.clone` for `Meteor.Error`. As a result, they are properly
+  stringified in DDP even if thrown through a `Future`.  #1482
+
 * Fail explicitly when publishing non-cursors.
 
 * Implement `$each`, `$sort`, and `$slice` options for minimongo's `$push`

From f4e21c0d375acc7fb7294c29a394f0968eefb3de Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Sun, 20 Oct 2013 22:02:25 -0700
Subject: [PATCH 312/335] Bump node version from 0.10.20 to 0.10.21 for Meteor
 0.6.6.2 release.

---
 History.md                     | 6 ++++++
 docs/client/concepts.html      | 2 +-
 meteor                         | 2 +-
 scripts/generate-dev-bundle.sh | 2 +-
 tools/bundler.js               | 2 +-
 tools/meteor.js                | 2 +-
 tools/server/boot.js           | 2 +-
 7 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/History.md b/History.md
index 6db60365d5..d0fd8a7b0c 100644
--- a/History.md
+++ b/History.md
@@ -1,10 +1,16 @@
 ## vNEXT
 
+## v0.6.6.2
+
+* Upgrade Node from 0.10.20 to 0.10.21 (security update).
+
+
 ## v0.6.6.1
 
 * Fix file watching on OSX. Work around Node issue #6251 by not using
   fs.watch. #1483
 
+
 ## v0.6.6
 
 #### Security
diff --git a/docs/client/concepts.html b/docs/client/concepts.html
index 375bf90e9c..57dec594cd 100644
--- a/docs/client/concepts.html
+++ b/docs/client/concepts.html
@@ -826,7 +826,7 @@ To get started, run
 This command will generate a fully-contained Node.js application in the form of
 a tarball.  To run this application, you need to provide Node.js 0.10 and a
 MongoDB server.  (The current release of Meteor has been tested with Node
-0.10.20.) You can then run the application by invoking node, specifying the HTTP
+0.10.21.) You can then run the application by invoking node, specifying the HTTP
 port for the application to listen on, and the MongoDB endpoint.  If you don't
 already have a MongoDB server, we can recommend our friends at
 [MongoHQ](http://mongohq.com).
diff --git a/meteor b/meteor
index 8efdb709e8..71057687c1 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-BUNDLE_VERSION=0.3.19
+BUNDLE_VERSION=0.3.23
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.
diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh
index 85b33fdff3..f5134c447b 100755
--- a/scripts/generate-dev-bundle.sh
+++ b/scripts/generate-dev-bundle.sh
@@ -76,7 +76,7 @@ cd node
 # When upgrading node versions, also update the values of MIN_NODE_VERSION at
 # the top of tools/meteor.js and tools/server/boot.js, and the text in
 # docs/client/concepts.html and the README in tools/bundler.js.
-git checkout v0.10.20
+git checkout v0.10.21
 
 ./configure --prefix="$DIR"
 make -j4
diff --git a/tools/bundler.js b/tools/bundler.js
index 30b0459d5b..557c52fb6c 100644
--- a/tools/bundler.js
+++ b/tools/bundler.js
@@ -1443,7 +1443,7 @@ var writeSiteArchive = function (targets, outputPath, options) {
       builder.write('README', { data: new Buffer(
 "This is a Meteor application bundle. It has only one dependency:\n" +
 "Node.js 0.10 (with the 'fibers' package). The current release of Meteor\n" +
-"has been tested with Node 0.10.20. To run the application:\n" +
+"has been tested with Node 0.10.21. To run the application:\n" +
 "\n" +
 "  $ npm install fibers@1.0.1\n" +
 "  $ export MONGO_URL='mongodb://user:password@host:port/databasename'\n" +
diff --git a/tools/meteor.js b/tools/meteor.js
index 7b24fb4167..917221934a 100644
--- a/tools/meteor.js
+++ b/tools/meteor.js
@@ -24,7 +24,7 @@ Fiber(function () {
 
   var Future = require('fibers/future');
   // This code is duplicated in app/server/server.js.
-  var MIN_NODE_VERSION = 'v0.10.20';
+  var MIN_NODE_VERSION = 'v0.10.21';
   if (require('semver').lt(process.version, MIN_NODE_VERSION)) {
     process.stderr.write(
       'Meteor requires Node ' + MIN_NODE_VERSION + ' or later.\n');
diff --git a/tools/server/boot.js b/tools/server/boot.js
index 32859e084b..23f977146e 100644
--- a/tools/server/boot.js
+++ b/tools/server/boot.js
@@ -6,7 +6,7 @@ var _ = require('underscore');
 var sourcemap_support = require('source-map-support');
 
 // This code is duplicated in tools/server/server.js.
-var MIN_NODE_VERSION = 'v0.10.20';
+var MIN_NODE_VERSION = 'v0.10.21';
 if (require('semver').lt(process.version, MIN_NODE_VERSION)) {
   process.stderr.write(
     'Meteor requires Node ' + MIN_NODE_VERSION + ' or later.\n');

From d687d974a038e2baa95bc8539fbdb2927e2b2326 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Mon, 21 Oct 2013 15:25:34 -0700
Subject: [PATCH 313/335] banner and notices for 0.6.6.2

---
 scripts/admin/banner.txt   | 4 ++--
 scripts/admin/notices.json | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/scripts/admin/banner.txt b/scripts/admin/banner.txt
index d80bda39c5..16504fe5e4 100644
--- a/scripts/admin/banner.txt
+++ b/scripts/admin/banner.txt
@@ -1,4 +1,4 @@
-=> Meteor 0.6.6.1: Fix file watching on OSX (work around Node issue #6251)
+=> Meteor 0.6.6.2: Upstream security fix: update to Node 0.10.21.
 
    This is being downloaded in the background. Update your project
-   to Meteor 0.6.6.1 by running 'meteor update'.
+   to Meteor 0.6.6.2 by running 'meteor update'.
diff --git a/scripts/admin/notices.json b/scripts/admin/notices.json
index a575ed522e..30461bf9c8 100644
--- a/scripts/admin/notices.json
+++ b/scripts/admin/notices.json
@@ -43,6 +43,9 @@
   {
     "release": "0.6.4.1"
   },
+  {
+    "release": "0.6.4.2"
+  },
   {
     "release": "0.6.5",
     "notices": [
@@ -54,12 +57,18 @@
   {
     "release": "0.6.5.1"
   },
+  {
+    "release": "0.6.5.2"
+  },
   {
     "release": "0.6.6"
   },
   {
     "release": "0.6.6.1"
   },
+  {
+    "release": "0.6.6.2"
+  },
   {
     "release": "NEXT"
   }

From 11a10421f7064f9c637d3090c2aa84a50cc583f9 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Mon, 21 Oct 2013 16:48:38 -0700
Subject: [PATCH 314/335] bump version number on example and docs

---
 docs/lib/release-override.js         | 2 +-
 examples/leaderboard/.meteor/release | 2 +-
 examples/parties/.meteor/release     | 2 +-
 examples/todos/.meteor/release       | 2 +-
 examples/wordplay/.meteor/release    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/lib/release-override.js b/docs/lib/release-override.js
index 153af4fdb2..274a812997 100644
--- a/docs/lib/release-override.js
+++ b/docs/lib/release-override.js
@@ -1,5 +1,5 @@
 // While galaxy apps are on their own special meteor releases, override
 // Meteor.release here.
 if (Meteor.isClient) {
-  Meteor.release = Meteor.release ? "0.6.6.1" : undefined;
+  Meteor.release = Meteor.release ? "0.6.6.2" : undefined;
 }
diff --git a/examples/leaderboard/.meteor/release b/examples/leaderboard/.meteor/release
index f6895d22a5..b65d3d9aeb 100644
--- a/examples/leaderboard/.meteor/release
+++ b/examples/leaderboard/.meteor/release
@@ -1 +1 @@
-0.6.6.1
+0.6.6.2
diff --git a/examples/parties/.meteor/release b/examples/parties/.meteor/release
index f6895d22a5..b65d3d9aeb 100644
--- a/examples/parties/.meteor/release
+++ b/examples/parties/.meteor/release
@@ -1 +1 @@
-0.6.6.1
+0.6.6.2
diff --git a/examples/todos/.meteor/release b/examples/todos/.meteor/release
index f6895d22a5..b65d3d9aeb 100644
--- a/examples/todos/.meteor/release
+++ b/examples/todos/.meteor/release
@@ -1 +1 @@
-0.6.6.1
+0.6.6.2
diff --git a/examples/wordplay/.meteor/release b/examples/wordplay/.meteor/release
index f6895d22a5..b65d3d9aeb 100644
--- a/examples/wordplay/.meteor/release
+++ b/examples/wordplay/.meteor/release
@@ -1 +1 @@
-0.6.6.1
+0.6.6.2

From daf0a4801a5081293935f05993f76cf059e117fb Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Tue, 22 Oct 2013 16:10:57 -0700
Subject: [PATCH 315/335] Ensure 500 ms of directory watch downtime.

Should help with #1506.

Fingers crossed for an eventual usable fs.watch.
---
 tools/watch.js | 46 ++++++++++++++++++++--------------------------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/tools/watch.js b/tools/watch.js
index 4ab2c9a6c5..511609479a 100644
--- a/tools/watch.js
+++ b/tools/watch.js
@@ -22,7 +22,7 @@ var fiberHelpers = require('./fiber-helpers.js');
 //
 // In a directory watch, you provide an absolute path to a directory,
 // two lists of regular expressions specifying the entries to
-// include and exclude, and an array of which entries to expect
+// include and exclude, and an array of which entries to expect.
 //
 // For directory watches, the regular expressions work as follows. You provide
 // two arrays of regular expressions, an include list and an exclude list. An
@@ -275,7 +275,6 @@ var Watcher = function (options) {
   self.justCheckOnce = !!options._justCheckOnce;
 
   self.fileWatches = []; // array of paths
-  self.directoryWatches = []; // array of interval handles
 
   // We track all of the currently active timers so that we can cancel
   // them at stop() time. This stops the process from hanging at
@@ -292,7 +291,7 @@ var Watcher = function (options) {
   }
 
   self._startFileWatches();
-  self._startDirectoryWatches();
+  self._checkDirectories();
 };
 
 _.extend(Watcher.prototype, {
@@ -403,7 +402,7 @@ _.extend(Watcher.prototype, {
     }, 1000);
   },
 
-  _startDirectoryWatches: function () {
+  _checkDirectories: function (yielding) {
     var self = this;
 
     // fs.watchFile doesn't work for directories (as tested on ubuntu)
@@ -413,11 +412,16 @@ _.extend(Watcher.prototype, {
     // https://github.com/joyent/node/issues/5463
     // https://github.com/joyent/libuv/commit/38df93cf
     //
-    // Instead, just use setInterval. _fireIfDirectoryChanged already
-    // does checking to see if anything really changed. When node has a
-    // stable directory watching API that is more efficient than just
-    // polling, look at the history for this file around release 0.6.5
-    // for a version that uses fs.watch.
+    // Instead, just check periodically with setTimeout.  (We use setTimeout to
+    // ensure that there is a 500 ms pause between the *end* of one poll cycle
+    // and the *beginning* of another instead of using setInterval which still
+    // can lead to permanent 100% CPU usage.) When node has a stable directory
+    // watching API that is more efficient than just polling, look at the
+    // history for this file around release 0.6.5 for a version that uses
+    // fs.watch.
+
+    if (self.stopped)
+      return;
 
     _.each(self.watchSet.directories, function (info) {
       if (self.stopped)
@@ -425,19 +429,15 @@ _.extend(Watcher.prototype, {
 
       // Check for the case where by the time we created the watch, the
       // directory has already changed.
-      if (self._fireIfDirectoryChanged(info))
+      if (self._fireIfDirectoryChanged(info, yielding))
         return;
-
-      if (self.stopped || self.justCheckOnce)
-        return;
-
-      // Notice that we poll very frequently (500 ms)
-      self.directoryWatches.push(
-        setInterval(fiberHelpers.inFiber(function () {
-          self._fireIfDirectoryChanged(info, true);
-        }), 500)
-      );
     });
+
+    if (!self.stopped && !self.justCheckOnce) {
+      setTimeout(fiberHelpers.inFiber(function () {
+        self._checkDirectories(true);
+      }), 500);
+    }
   },
 
   _fire: function () {
@@ -465,12 +465,6 @@ _.extend(Watcher.prototype, {
       fs.unwatchFile(absPath);
     });
     self.fileWatches = [];
-
-    // Clean up directory watches
-    _.each(self.directoryWatches, function (watch) {
-      clearInterval(watch);
-    });
-    self.directoryWatches = [];
   }
 });
 

From 9ab15d4c291f78f643208562a1afd38ae962c88a Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Tue, 22 Oct 2013 16:59:06 -0700
Subject: [PATCH 316/335] Bundler failures should cause non-zero exit code.

Fixes #1515.
---
 tools/run.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/run.js b/tools/run.js
index e23abc6ab9..9382f9ce31 100644
--- a/tools/run.js
+++ b/tools/run.js
@@ -511,6 +511,8 @@ exports.run = function (context, options) {
     if (bundleResult.errors) {
       logToClients({stdout: "=> Errors prevented startup:\n\n" +
                     bundleResult.errors.formatMessages()});
+      // Ensure that if we are running under --once, we exit with a non-0 code.
+      Status.code = 1;
       Status.hardCrashed("has errors");
       startWatching(watchSet);
       return;

From da4ed0697c21d8e2f57ac81237e6dc46dde7148d Mon Sep 17 00:00:00 2001
From: Naomi Seyfer <naomi@meteor.com>
Date: Thu, 22 Aug 2013 11:34:13 -0700
Subject: [PATCH 317/335] Library to follow the leader

---
 packages/follower-livedata/.gitignore  |   1 +
 packages/follower-livedata/follower.js | 128 +++++++++++++++++++++++++
 packages/follower-livedata/package.js  |   9 ++
 3 files changed, 138 insertions(+)
 create mode 100644 packages/follower-livedata/.gitignore
 create mode 100644 packages/follower-livedata/follower.js
 create mode 100644 packages/follower-livedata/package.js

diff --git a/packages/follower-livedata/.gitignore b/packages/follower-livedata/.gitignore
new file mode 100644
index 0000000000..677a6fc263
--- /dev/null
+++ b/packages/follower-livedata/.gitignore
@@ -0,0 +1 @@
+.build*
diff --git a/packages/follower-livedata/follower.js b/packages/follower-livedata/follower.js
new file mode 100644
index 0000000000..cd979c5547
--- /dev/null
+++ b/packages/follower-livedata/follower.js
@@ -0,0 +1,128 @@
+Follower = {
+
+  connect: function (urlSet) {
+    if (typeof urlSet === 'string') {
+      urlSet = _.map(urlSet.split(','), function (url) {return url.trim();});
+    }
+    var electorTries = {};
+    // start each elector as untried/assumed connectable.
+    _.each(urlSet, function (url) {
+      electorTries[url] = 0;
+    });
+    var tryingUrl = null;
+    var conn = null;
+    var leader = null;
+    var connected = null;
+    var intervalHandle = null;
+
+    var findFewestTries = function () {
+      var min = 10000;
+      var minElector = null;
+      _.each(electorTries, function (tries, elector) {
+        if (tries < min) {
+          min = tries;
+          minElector = elector;
+        }
+      });
+      return minElector;
+    };
+
+    var updateElectorate = function (res) {
+      leader = res.leader;
+      _.each(electorTries, function (state, elector) {
+        if (!_.contains(res.electorate, elector)) {
+          delete electorTries[elector];
+        }
+      });
+      _.each(res.electorate, function (elector) {
+        if (typeof electorTries[elector] === 'undefined') {
+          electorTries[elector] = 0; // we haven't heard of this elector yet.
+        }
+      });
+    };
+
+    var tryElector = function (url) {
+      url = url || findFewestTries();
+      if (conn) {
+        conn._reconnectImpl({
+          url: url
+        });
+      } else {
+        conn = DDP.connect(url);
+        conn._reconnectImpl = conn.reconnect;
+      }
+
+      if (tryingUrl) {
+        electorTries[tryingUrl]++;
+      } else {
+        tryingUrl = url;
+        conn.call('getElectorate', function (err, res) {
+          connected = tryingUrl;
+          tryingUrl = null;
+          if (err) {
+            electorTries[url]++;
+            return;
+          }
+          // we got an answer!  Connected!
+          electorTries[url] = 0;
+          if (res.leader === url) {
+            // we're good.
+
+          } else {
+            // let's connect to the leader anyway, if we think it
+            // is connectable.
+            if (electorTries[res.leader] == 0) {
+              tryElector(res.leader);
+
+            } else {
+              // XXX: leader is probably down, we're probably going to elect
+              // soon.  Wait for the next round.
+            }
+
+          }
+          updateElectorate(res);
+        });
+      };
+    };
+
+    tryElector();
+
+
+    var monitorConnection = function () {
+      return Meteor.setInterval(function () {
+        if (conn.status().status !== 'connected' || connected !== leader) {
+          tryElector();
+        } else {
+          conn.call('getElectorate', function (err, res) {
+            if (err) {
+              electorTries[connected]++;
+              tryElector();
+            } else {
+              updateElectorate(res);
+            }
+          });
+        }
+      }, 5*1000); // every 5 seconds
+    };
+
+    intervalHandle = monitorConnection();
+
+
+    var prevDisconnect = conn.disconnect;
+    conn.disconnect = function () {
+      if (intervalHandle)
+        Meteor.clearInterval(intervalHandle);
+      intervalHandle = null;
+      prevDisconnect.apply(conn);
+    };
+
+    conn.reconnect = function () {
+      if (!intervalHandle)
+        intervalHandle = monitorConnection();
+      conn._reconnectImpl.apply(conn, arguments);
+    };
+
+    return conn;
+
+  }
+};
diff --git a/packages/follower-livedata/package.js b/packages/follower-livedata/package.js
new file mode 100644
index 0000000000..d890785b06
--- /dev/null
+++ b/packages/follower-livedata/package.js
@@ -0,0 +1,9 @@
+Package.describe({
+  summary: "Maintain a connection to the leader of an election set"
+});
+
+Package.on_use(function (api) {
+  api.use(['underscore', 'livedata', 'ejson']);
+  api.add_files(['follower.js'], 'server');
+  api.export('Follower');
+});

From 334fbd23f03f7d10e398db37b3635cd899c9f36a Mon Sep 17 00:00:00 2001
From: Naomi Seyfer <naomi@meteor.com>
Date: Fri, 30 Aug 2013 15:43:15 -0700
Subject: [PATCH 318/335] follower to connect to ultraworld

---
 packages/application-configuration/config.js  |  2 +-
 packages/application-configuration/package.js |  2 +-
 packages/follower-livedata/follower.js        | 16 +++++++++++-----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/packages/application-configuration/config.js b/packages/application-configuration/config.js
index 26eaa07534..5b1e7190f9 100644
--- a/packages/application-configuration/config.js
+++ b/packages/application-configuration/config.js
@@ -8,7 +8,7 @@ AppConfig.findGalaxy = _.once(function () {
     return null;
   }
 
-  return DDP.connect(process.env.ULTRAWORLD_DDP_ENDPOINT || process.env.GALAXY);
+  return Follower.connect(process.env.ULTRAWORLD_DDP_ENDPOINT || process.env.GALAXY);
 });
 
 
diff --git a/packages/application-configuration/package.js b/packages/application-configuration/package.js
index fcb26ee524..e9fd3ead21 100644
--- a/packages/application-configuration/package.js
+++ b/packages/application-configuration/package.js
@@ -4,7 +4,7 @@ Package.describe({
 });
 
 Package.on_use(function (api) {
-  api.use(['underscore', 'livedata', 'ejson']);
+  api.use(['underscore', 'livedata', 'ejson', 'follower-livedata']);
   api.use(['mongo-livedata'], {
     unordered: true
   });
diff --git a/packages/follower-livedata/follower.js b/packages/follower-livedata/follower.js
index cd979c5547..e9334ba36b 100644
--- a/packages/follower-livedata/follower.js
+++ b/packages/follower-livedata/follower.js
@@ -87,9 +87,7 @@ Follower = {
 
     tryElector();
 
-
-    var monitorConnection = function () {
-      return Meteor.setInterval(function () {
+    var checkConnection = function () {
         if (conn.status().status !== 'connected' || connected !== leader) {
           tryElector();
         } else {
@@ -102,7 +100,10 @@ Follower = {
             }
           });
         }
-      }, 5*1000); // every 5 seconds
+    };
+
+    var monitorConnection = function () {
+      return Meteor.setInterval(checkConnection, 5*1000); // every 5 seconds
     };
 
     intervalHandle = monitorConnection();
@@ -119,7 +120,12 @@ Follower = {
     conn.reconnect = function () {
       if (!intervalHandle)
         intervalHandle = monitorConnection();
-      conn._reconnectImpl.apply(conn, arguments);
+      if (arguments[0] && arguments[0].url) {
+        electorTries[arguments[0].url] = 0;
+        tryElector(arguments[0].url);
+      } else {
+        conn._reconnectImpl.apply(conn, arguments);
+      }
     };
 
     return conn;

From 37ad55aaea7f2976a9338a6d1a83089f2ab5cb08 Mon Sep 17 00:00:00 2001
From: Naomi Seyfer <naomi@meteor.com>
Date: Fri, 30 Aug 2013 19:53:25 -0700
Subject: [PATCH 319/335] Followership reconnects correctly

---
 packages/follower-livedata/follower.js | 22 ++++++++++++++--------
 packages/webapp/package.js             |  2 +-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/packages/follower-livedata/follower.js b/packages/follower-livedata/follower.js
index e9334ba36b..55c2dc4407 100644
--- a/packages/follower-livedata/follower.js
+++ b/packages/follower-livedata/follower.js
@@ -1,14 +1,19 @@
 Follower = {
 
   connect: function (urlSet) {
-    if (typeof urlSet === 'string') {
-      urlSet = _.map(urlSet.split(','), function (url) {return url.trim();});
-    }
-    var electorTries = {};
+
+    var electorTries;
     // start each elector as untried/assumed connectable.
-    _.each(urlSet, function (url) {
-      electorTries[url] = 0;
-    });
+    var makeElectorTries = function (urlSet) {
+      electorTries = {};
+      if (typeof urlSet === 'string') {
+        urlSet = _.map(urlSet.split(','), function (url) {return url.trim();});
+      }
+      _.each(urlSet, function (url) {
+        electorTries[url] = 0;
+      });
+    };
+    makeElectorTries(urlSet);
     var tryingUrl = null;
     var conn = null;
     var leader = null;
@@ -43,6 +48,7 @@ Follower = {
 
     var tryElector = function (url) {
       url = url || findFewestTries();
+      console.log("trying", url, electorTries);
       if (conn) {
         conn._reconnectImpl({
           url: url
@@ -121,7 +127,7 @@ Follower = {
       if (!intervalHandle)
         intervalHandle = monitorConnection();
       if (arguments[0] && arguments[0].url) {
-        electorTries[arguments[0].url] = 0;
+        makeElectorTries(arguments[0].url);
         tryElector(arguments[0].url);
       } else {
         conn._reconnectImpl.apply(conn, arguments);
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 64df6f0886..9fe9732e0a 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -8,7 +8,7 @@ Npm.depends({connect: "2.9.0",
              useragent: "2.0.7"});
 
 Package.on_use(function (api) {
-  api.use(['logging', 'underscore', 'routepolicy'], 'server');
+  api.use(['livedata', 'logging', 'underscore', 'routepolicy'], 'server');
   api.use(['application-configuration'], {
     unordered: true
   });

From e14b18eb09b87b44eef2af7b40aeca9bc18c6e19 Mon Sep 17 00:00:00 2001
From: Naomi Seyfer <naomi@meteor.com>
Date: Tue, 3 Sep 2013 17:16:22 -0700
Subject: [PATCH 320/335] Actually resolve circular dependency

---
 packages/webapp/package.js       | 4 ++--
 packages/webapp/webapp_server.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 9fe9732e0a..fdfc9a11b9 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -8,8 +8,8 @@ Npm.depends({connect: "2.9.0",
              useragent: "2.0.7"});
 
 Package.on_use(function (api) {
-  api.use(['livedata', 'logging', 'underscore', 'routepolicy'], 'server');
-  api.use(['application-configuration'], {
+  api.use(['logging', 'underscore', 'routepolicy'], 'server');
+  api.use(['application-configuration', 'livedata'], {
     unordered: true
   });
   // At response serving time, webapp uses browser-policy if it is loaded. If
diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js
index 2e72e366ed..1e7deb5fe3 100644
--- a/packages/webapp/webapp_server.js
+++ b/packages/webapp/webapp_server.js
@@ -498,7 +498,7 @@ WebAppInternals.bindToProxy = function (proxyConfig) {
 
   // This is run after packages are loaded (in main) so we can use
   // DDP.connect.
-  var proxy = DDP.connect(proxyConfig.proxyEndpoint);
+  var proxy = Package.livedata.DDP.connect(proxyConfig.proxyEndpoint);
   var route = process.env.ROUTE;
   var host = route.split(":")[0];
   var port = +route.split(":")[1];

From 4e16bf498eb98f3c4004a016a2eb71968e4ca57d Mon Sep 17 00:00:00 2001
From: Naomi Seyfer <naomi@meteor.com>
Date: Thu, 5 Sep 2013 12:04:54 -0700
Subject: [PATCH 321/335] allow setting priorities on electors

---
 packages/follower-livedata/follower.js | 41 +++++++++++++++++++++-----
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/packages/follower-livedata/follower.js b/packages/follower-livedata/follower.js
index 55c2dc4407..0634195602 100644
--- a/packages/follower-livedata/follower.js
+++ b/packages/follower-livedata/follower.js
@@ -1,19 +1,40 @@
+var fs = Npm.require('fs');
+
+var readFile = Meteor._wrapAsync(fs.readFile);
+
+var writeFile = Meteor._wrapAsync(fs.writeFile);
+
 Follower = {
 
-  connect: function (urlSet) {
-
+  connect: function (urlSet, options) {
     var electorTries;
+    options = options || {};
     // start each elector as untried/assumed connectable.
-    var makeElectorTries = function (urlSet) {
-      electorTries = {};
+
+    // for options.priority, low-priority things are tried first.
+    var makeElectorTries = function (urlSet, options) {
+      if (options.reset || !electorTries)
+        electorTries = {};
       if (typeof urlSet === 'string') {
         urlSet = _.map(urlSet.split(','), function (url) {return url.trim();});
       }
       _.each(urlSet, function (url) {
-        electorTries[url] = 0;
+        electorTries[url] = options.priority || 0;
       });
     };
-    makeElectorTries(urlSet);
+    if (options.file) {
+      var contents;
+      try {
+        contents = readFile(options.file, 'utf8');
+      } catch (e) {
+        console.log("no file to read electors out of");
+      }
+      if (contents)
+        makeElectorTries(contents, { priority: 0, reset: true });
+      makeElectorTries(urlSet, {priority: 1, reset: false});
+    } else {
+      makeElectorTries(urlSet, { priority: 0, reset: true });
+    }
     var tryingUrl = null;
     var conn = null;
     var leader = null;
@@ -44,11 +65,14 @@ Follower = {
           electorTries[elector] = 0; // we haven't heard of this elector yet.
         }
       });
+      if (options.file) {
+        writeFile(options.file, res.electorate.join(','), 'utf8');
+      }
     };
 
     var tryElector = function (url) {
       url = url || findFewestTries();
-      console.log("trying", url, electorTries);
+      console.log("trying", url, electorTries, tryingUrl);
       if (conn) {
         conn._reconnectImpl({
           url: url
@@ -60,6 +84,7 @@ Follower = {
 
       if (tryingUrl) {
         electorTries[tryingUrl]++;
+        tryingUrl = url;
       } else {
         tryingUrl = url;
         conn.call('getElectorate', function (err, res) {
@@ -127,7 +152,7 @@ Follower = {
       if (!intervalHandle)
         intervalHandle = monitorConnection();
       if (arguments[0] && arguments[0].url) {
-        makeElectorTries(arguments[0].url);
+        makeElectorTries(arguments[0].url, {reset: true, priority: 0});
         tryElector(arguments[0].url);
       } else {
         conn._reconnectImpl.apply(conn, arguments);

From 4abd2a2d6c8ca0e6a0345fa1f3291e93b982528e Mon Sep 17 00:00:00 2001
From: Naomi Seyfer <naomi@meteor.com>
Date: Fri, 6 Sep 2013 18:33:32 -0700
Subject: [PATCH 322/335] Add some state machine goodness to ctl

---
 packages/ctl-helper/ctl-helper.js      |  24 +++-
 packages/ctl/ctl.js                    | 166 ++++++++++++++-----------
 packages/follower-livedata/follower.js |   7 +-
 packages/meteor/fiber_helpers.js       |  20 +--
 4 files changed, 133 insertions(+), 84 deletions(-)

diff --git a/packages/ctl-helper/ctl-helper.js b/packages/ctl-helper/ctl-helper.js
index 3e43e5fec3..9375724dad 100644
--- a/packages/ctl-helper/ctl-helper.js
+++ b/packages/ctl-helper/ctl-helper.js
@@ -3,6 +3,9 @@ var Future = Npm.require('fibers/future');
 
 Ctl = {};
 
+var connection;
+var checkConnection;
+
 _.extend(Ctl, {
   Commands: [],
 
@@ -22,6 +25,7 @@ _.extend(Ctl, {
       cmdName = argv._.splice(0,1)[0];
 
     Ctl.findCommand(cmdName).func(argv);
+    Ctl.disconnect();
     return 0;
   },
 
@@ -42,9 +46,27 @@ _.extend(Ctl, {
       process.exit(1);
     }
 
-    return DDP.connect(process.env['GALAXY']);
+    connection = DDP.connect(process.env['GALAXY']);
+    checkConnection = Meteor.setInterval(function () {
+      if (Ctl.findGalaxy().status().status !== "connected" &&
+          Ctl.findGalaxy().status().retryCount > 2) {
+        console.log("Cannot connect to galaxy; exiting");
+        process.exit(3);
+      }
+    }, 2*1000);
+    return connection;
   }),
 
+  disconnect: function () {
+    if (connection) {
+      connection.disconnect();
+    }
+    if (checkConnection) {
+      Meteor.clearInterval(checkConnection);
+      checkConnection = null;
+    }
+  },
+
   jobsCollection: _.once(function () {
     return new Meteor.Collection("jobs", {manager: Ctl.findGalaxy()});
   }),
diff --git a/packages/ctl/ctl.js b/packages/ctl/ctl.js
index 1d0c69bae0..d5374e3def 100644
--- a/packages/ctl/ctl.js
+++ b/packages/ctl/ctl.js
@@ -23,93 +23,109 @@ var mergeObjects = function (obj1, obj2) {
   return result;
 };
 
+var startFun = function (argv) {
+  if (argv.help || argv._.length !== 0) {
+    process.stderr.write(
+      "Usage: ctl start\n" +
+        "\n" +
+        "Starts the app. For now, this just means that it runs the 'server'\n" +
+        "program.\n"
+    );
+    process.exit(1);
+  }
+
+  var numServers = Ctl.getJobsByApp(
+    Ctl.myAppName(), {program: 'server', done: false}).count();
+  if (numServers === 0) {
+    var appConfig = Ctl.prettyCall(
+      Ctl.findGalaxy(), 'getAppConfiguration', [Ctl.myAppName()]);
+
+    var proxyConfig;
+    var bindPathPrefix = "";
+    if (appConfig.admin) {
+      bindPathPrefix = "/" + Ctl.myAppName();
+    }
+
+
+    // XXX args? env?
+    Ctl.prettyCall(Ctl.findGalaxy(), 'run', [Ctl.myAppName(), 'server', {
+      exitPolicy: 'restart',
+      env: {
+        ROOT_URL: "https://" + appConfig.sitename + bindPathPrefix,
+        METEOR_SETTINGS: appConfig.METEOR_SETTINGS,
+        ADMIN_APP: appConfig.admin //TODO: When apps have admin & non-admin sides, set this based on that.
+      },
+      ports: {
+        "main": {
+          bindEnv: "PORT",
+          routeEnv: "ROUTE"//,
+          //bindIpEnv: "BIND_IP" // Later, we can teach Satellite to do
+          //something like recommend the process bind to a particular IP here.
+          //For now, we don't have a way of setting this, so Satellite binds
+          //to 0.0.0.0
+        }
+      },
+      tags: ["runner"]
+    }]);
+    console.log("Started a server.");
+  } else {
+    console.log("Server already running.");
+  }
+};
 
 Ctl.Commands.push({
   name: "start",
   help: "Start this app",
-  func: function (argv) {
-    if (argv.help || argv._.length !== 0) {
-      process.stderr.write(
-"Usage: ctl start\n" +
- "\n" +
-"Starts the app. For now, this just means that it runs the 'server'\n" +
-"program.\n"
-);
-      process.exit(1);
-    }
-
-    var numServers = Ctl.getJobsByApp(
-      Ctl.myAppName(), {program: 'server', done: false}).count();
-    if (numServers === 0) {
-      var appConfig = Ctl.prettyCall(
-        Ctl.findGalaxy(), 'getAppConfiguration', [Ctl.myAppName()]);
-
-      var proxyConfig;
-      var bindPathPrefix = "";
-      if (appConfig.admin) {
-        bindPathPrefix = "/" + Ctl.myAppName();
-      }
-
-
-      // XXX args? env?
-      Ctl.prettyCall(Ctl.findGalaxy(), 'run', [Ctl.myAppName(), 'server', {
-        exitPolicy: 'restart',
-        env: {
-          ROOT_URL: "https://" + appConfig.sitename + bindPathPrefix,
-          METEOR_SETTINGS: appConfig.METEOR_SETTINGS,
-          ADMIN_APP: appConfig.admin //TODO: When apps have admin & non-admin sides, set this based on that.
-        },
-        ports: {
-          "main": {
-            bindEnv: "PORT",
-            routeEnv: "ROUTE"//,
-            //bindIpEnv: "BIND_IP" // Later, we can teach Satellite to do
-            //something like recommend the process bind to a particular IP here.
-            //For now, we don't have a way of setting this, so Satellite binds
-            //to 0.0.0.0
-          }
-        },
-        tags: ["runner"]
-      }]);
-      console.log("Started a server.");
-    } else {
-      console.log("Server already running.");
-    }
-  }
+  func: startFun
 });
 
+
+Ctl.Commands.push({
+  name: "endUpdate",
+  help: "Start this app to end an update",
+  func: startFun
+});
+
+var stopFun =  function (argv) {
+  if (argv.help || argv._.length !== 0) {
+    process.stderr.write(
+      "Usage: ctl stop\n" +
+        "\n" +
+        "Stops the app. For now, this just means that it kills all jobs\n" +
+        "other than itself.\n"
+    );
+    process.exit(1);
+  }
+
+  // Get all jobs (other than this job: don't commit suicide!) that are not
+  // already killed.
+  var jobs = Ctl.getJobsByApp(
+    Ctl.myAppName(), {_id: {$ne: Ctl.myJobId()}, done: false});
+  jobs.forEach(function (job) {
+    // Don't commit suicide.
+    if (job._id === Ctl.myJobId())
+      return;
+    // It's dead, Jim.
+    if (job.done)
+      return;
+    Ctl.kill(job.program, job._id);
+  });
+  console.log("Server stopped.");
+};
+
 Ctl.Commands.push({
   name: "stop",
   help: "Stop this app",
-  func: function (argv) {
-    if (argv.help || argv._.length !== 0) {
-      process.stderr.write(
-"Usage: ctl stop\n" +
- "\n" +
-"Stops the app. For now, this just means that it kills all jobs\n" +
-"other than itself.\n"
-);
-      process.exit(1);
-    }
-
-    // Get all jobs (other than this job: don't commit suicide!) that are not
-    // already killed.
-    var jobs = Ctl.getJobsByApp(
-      Ctl.myAppName(), {_id: {$ne: Ctl.myJobId()}, done: false});
-    jobs.forEach(function (job) {
-      // Don't commit suicide.
-      if (job._id === Ctl.myJobId())
-        return;
-      // It's dead, Jim.
-      if (job.done)
-        return;
-      Ctl.kill(job.program, job._id);
-    });
-    console.log("Server stopped.");
-  }
+  func: stopFun
 });
 
 
+Ctl.Commands.push({
+  name: "beginUpdate",
+  help: "Stop this app to begin an update",
+  func: stopFun
+});
+
 Ctl.Commands.push({
   name: "scale",
   help: "Scale jobs",
diff --git a/packages/follower-livedata/follower.js b/packages/follower-livedata/follower.js
index 0634195602..f734277846 100644
--- a/packages/follower-livedata/follower.js
+++ b/packages/follower-livedata/follower.js
@@ -72,7 +72,7 @@ Follower = {
 
     var tryElector = function (url) {
       url = url || findFewestTries();
-      console.log("trying", url, electorTries, tryingUrl);
+      //console.log("trying", url, electorTries, tryingUrl);
       if (conn) {
         conn._reconnectImpl({
           url: url
@@ -127,6 +127,7 @@ Follower = {
               electorTries[connected]++;
               tryElector();
             } else {
+              //console.log("updating electorate with", res);
               updateElectorate(res);
             }
           });
@@ -159,6 +160,10 @@ Follower = {
       }
     };
 
+    conn.getUrl = function () {
+      return _.keys(electorTries).join(',');
+    };
+
     return conn;
 
   }
diff --git a/packages/meteor/fiber_helpers.js b/packages/meteor/fiber_helpers.js
index 4c42e73391..c071674e91 100644
--- a/packages/meteor/fiber_helpers.js
+++ b/packages/meteor/fiber_helpers.js
@@ -69,10 +69,15 @@ _.extend(Meteor._SynchronousQueue.prototype, {
     }
 
     var fut = new Future;
-    self._taskHandles.push({task: Meteor.bindEnvironment(task, function (e) {
-      Meteor._debug("Exception from task:", e ? e.stack : e);
-      throw e;
-    }), future: fut});
+    var handle = {
+      task: Meteor.bindEnvironment(task, function (e) {
+        Meteor._debug("Exception from task:", e ? e.stack : e);
+        throw e;
+      }),
+      future: fut,
+      name: task.name
+    };
+    self._taskHandles.push(handle);
     self._scheduleRun();
     // Yield. We'll get back here after the task is run (and will throw if the
     // task throws).
@@ -80,7 +85,10 @@ _.extend(Meteor._SynchronousQueue.prototype, {
   },
   queueTask: function (task) {
     var self = this;
-    self._taskHandles.push({task: task});
+    self._taskHandles.push({
+      task: task,
+      name: task.name
+    });
     self._scheduleRun();
     // No need to block.
   },
@@ -110,13 +118,11 @@ _.extend(Meteor._SynchronousQueue.prototype, {
 
   _scheduleRun: function () {
     var self = this;
-
     // Already running or scheduled? Do nothing.
     if (self._runningOrRunScheduled)
       return;
 
     self._runningOrRunScheduled = true;
-
     process.nextTick(function () {
       Fiber(function () {
         self._run();

From 7445056f43a5ab6833e7ed6e75bdfcc82e3c7bfa Mon Sep 17 00:00:00 2001
From: Naomi Seyfer <naomi@meteor.com>
Date: Wed, 11 Sep 2013 11:49:50 -0700
Subject: [PATCH 323/335] ctl to use follower

---
 packages/ctl-helper/ctl-helper.js | 2 +-
 packages/ctl-helper/package.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/ctl-helper/ctl-helper.js b/packages/ctl-helper/ctl-helper.js
index 9375724dad..2ad92e2578 100644
--- a/packages/ctl-helper/ctl-helper.js
+++ b/packages/ctl-helper/ctl-helper.js
@@ -46,7 +46,7 @@ _.extend(Ctl, {
       process.exit(1);
     }
 
-    connection = DDP.connect(process.env['GALAXY']);
+    connection = Follower.connect(process.env['ULTRAWORLD_DDP_ENDPOINT']);
     checkConnection = Meteor.setInterval(function () {
       if (Ctl.findGalaxy().status().status !== "connected" &&
           Ctl.findGalaxy().status().retryCount > 2) {
diff --git a/packages/ctl-helper/package.js b/packages/ctl-helper/package.js
index d72a7f5180..01a93e9fd2 100644
--- a/packages/ctl-helper/package.js
+++ b/packages/ctl-helper/package.js
@@ -6,7 +6,7 @@ Package.describe({
 Npm.depends({optimist: '0.6.0'});
 
 Package.on_use(function (api) {
-  api.use(['underscore', 'livedata', 'mongo-livedata'], 'server');
+  api.use(['underscore', 'livedata', 'mongo-livedata', 'follower-livedata'], 'server');
   api.export('Ctl', 'server');
   api.add_files('ctl-helper.js', 'server');
 });

From 3f4fc7a9ccfb98bd599a1a9f6fbcb0f6d3360f66 Mon Sep 17 00:00:00 2001
From: Naomi Seyfer <naomi@meteor.com>
Date: Wed, 18 Sep 2013 12:13:41 -0700
Subject: [PATCH 324/335] Allow config package to export app collection

---
 packages/application-configuration/config.js | 15 ++++++++-------
 packages/webapp/webapp_server.js             |  3 ++-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/application-configuration/config.js b/packages/application-configuration/config.js
index 5b1e7190f9..f7054ab3ac 100644
--- a/packages/application-configuration/config.js
+++ b/packages/application-configuration/config.js
@@ -7,19 +7,14 @@ AppConfig.findGalaxy = _.once(function () {
   if (!('GALAXY' in process.env || 'ULTRAWORLD_DDP_ENDPOINT' in process.env)) {
     return null;
   }
-
   return Follower.connect(process.env.ULTRAWORLD_DDP_ENDPOINT || process.env.GALAXY);
 });
 
-
-// TODO: Eventually, keep track of the replica set, and generally be conected to the
-// leader.  Waiting on actually having that concept implemented in ultraworld.
 var ultra = AppConfig.findGalaxy();
 
 var subFuture = new Future();
 if (ultra)
   ultra.subscribe("oneApp", process.env.GALAXY_APP, subFuture.resolver());
-
 var OneAppApps;
 var Services;
 var collectionFuture = new Future();
@@ -37,6 +32,12 @@ Meteor.startup(function () {
   }
 });
 
+// XXX: Remove this once we allow the same collection to be new'd from multiple
+// places.
+AppConfig._getAppCollection = function () {
+  collectionFuture.wait();
+  return OneAppApps;
+};
 
 var staticAppConfig;
 
@@ -73,7 +74,7 @@ AppConfig.getAppConfig = function () {
     return staticAppConfig;
   }
   subFuture.wait();
-  var myApp = OneAppApps.findOne();
+  var myApp = OneAppApps.findOne(process.env.GALAXY_APP);
   if (myApp)
     return myApp.config;
   throw new Error("there is no app config for this app");
@@ -102,7 +103,7 @@ AppConfig.configurePackage = function (packageName, configure) {
     // there's a Meteor.startup() that produces the various collections, make
     // sure it runs first before we continue.
     collectionFuture.wait();
-    subHandle = OneAppApps.find().observe({
+    subHandle = OneAppApps.find(process.env.GALAXY_APP).observe({
       added: configureIfDifferent,
       changed: configureIfDifferent
     });
diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js
index 1e7deb5fe3..2d84f182e7 100644
--- a/packages/webapp/webapp_server.js
+++ b/packages/webapp/webapp_server.js
@@ -429,7 +429,8 @@ var runWebAppServer = function () {
         if (proxyBinding)
           proxyBinding.stop();
         if (configuration && configuration.proxy) {
-          proxyBinding = AppConfig.configureService(configuration.proxyServiceName || "proxy", function (proxyService) {
+          proxyBinding = AppConfig.configureService(configuration.proxyServiceName ||
+                                                    "proxy", function (proxyService) {
             if (proxyService.providers.proxy) {
               var proxyConf;
               if (process.env.ADMIN_APP) {

From c6748f97922b2d177f3dadadab95dfc5200c8504 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Tue, 17 Sep 2013 18:43:31 -0700
Subject: [PATCH 325/335] Prefer new appConfig.settings in ctl.

---
 packages/ctl/ctl.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/ctl/ctl.js b/packages/ctl/ctl.js
index d5374e3def..031fe5fb36 100644
--- a/packages/ctl/ctl.js
+++ b/packages/ctl/ctl.js
@@ -46,13 +46,20 @@ var startFun = function (argv) {
       bindPathPrefix = "/" + Ctl.myAppName();
     }
 
+    // Allow appConfig settings to be objects or strings. We need to stringify
+    // them to pass them to the app in the env var.
+    // Backwards compat with old app config format.
+    _.each(["settings", "METEOR_SETTINGS"], function (settingsKey) {
+      if (appConfig[settingsKey] && typeof appConfig[settingsKey] === "object")
+        appConfig[settingsKey] = JSON.stringify(appConfig[settingsKey]);
+    });
 
     // XXX args? env?
     Ctl.prettyCall(Ctl.findGalaxy(), 'run', [Ctl.myAppName(), 'server', {
       exitPolicy: 'restart',
       env: {
         ROOT_URL: "https://" + appConfig.sitename + bindPathPrefix,
-        METEOR_SETTINGS: appConfig.METEOR_SETTINGS,
+        METEOR_SETTINGS: appConfig.settings || appConfig.METEOR_SETTINGS,
         ADMIN_APP: appConfig.admin //TODO: When apps have admin & non-admin sides, set this based on that.
       },
       ports: {

From a31f380687785da06a85d25f21cd8ba7b0c13bf8 Mon Sep 17 00:00:00 2001
From: Slava Kim <slava@meteor.com>
Date: Thu, 19 Sep 2013 15:05:20 -0700
Subject: [PATCH 326/335] lastStarted is always a number

---
 packages/webapp/webapp_server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js
index 2d84f182e7..7a8c210aba 100644
--- a/packages/webapp/webapp_server.js
+++ b/packages/webapp/webapp_server.js
@@ -487,7 +487,7 @@ WebAppInternals.bindToProxy = function (proxyConfig) {
   // XXX rename pid argument to bindTo.
   var pid = {
     job: process.env.GALAXY_JOB,
-    lastStarted: process.env.LAST_START,
+    lastStarted: +(process.env.LAST_START),
     app: process.env.GALAXY_APP
   };
   var myHost = os.hostname();

From 41303e7a13e3702fb2a8cc7b6326d3d1a3bf7c81 Mon Sep 17 00:00:00 2001
From: Naomi Seyfer <naomi@meteor.com>
Date: Fri, 4 Oct 2013 16:24:29 -0700
Subject: [PATCH 327/335] follower: After reconnect, just call tryElector --
 the url may not even be a string

---
 packages/follower-livedata/follower.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/follower-livedata/follower.js b/packages/follower-livedata/follower.js
index f734277846..da99054d53 100644
--- a/packages/follower-livedata/follower.js
+++ b/packages/follower-livedata/follower.js
@@ -154,7 +154,7 @@ Follower = {
         intervalHandle = monitorConnection();
       if (arguments[0] && arguments[0].url) {
         makeElectorTries(arguments[0].url, {reset: true, priority: 0});
-        tryElector(arguments[0].url);
+        tryElector();
       } else {
         conn._reconnectImpl.apply(conn, arguments);
       }

From 98bba8c0397e071013e10fdcd0e9f6267128c935 Mon Sep 17 00:00:00 2001
From: Naomi Seyfer <naomi@meteor.com>
Date: Wed, 9 Oct 2013 13:53:01 -0700
Subject: [PATCH 328/335] follower now makes sure it is connected to the right
 leadership group

---
 packages/follower-livedata/follower.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/packages/follower-livedata/follower.js b/packages/follower-livedata/follower.js
index da99054d53..6775062146 100644
--- a/packages/follower-livedata/follower.js
+++ b/packages/follower-livedata/follower.js
@@ -8,7 +8,9 @@ Follower = {
 
   connect: function (urlSet, options) {
     var electorTries;
-    options = options || {};
+    options = _.extend({
+      group: "package.leadershipLivedata"
+    }, options);
     // start each elector as untried/assumed connectable.
 
     // for options.priority, low-priority things are tried first.
@@ -72,7 +74,7 @@ Follower = {
 
     var tryElector = function (url) {
       url = url || findFewestTries();
-      //console.log("trying", url, electorTries, tryingUrl);
+      console.log("trying", url, electorTries, tryingUrl);
       if (conn) {
         conn._reconnectImpl({
           url: url
@@ -87,11 +89,12 @@ Follower = {
         tryingUrl = url;
       } else {
         tryingUrl = url;
-        conn.call('getElectorate', function (err, res) {
+        conn.call('getElectorate', options.group, function (err, res) {
           connected = tryingUrl;
           tryingUrl = null;
           if (err) {
             electorTries[url]++;
+            tryElector();
             return;
           }
           // we got an answer!  Connected!
@@ -122,7 +125,7 @@ Follower = {
         if (conn.status().status !== 'connected' || connected !== leader) {
           tryElector();
         } else {
-          conn.call('getElectorate', function (err, res) {
+          conn.call('getElectorate', options.group, function (err, res) {
             if (err) {
               electorTries[connected]++;
               tryElector();
@@ -164,6 +167,10 @@ Follower = {
       return _.keys(electorTries).join(',');
     };
 
+    conn.tries = function () {
+      return electorTries;
+    };
+
     return conn;
 
   }

From de8e3154b2162e051fb418b6b4c6c185c4d2db49 Mon Sep 17 00:00:00 2001
From: Naomi Seyfer <naomi@meteor.com>
Date: Thu, 10 Oct 2013 14:50:36 -0700
Subject: [PATCH 329/335] comment out the "trying" log message again

---
 packages/follower-livedata/follower.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/follower-livedata/follower.js b/packages/follower-livedata/follower.js
index 6775062146..b201d7c425 100644
--- a/packages/follower-livedata/follower.js
+++ b/packages/follower-livedata/follower.js
@@ -74,7 +74,7 @@ Follower = {
 
     var tryElector = function (url) {
       url = url || findFewestTries();
-      console.log("trying", url, electorTries, tryingUrl);
+      //console.log("trying", url, electorTries, tryingUrl);
       if (conn) {
         conn._reconnectImpl({
           url: url

From 7ff9ba88a68c806033ee8ea5b7cd2dff93c82e5b Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Sun, 20 Oct 2013 21:44:21 -0700
Subject: [PATCH 330/335] Bump node version from 0.8.24 to 0.8.26 for Meteor
 0.6.5.2 release.

Conflicts:
	History.md
---
 History.md | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/History.md b/History.md
index 52aae4d4cc..58c3b828cc 100644
--- a/History.md
+++ b/History.md
@@ -216,6 +216,31 @@ sdarnell, and timhaines.
 * Fix regression when using Mongo ObjectIDs in Spark templates.
 
 
+
+## v0.6.5.2
+
+* Upgrade Node from 0.8.24 to 0.8.26 (security patch)
+
+
+## v0.6.5.1
+
+* Fix syntax errors on lines that end with a backslash. #1326
+
+* Fix serving static files with special characters in their name. #1339
+
+* Upgrade `esprima` JavaScript parser to fix bug parsing complex regexps.
+
+* Export `Spiderable` from `spiderable` package to allow users to set
+  `Spiderable.userAgentRegExps` to control what user agents are treated
+  as spiders.
+
+* Add EJSON to standard-app-packages. #1343
+
+* Fix bug in d3 tab character parsing.
+
+* Fix regression when using Mongo ObjectIDs in Spark templates.
+
+
 ## v0.6.5
 
 * New package system with package compiler and linker:

From 65928bbbebee551a605c7d82b66200d112c3f5d2 Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Fri, 18 Oct 2013 13:28:25 -0700
Subject: [PATCH 331/335] Increase buffer size for phantomjs in spiderable. Our
 docs were too big.

Conflicts:
	History.md
---
 History.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/History.md b/History.md
index 58c3b828cc..34689f078d 100644
--- a/History.md
+++ b/History.md
@@ -216,6 +216,9 @@ sdarnell, and timhaines.
 * Fix regression when using Mongo ObjectIDs in Spark templates.
 
 
+* Increase the maximum size spiderable will return for a page from 200kB
+  to 5MB.
+
 
 ## v0.6.5.2
 

From 87562f0ccd5e29338a5a9cb2e065313238321965 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Thu, 24 Oct 2013 16:17:41 -0700
Subject: [PATCH 332/335] Defer follower conn method calls until we have the
 right group.

---
 packages/follower-livedata/follower.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/packages/follower-livedata/follower.js b/packages/follower-livedata/follower.js
index b201d7c425..7118894849 100644
--- a/packages/follower-livedata/follower.js
+++ b/packages/follower-livedata/follower.js
@@ -1,4 +1,5 @@
 var fs = Npm.require('fs');
+var Future = Npm.require('fibers/future');
 
 var readFile = Meteor._wrapAsync(fs.readFile);
 
@@ -43,6 +44,10 @@ Follower = {
     var connected = null;
     var intervalHandle = null;
 
+    // Used to defer all method calls until we're sure that we connected to the
+    // right leadership group.
+    var connectedToLeadershipGroup = new Future();
+
     var findFewestTries = function () {
       var min = 10000;
       var minElector = null;
@@ -97,6 +102,9 @@ Follower = {
             tryElector();
             return;
           }
+          if (! connectedToLeadershipGroup.isResolved()) {
+            connectedToLeadershipGroup["return"]();
+          }
           // we got an answer!  Connected!
           electorTries[url] = 0;
           if (res.leader === url) {
@@ -130,6 +138,9 @@ Follower = {
               electorTries[connected]++;
               tryElector();
             } else {
+              if (! connectedToLeadershipGroup.isResolved()) {
+                connectedToLeadershipGroup["return"]();
+              }
               //console.log("updating electorate with", res);
               updateElectorate(res);
             }
@@ -171,6 +182,15 @@ Follower = {
       return electorTries;
     };
 
+    // Assumes that `call` is implemented in terms of `apply`. All method calls
+    // should be deferred until we are sure we've connected to the right
+    // leadership group.
+    conn._applyImpl = conn.apply;
+    conn.apply = function (/* arguments */) {
+      connectedToLeadershipGroup.wait();
+      return conn._applyImpl.apply(conn, arguments);
+    };
+
     return conn;
 
   }

From 87e5324a8e5fdeb5bfd617f72bebaaf9e552de44 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Thu, 24 Oct 2013 16:40:08 -0700
Subject: [PATCH 333/335] Make webapp a follower of proxy.

Should get rid of the occasional case of webapp connecting to the proxy
leadership group when it wants the admin proxy, and vice versa.
---
 packages/follower-livedata/follower.js |  8 +++++++-
 packages/webapp/package.js             |  2 +-
 packages/webapp/webapp_server.js       | 16 ++++++++++------
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/packages/follower-livedata/follower.js b/packages/follower-livedata/follower.js
index 7118894849..8763dc3e69 100644
--- a/packages/follower-livedata/follower.js
+++ b/packages/follower-livedata/follower.js
@@ -79,7 +79,13 @@ Follower = {
 
     var tryElector = function (url) {
       url = url || findFewestTries();
-      //console.log("trying", url, electorTries, tryingUrl);
+      // console.log("trying", url, electorTries, tryingUrl);
+
+      // Don't keep trying the same url as fast as we can if it's not working.
+      if (electorTries[url] > 2) {
+        Meteor._sleepForMs(3 * 1000);
+      }
+
       if (conn) {
         conn._reconnectImpl({
           url: url
diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index fdfc9a11b9..bdd4c6d862 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -9,7 +9,7 @@ Npm.depends({connect: "2.9.0",
 
 Package.on_use(function (api) {
   api.use(['logging', 'underscore', 'routepolicy'], 'server');
-  api.use(['application-configuration', 'livedata'], {
+  api.use(['application-configuration', 'follower-livedata'], {
     unordered: true
   });
   // At response serving time, webapp uses browser-policy if it is loaded. If
diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js
index 7a8c210aba..11f59ff21c 100644
--- a/packages/webapp/webapp_server.js
+++ b/packages/webapp/webapp_server.js
@@ -429,8 +429,8 @@ var runWebAppServer = function () {
         if (proxyBinding)
           proxyBinding.stop();
         if (configuration && configuration.proxy) {
-          proxyBinding = AppConfig.configureService(configuration.proxyServiceName ||
-                                                    "proxy", function (proxyService) {
+          var proxyServiceName = configuration.proxyServiceName || "proxy";
+          proxyBinding = AppConfig.configureService(proxyServiceName, function (proxyService) {
             if (proxyService.providers.proxy) {
               var proxyConf;
               if (process.env.ADMIN_APP) {
@@ -447,7 +447,7 @@ var runWebAppServer = function () {
               Log("Attempting to bind to proxy at " + proxyService.providers.proxy);
               WebAppInternals.bindToProxy(_.extend({
                 proxyEndpoint: proxyService.providers.proxy
-              }, proxyConf));
+              }, proxyConf), proxyServiceName);
             }
           });
         }
@@ -468,7 +468,7 @@ var runWebAppServer = function () {
   };
 };
 
-WebAppInternals.bindToProxy = function (proxyConfig) {
+WebAppInternals.bindToProxy = function (proxyConfig, proxyServiceName) {
   var securePort = proxyConfig.securePort || 4433;
   var insecurePort = proxyConfig.insecurePort || 8080;
   var bindPathPrefix = proxyConfig.bindPathPrefix || "";
@@ -498,8 +498,12 @@ WebAppInternals.bindToProxy = function (proxyConfig) {
   };
 
   // This is run after packages are loaded (in main) so we can use
-  // DDP.connect.
-  var proxy = Package.livedata.DDP.connect(proxyConfig.proxyEndpoint);
+  // Follower.connect.
+  var proxy = Package["follower-livedata"].Follower.connect(
+    proxyConfig.proxyEndpoint, {
+      group: proxyServiceName
+    }
+  );
   var route = process.env.ROUTE;
   var host = route.split(":")[0];
   var port = +route.split(":")[1];

From aadc52922398b8bdad05e6d55782c37664d78753 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Fri, 25 Oct 2013 11:51:41 -0700
Subject: [PATCH 334/335] Fix indentation in follower

---
 packages/follower-livedata/follower.js | 30 +++++++++++++-------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/follower-livedata/follower.js b/packages/follower-livedata/follower.js
index 8763dc3e69..e967c85ccd 100644
--- a/packages/follower-livedata/follower.js
+++ b/packages/follower-livedata/follower.js
@@ -136,22 +136,22 @@ Follower = {
     tryElector();
 
     var checkConnection = function () {
-        if (conn.status().status !== 'connected' || connected !== leader) {
-          tryElector();
-        } else {
-          conn.call('getElectorate', options.group, function (err, res) {
-            if (err) {
-              electorTries[connected]++;
-              tryElector();
-            } else {
-              if (! connectedToLeadershipGroup.isResolved()) {
-                connectedToLeadershipGroup["return"]();
-              }
-              //console.log("updating electorate with", res);
-              updateElectorate(res);
+      if (conn.status().status !== 'connected' || connected !== leader) {
+        tryElector();
+      } else {
+        conn.call('getElectorate', options.group, function (err, res) {
+          if (err) {
+            electorTries[connected]++;
+            tryElector();
+          } else {
+            if (! connectedToLeadershipGroup.isResolved()) {
+              connectedToLeadershipGroup["return"]();
             }
-          });
-        }
+            //console.log("updating electorate with", res);
+            updateElectorate(res);
+          }
+        });
+      }
     };
 
     var monitorConnection = function () {

From 43fddf982b56d320c377f1fb22db40834a3f8d20 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Fri, 25 Oct 2013 11:52:51 -0700
Subject: [PATCH 335/335] Unset stream's websockets connection before closing
 it.

Fixes infinite loop where writing on a closed socket emitted an error, which
caused livedata stream to clean up the connection, which caused an error about
writing on a closed socket, ...
---
 packages/livedata/stream_client_nodejs.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/livedata/stream_client_nodejs.js b/packages/livedata/stream_client_nodejs.js
index d6a99d1d17..0b79754aa3 100644
--- a/packages/livedata/stream_client_nodejs.js
+++ b/packages/livedata/stream_client_nodejs.js
@@ -142,8 +142,9 @@ _.extend(LivedataTest.ClientStream.prototype, {
 
     self._clearConnectionTimer();
     if (self.currentConnection) {
-      self.currentConnection.close();
+      var conn = self.currentConnection;
       self.currentConnection = null;
+      conn.close();
     }
   },