From cf4190e9c0edf692fb2b0cd16ffeb6e36351c42b Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Sun, 23 Dec 2012 12:36:05 -0800
Subject: [PATCH 01/33] Increment version to 0.5.3.

---
 History.md                 | 4 ++++
 admin/debian/changelog     | 2 +-
 admin/install-s3.sh        | 2 +-
 admin/manifest.json        | 6 +++---
 admin/meteor.spec          | 2 +-
 app/lib/updater.js         | 2 +-
 app/meteor/post-upgrade.js | 2 +-
 docs/client/docs.html      | 2 +-
 docs/client/docs.js        | 2 +-
 9 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/History.md b/History.md
index 9ae3054864..9232e415e0 100644
--- a/History.md
+++ b/History.md
@@ -1,6 +1,10 @@
 
 ## vNEXT
 
+## v0.5.3
+
+TODO: Finish 0.5.3 section
+
 * `OAuth1Binding` improvements:  #539
   * `OAuth1Binding.get` and `OAuth1Binding.call` now return the full response
     (including headers and statusCode), rather than just the data.
diff --git a/admin/debian/changelog b/admin/debian/changelog
index 6b85fb6ca3..b8b7317e6b 100644
--- a/admin/debian/changelog
+++ b/admin/debian/changelog
@@ -1,4 +1,4 @@
-meteor (0.5.2-1) unstable; urgency=low
+meteor (0.5.3-1) unstable; urgency=low
 
   * Automated debian build.
 
diff --git a/admin/install-s3.sh b/admin/install-s3.sh
index eb3ccc3ee8..91fbc35085 100755
--- a/admin/install-s3.sh
+++ b/admin/install-s3.sh
@@ -5,7 +5,7 @@
 ## example.
 
 URLBASE="https://d3sqy0vbqsdhku.cloudfront.net"
-VERSION="0.5.2"
+VERSION="0.5.3"
 PKGVERSION="${VERSION}-1"
 
 UNAME=`uname`
diff --git a/admin/manifest.json b/admin/manifest.json
index 79fb8a130c..d0f3e2f9fc 100644
--- a/admin/manifest.json
+++ b/admin/manifest.json
@@ -1,6 +1,6 @@
 {
-  "version": "0.5.2",
-  "deb_version": "0.5.2-1",
-  "rpm_version": "0.5.2-1",
+  "version": "0.5.3",
+  "deb_version": "0.5.3-1",
+  "rpm_version": "0.5.3-1",
   "urlbase": "https://d3sqy0vbqsdhku.cloudfront.net"
 }
diff --git a/admin/meteor.spec b/admin/meteor.spec
index 25fe47ef1e..9388c6198e 100644
--- a/admin/meteor.spec
+++ b/admin/meteor.spec
@@ -5,7 +5,7 @@
 Summary: Meteor platform and JavaScript application server
 Vendor: Meteor
 Name: meteor
-Version: 0.5.2
+Version: 0.5.3
 Release: 1
 License: MIT
 Group: Networking/WWW
diff --git a/app/lib/updater.js b/app/lib/updater.js
index 43589b7c66..af6936c6eb 100644
--- a/app/lib/updater.js
+++ b/app/lib/updater.js
@@ -1,4 +1,4 @@
-exports.CURRENT_VERSION = "0.5.2";
+exports.CURRENT_VERSION = "0.5.3";
 
 var fs = require("fs");
 var http = require("http");
diff --git a/app/meteor/post-upgrade.js b/app/meteor/post-upgrade.js
index 3153a4f449..036dca5d17 100644
--- a/app/meteor/post-upgrade.js
+++ b/app/meteor/post-upgrade.js
@@ -2,7 +2,7 @@ try {
   // XXX can't get this from updater.js because in 0.3.7 and before the
   // updater didn't have the right NODE_PATH set. At some point we can
   // remove this and just use updater.CURRENT_VERSION.
-  var VERSION = "0.5.2";
+  var VERSION = "0.5.3";
 
   var fs = require('fs');
   var path = require('path');
diff --git a/docs/client/docs.html b/docs/client/docs.html
index d03097a480..e4c114fff2 100644
--- a/docs/client/docs.html
+++ b/docs/client/docs.html
@@ -11,7 +11,7 @@
   </div>
   <div id="main">
     <div id="top"></div>
-    <h1 class="main-headline">Meteor 0.5.2</h1>
+    <h1 class="main-headline">Meteor 0.5.3</h1>
     {{> introduction }}
     {{> concepts }}
     {{> api }}
diff --git a/docs/client/docs.js b/docs/client/docs.js
index 3413bfa00e..a32fbac4d7 100644
--- a/docs/client/docs.js
+++ b/docs/client/docs.js
@@ -1,4 +1,4 @@
-METEOR_VERSION = "0.5.2";
+METEOR_VERSION = "0.5.3";
 
 Meteor.startup(function () {
   // XXX this is broken by the new multi-page layout.  Also, it was

From 41520a3df86d47b6bbc581dba0abb37c931bf80d Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Mon, 24 Dec 2012 11:06:49 -0800
Subject: [PATCH 02/33] Start on History.md for 0.5.3.

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

diff --git a/History.md b/History.md
index 9232e415e0..308186a2ea 100644
--- a/History.md
+++ b/History.md
@@ -5,6 +5,37 @@
 
 TODO: Finish 0.5.3 section
 
+* A new `--settings` argument to `meteor deploy` and `meteor run` allows you to
+  specify a file containing a JSON object which will be made available to server
+  code in the variable `Meteor.settings`.
+
+* Deployed apps now use a randomized hostname for their long-polling
+  connections, allowing users to use apps in an arbitrary number of simultaneous
+  tabs without hitting browser per-hostname connection limits. #131
+
+* In Spark, when a template is re-rendered, elements that are preserved (using
+  `Template.foo.preserve` or the `preserve-input` package) and which have
+  user-controllable "values" (eg, form inputs) now preserve the value set by the
+  user, unless the server's newly rendered value is different from the
+  previously rendered value. That is, re-rendering a template no longer reverts
+  changes to form elements made by users. Additionally, <INPUT> elements with
+  type other than TEXT can now have reactive values (eg, the labels on submit
+  buttons can now be reactive).  #510 #514 #523 #537 #558
+
+* Improve rendering of <SELECT> elements on IE.  #496
+
+* minimongo improvements:
+  * `$and`, `$or`, and `$nor` no longer accept empty arrays (for consistency
+    with Mongo)
+
+* Always use the `autoReconnect` flag when connecting to Mongo.  #425
+
+* When logging in with Google, allow apps to request an "offline" token.  #464
+
+* When a user logs in using credentials from an external service, don't
+  overwrite `serviceData` fields that were set on a previous login and not set
+  on this login. (For example, the refresh token from Google "offline" login.)
+
 * `OAuth1Binding` improvements:  #539
   * `OAuth1Binding.get` and `OAuth1Binding.call` now return the full response
     (including headers and statusCode), rather than just the data.
@@ -12,6 +43,27 @@ TODO: Finish 0.5.3 section
   * `OAuth1Binding.get`, `OAuth1Binding.call` and `OAuth1Binding.post` now take
     a `params` argument. This facilitates making calls to the Twitter API.
 
+* A new flag `meteor run --once` does not re-run the project if it crashes or
+  monitor for file changes; intended for automated testing (eg
+  `admin/cli-test.sh`).
+
+* Improvements to `jsparse`: hex literals, keywords as property names, ES5 line
+  continuations, trailing commas in object literals, line numbers in error
+  messages
+
+* Implement the UUID v4 spec correctly (instead of losing a few bits of
+  randomness).
+
+* Update clean-css package from 0.8.2 to 0.8.3, fixing minification of `0%`
+  values in `hsl` colors.  #515
+
+* The underscore library is now in the dev bundle instead of in three different
+  places inside the source tree. (It's still in one place in the source tree, to
+  be served to clients.)
+
+Patches contributed by GitHub users Ed-von-Schleck, jwulf, meawoppl, and
+nwmartin.
+
 ## v0.5.2
 
 * Fix 0.5.1 regression: Cursor `observe` works during server startup.  #507

From 32870ea93307e4bd10b6d54755f111f525ce34d9 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Tue, 13 Nov 2012 15:31:19 -0800
Subject: [PATCH 03/33] Spark: Test that patching "<input type=checkbox/radio
 checked>" onto unchecked input works.

This test was extracted from a fix for this specific issue #478 which
accidentally never got merged; 442b86eebd ended up fixing this issue with a
slightly different change than the unmerged fix.
---
 packages/spark/patch_tests.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/spark/patch_tests.js b/packages/spark/patch_tests.js
index 50975bd4f7..4d2d698ae8 100644
--- a/packages/spark/patch_tests.js
+++ b/packages/spark/patch_tests.js
@@ -132,7 +132,9 @@ Tinytest.add("spark - patch - copyAttributes", function(test) {
         buf.push('<', tagName);
         _.each(kv, function(v,k) {
           allAttrNames[k] = true;
-          buf.push(' ', k, '="', v, '"');
+          buf.push(' ', k);
+          if (v !== 'NO_VALUE')
+            buf.push('="', v, '"');
         });
         buf.push('></', tagName, '>');
         var nodeHtml = buf.join('');
@@ -160,18 +162,20 @@ Tinytest.add("spark - patch - copyAttributes", function(test) {
       check: function() {
         _.each(lastAttrs, function(v,k) {
           var actualAttr;
+          var expectedAttr = v || "";
           if (k === "style") {
             actualAttr = node.style.cssText;
           } else if (k === "class") {
             actualAttr = node.className;
           } else if (k === "checked") {
             actualAttr = String(node.getAttribute(k) || "");
+            if (expectedAttr === "NO_VALUE")
+              expectedAttr = "checked";
             if (actualAttr === "true")
               actualAttr = "checked"; // save IE's butt
           } else {
             actualAttr = String(node.getAttribute(k) || "");
           }
-          var expectedAttr = v || "";
           test.equal(actualAttr, expectedAttr, k);
         });
       },
@@ -228,6 +232,12 @@ Tinytest.add("spark - patch - copyAttributes", function(test) {
   c.copy({type:'checkbox', name:'foo', checked:'checked'});
   c.check();
   test.equal(c.node().checked, true);
+  c.copy({type:'checkbox', name:'foo'});
+  c.check();
+  test.equal(c.node().checked, false);
+  c.copy({type:'checkbox', name:'foo', checked:'NO_VALUE'});
+  c.check();
+  test.equal(c.node().checked, true);
 
   c.copy({type:'checkbox', name:'bar'});
   test.expect_fail(); // changing "name" on a form control won't take in IE

From 06ddf733998f98dfb82a3cbdf69e0773e69e41ce Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Mon, 24 Dec 2012 11:29:03 -0800
Subject: [PATCH 04/33] Finish first draft of 0.5.3 release notes.

---
 History.md | 45 +++++++++++++++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/History.md b/History.md
index 308186a2ea..a9bc0cd8b6 100644
--- a/History.md
+++ b/History.md
@@ -3,8 +3,6 @@
 
 ## v0.5.3
 
-TODO: Finish 0.5.3 section
-
 * A new `--settings` argument to `meteor deploy` and `meteor run` allows you to
   specify a file containing a JSON object which will be made available to server
   code in the variable `Meteor.settings`.
@@ -22,12 +20,20 @@ TODO: Finish 0.5.3 section
   type other than TEXT can now have reactive values (eg, the labels on submit
   buttons can now be reactive).  #510 #514 #523 #537 #558
 
-* Improve rendering of <SELECT> elements on IE.  #496
-
 * minimongo improvements:
+  * Allow observing cursors with `skip` or `limit`.  #528
+  * Allow sorting on `dotted.sub.keys`.  #533
+  * Allow querying specific array elements (`foo.1.bar`).
   * `$and`, `$or`, and `$nor` no longer accept empty arrays (for consistency
     with Mongo)
 
+* JavaScript RegExp objects can now be used in selectors in Collection write
+  methods on the client, eg `myCollection.remove({foo: /bar/})`.  #346
+
+* Spark IE improvements:
+  * Improve rendering of <SELECT> elements on IE.  #496
+  * Don't lose nested data contexts in IE9/10 after two seconds.  #458
+
 * Always use the `autoReconnect` flag when connecting to Mongo.  #425
 
 * When logging in with Google, allow apps to request an "offline" token.  #464
@@ -36,6 +42,15 @@ TODO: Finish 0.5.3 section
   overwrite `serviceData` fields that were set on a previous login and not set
   on this login. (For example, the refresh token from Google "offline" login.)
 
+* `meteor` command-line improvements:
+  * Improve error message when mongod fails to start.
+  * The `NODE_OPTIONS` environment variable can be used to pass command-line
+    flags to node (eg, `--debug` or `--debug-brk` to enable the debugger).
+  * A new flag `meteor run --once` does not re-run the project if it crashes or
+    monitor for file changes; intended for automated testing (eg
+    `admin/cli-test.sh`).
+  * Die with error if an app name is mistakenly passed to `meteor reset`.
+
 * `OAuth1Binding` improvements:  #539
   * `OAuth1Binding.get` and `OAuth1Binding.call` now return the full response
     (including headers and statusCode), rather than just the data.
@@ -43,13 +58,19 @@ TODO: Finish 0.5.3 section
   * `OAuth1Binding.get`, `OAuth1Binding.call` and `OAuth1Binding.post` now take
     a `params` argument. This facilitates making calls to the Twitter API.
 
-* A new flag `meteor run --once` does not re-run the project if it crashes or
-  monitor for file changes; intended for automated testing (eg
-  `admin/cli-test.sh`).
+* Fix re-sending method calls on reconnect.  #538
+
+* `Meteor.connect` now supports URLs of the form
+  `ddp+sockjs://host-***.name/sockjs` and `ddpi+sockjs://host-***.name/sockjs`
+  to connect with DDP over HTTPS and HTTP respectively. The asterisks are
+  substituted with random digits. This syntax may change in a future version of
+  Meteor. While the trailing `/sockjs` is required in these URLs, it is no
+  longer supported in scheme-less URLs passed to `Meteor.connect`.
 
 * Improvements to `jsparse`: hex literals, keywords as property names, ES5 line
   continuations, trailing commas in object literals, line numbers in error
-  messages
+  messages, decimal literals starting with `.`, regex character classes with
+  slashes.
 
 * Implement the UUID v4 spec correctly (instead of losing a few bits of
   randomness).
@@ -57,12 +78,8 @@ TODO: Finish 0.5.3 section
 * Update clean-css package from 0.8.2 to 0.8.3, fixing minification of `0%`
   values in `hsl` colors.  #515
 
-* The underscore library is now in the dev bundle instead of in three different
-  places inside the source tree. (It's still in one place in the source tree, to
-  be served to clients.)
-
-Patches contributed by GitHub users Ed-von-Schleck, jwulf, meawoppl, and
-nwmartin.
+Patches contributed by GitHub users Ed-von-Schleck, egtann, jwulf, lvbreda,
+meawoppl, nwmartin, and timhaines.
 
 ## v0.5.2
 

From 47d5abb7d8a654879c6d47158568f47e1b1b9e80 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Mon, 24 Dec 2012 11:31:33 -0800
Subject: [PATCH 05/33] Remove some no-longer-true caveats about Minimongo from
 docs.

---
 docs/client/api.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/client/api.html b/docs/client/api.html
index aeee5f0f76..33c0455324 100644
--- a/docs/client/api.html
+++ b/docs/client/api.html
@@ -528,11 +528,9 @@ In this release, Minimongo has some limitations:
 * `$elemMatch` is not supported in selectors.
 * `$pull` in modifiers can only accept certain kinds
 of selectors.
-* In selectors, dot notation and ordinal indexing may not work correctly.
+* In selectors, dot notation may not work correctly.
 * `$` to denote the matched array position is not
 supported in modifier.
-* Sort does not support subkeys (you can sort on `a`,
-but not `a.b`).
 * `findAndModify`, upsert, aggregate functions, and
 map/reduce aren't supported.
 * The supported types are String, Number, Boolean, Array,

From 64253bc47044ed776639ae044772c0841a7bf483 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Wed, 26 Dec 2012 23:30:26 -0800
Subject: [PATCH 06/33] accounts-ui-viewer: use triple-stash for the inclusiong
 of checked="checked" to avoid escaping the quotes.

---
 examples/unfinished/accounts-ui-viewer/accounts-ui-viewer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/unfinished/accounts-ui-viewer/accounts-ui-viewer.html b/examples/unfinished/accounts-ui-viewer/accounts-ui-viewer.html
index 1470af65b9..87d4b8a881 100644
--- a/examples/unfinished/accounts-ui-viewer/accounts-ui-viewer.html
+++ b/examples/unfinished/accounts-ui-viewer/accounts-ui-viewer.html
@@ -7,7 +7,7 @@
 </body>
 
 <template name="radio">
-  <span class="radio"><input id="{{key}}:{{value}}" {{maybeChecked}} type="radio" name="{{key}}" value="{{value}}" />{{! no whitespace}}<label for="{{key}}:{{value}}">{{label}}</label></span>
+  <span class="radio"><input id="{{key}}:{{value}}" {{{maybeChecked}}} type="radio" name="{{key}}" value="{{value}}" />{{! no whitespace}}<label for="{{key}}:{{value}}">{{label}}</label></span>
 </template>
 
 <template name="button">

From 26c7258027811228240797cea40df0e5cedc4460 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Wed, 26 Dec 2012 23:36:19 -0800
Subject: [PATCH 07/33] Follow-up to 442b86: fix re-rendering of unfocused
 radio buttons.

Before 442b86, this worked because we always unconditionally made tgt checked if
src was checked. With the new 3-way-diff algorithm for value and checkedness, we
need to save the checkedness of tgt before any DOM manipulation that could
uncheck it.
---
 packages/spark/patch.js       |  9 +++++++--
 packages/spark/spark.js       | 14 +++++++++++++-
 packages/spark/spark_tests.js | 10 ++++++++++
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/packages/spark/patch.js b/packages/spark/patch.js
index 3319567a58..07a09d5f9e 100644
--- a/packages/spark/patch.js
+++ b/packages/spark/patch.js
@@ -374,10 +374,15 @@ Spark._Patcher._copyAttributes = function(tgt, src) {
             tgt._sparkOriginalRenderedChecked[0];
       var srcOriginalChecked = !!src._sparkOriginalRenderedChecked &&
             src._sparkOriginalRenderedChecked[0];
+      // For radio buttons, we previously saved the checkedness in an expando
+      // property before doing some DOM operations that could wipe it out. For
+      // checkboxes, we can just use the checked property directly.
+      var tgtCurrentChecked = tgt._currentChecked ?
+            tgt._currentChecked[0] : tgt.checked;
       if (tgtOriginalChecked === srcOriginalChecked) {
-        finalChecked = !!tgt.checked;
+        finalChecked = tgtCurrentChecked;
       } else {
-        finalChecked = !!srcOriginalChecked;
+        finalChecked = srcOriginalChecked;
         tgt._sparkOriginalRenderedChecked = [finalChecked];
       }
     }
diff --git a/packages/spark/spark.js b/packages/spark/spark.js
index 4fda7c1252..7212778c33 100644
--- a/packages/spark/spark.js
+++ b/packages/spark/spark.js
@@ -318,7 +318,7 @@ _.extend(Spark._Renderer.prototype, {
     });
     _.each(DomUtils.findAll(ret, 'input[type=checkbox], input[type=radio]'),
            function (node) {
-      node._sparkOriginalRenderedChecked = [node.checked];
+      node._sparkOriginalRenderedChecked = [!!node.checked];
     });
 
     return ret;
@@ -598,6 +598,18 @@ Spark.renderToRange = function (range, htmlFunc) {
 
   pc.addRoot(Spark._globalPreserves, range, tempRange);
 
+  // computePreservations is going to insert 'tempRange' into the DOM
+  // temporarily. If any radio buttons in 'tempRange' are checked, this will
+  // instantly uncheck any radio buttons with the same name in 'range' (since
+  // only one radio button of a given name can be checked at a time). So we save
+  // the current checked value of all radio buttons in an expando.
+  var radios = DomUtils.findAllClipped(
+    range.containerNode(), 'input[type=radio]',
+    range.firstNode(), range.lastNode());
+  _.each(radios, function (node) {
+    node._currentChecked = [!!node.checked];
+  });
+
   // compute preservations (must do this before destroying tempRange)
   var preservations = pc.computePreservations(range, tempRange);
 
diff --git a/packages/spark/spark_tests.js b/packages/spark/spark_tests.js
index 160adfa14d..d36904d747 100644
--- a/packages/spark/spark_tests.js
+++ b/packages/spark/spark_tests.js
@@ -2640,8 +2640,12 @@ testAsyncMulti(
 
 Tinytest.add("spark - controls - radio", function(test) {
   var R = ReactiveVar("");
+  var R2 = ReactiveVar("");
   var change_buf = [];
   var div = OnscreenDiv(renderWithPreservation(function() {
+    // Re-render when R2 is changed, even though it doesn't affect HTML.
+    R2.get();
+
     var buf = [];
     buf.push("Band: ");
     _.each(["AM", "FM", "XM"], function(band) {
@@ -2688,6 +2692,12 @@ Tinytest.add("spark - controls - radio", function(test) {
   test.equal(_.pluck(btns, 'checked'), [true, false, false]);
   test.equal(div.text(), "Band: AM");
 
+  R2.set("change");
+  Meteor.flush();
+  test.length(change_buf, 0);
+  test.equal(_.pluck(btns, 'checked'), [true, false, false]);
+  test.equal(div.text(), "Band: AM");
+
   clickElement(btns[1]);
   test.equal(change_buf, ['FM']);
   change_buf.length = 0;

From d5e65dc2ce4e744caa77a675b69c22577f09d30e Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Thu, 27 Dec 2012 13:24:32 -0800
Subject: [PATCH 08/33] Add a script for copying builds from Jenkins to s3.

---
 admin/copy-release-from-jenkins.sh | 36 ++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100755 admin/copy-release-from-jenkins.sh

diff --git a/admin/copy-release-from-jenkins.sh b/admin/copy-release-from-jenkins.sh
new file mode 100755
index 0000000000..bcbdc113d7
--- /dev/null
+++ b/admin/copy-release-from-jenkins.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# Requires s3cmd to be installed and an appropriate ~/.s3cfg.
+# Usage:
+#    admin/copy-release-from-jenkins.sh [--prod] BUILDNUMBER
+# where BUILDNUMBER is the small integer Jenkins build number.
+
+set -e
+set -u
+
+TARGET="s3://com.meteor.static/test/"
+if [ $# -ge 1 -a $1 = '--prod' ]; then
+    shift
+    TARGET="s3://com.meteor.static/"
+fi
+
+if [ $# -ne 1 ]; then
+    echo "usage: $0 [--prod] jenkins-build-number" 1>&2
+    exit 1
+fi
+
+DIRNAME=$(s3cmd ls s3://com.meteor.jenkins/ | perl -nle 'print $1 if m!/(release-.+--'$1'--.+)/!')
+
+if [ -z "$DIRNAME" ]; then
+    echo "build not found" 1>&2
+    exit 1
+fi
+
+echo Found build $DIRNAME
+
+# Check to make sure the proper number of each kind of file is there.
+s3cmd ls s3://com.meteor.jenkins/$DIRNAME/ | \
+  perl -nle '++$RPM if /\.rpm/; ++$DEB if /\.deb/; ++$TAR if /\.tar\.gz/; ++$DIR if /DIR/; END { exit !($RPM == 2 && $DEB == 2 && $TAR == 3 && $DIR == 1) }'
+
+echo Copying to $TARGET
+s3cmd -P cp -r s3://com.meteor.jenkins/$DIRNAME/ $TARGET

From a37f0707b597f9630015ce48dc4b63f35ed6f5d0 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Thu, 27 Dec 2012 13:40:27 -0800
Subject: [PATCH 09/33] Updates to History.md from last merge.

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

diff --git a/History.md b/History.md
index a9bc0cd8b6..91034276d5 100644
--- a/History.md
+++ b/History.md
@@ -36,7 +36,8 @@
 
 * Always use the `autoReconnect` flag when connecting to Mongo.  #425
 
-* When logging in with Google, allow apps to request an "offline" token.  #464
+* When logging in with Google, allow apps to request an "offline" token and store
+  its expiry time.  #464 #525
 
 * When a user logs in using credentials from an external service, don't
   overwrite `serviceData` fields that were set on a previous login and not set
@@ -58,6 +59,11 @@
   * `OAuth1Binding.get`, `OAuth1Binding.call` and `OAuth1Binding.post` now take
     a `params` argument. This facilitates making calls to the Twitter API.
 
+* `accounts-ui` now automatically detects new OAuth providers instead of only
+  recognizing a static list of them. This will allow `{{loginButtons}}` to
+  support new OAuth providers without needing to edit the `accounts-ui-unstyled`
+  package.  #572
+
 * Fix re-sending method calls on reconnect.  #538
 
 * `Meteor.connect` now supports URLs of the form
@@ -79,7 +85,7 @@
   values in `hsl` colors.  #515
 
 Patches contributed by GitHub users Ed-von-Schleck, egtann, jwulf, lvbreda,
-meawoppl, nwmartin, and timhaines.
+martin-naumann, meawoppl, nwmartin, timhaines, and zealoushacker.
 
 ## v0.5.2
 

From e4befac16ffa5bf09c8a8ec75a19fab8f1d3e16c Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Thu, 27 Dec 2012 14:00:49 -0800
Subject: [PATCH 10/33] copy-release-from-jenkins now takes care of setting
 URLs correctly in s3://com.meteor.static/test/update/

---
 admin/copy-release-from-jenkins.sh | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/admin/copy-release-from-jenkins.sh b/admin/copy-release-from-jenkins.sh
index bcbdc113d7..dd20ac2c17 100755
--- a/admin/copy-release-from-jenkins.sh
+++ b/admin/copy-release-from-jenkins.sh
@@ -8,10 +8,15 @@
 set -e
 set -u
 
+cd `dirname $0`
+
 TARGET="s3://com.meteor.static/test/"
+TEST=no
 if [ $# -ge 1 -a $1 = '--prod' ]; then
     shift
     TARGET="s3://com.meteor.static/"
+else
+    TEST=yes
 fi
 
 if [ $# -ne 1 ]; then
@@ -34,3 +39,15 @@ s3cmd ls s3://com.meteor.jenkins/$DIRNAME/ | \
 
 echo Copying to $TARGET
 s3cmd -P cp -r s3://com.meteor.jenkins/$DIRNAME/ $TARGET
+
+if [ $TEST = 'yes' ]; then
+    echo Uploading modified install-s3.sh and manifest.json
+
+    OUTDIR=$(mktemp -dt meteor-crfj)
+    perl -pe 's!https://d3sqy0vbqsdhku.cloudfront.net!https://s3.amazonaws.com/com.meteor.static/test!g' install-s3.sh >$OUTDIR/install-s3.sh
+    perl -pe 's!https://d3sqy0vbqsdhku.cloudfront.net!https://s3.amazonaws.com/com.meteor.static/test!g' manifest.json >$OUTDIR/manifest.json
+
+    cd $OUTDIR
+    s3cmd -P put install-s3.sh s3://com.meteor.static/test/update/
+    s3cmd -P put manifest.json s3://com.meteor.static/test/update/
+fi

From 8a2328b27f14e5fc63554ae07893a91176e089d9 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Thu, 27 Dec 2012 16:32:55 -0800
Subject: [PATCH 11/33] Fix lookup by fields beginning with numbers (broken by
 2d2aaa808).

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

diff --git a/packages/minimongo/minimongo_tests.js b/packages/minimongo/minimongo_tests.js
index 706907c6e9..d1629e40f8 100644
--- a/packages/minimongo/minimongo_tests.js
+++ b/packages/minimongo/minimongo_tests.js
@@ -798,6 +798,7 @@ Tinytest.add("minimongo - selector_compiler", function (test) {
   match({"dogs.0.name": "Fido"}, {dogs: [{name: "Fido"}, {name: "Rex"}]});
   match({"dogs.1.name": "Rex"}, {dogs: [{name: "Fido"}, {name: "Rex"}]});
   nomatch({"dogs.1.name": "Fido"}, {dogs: [{name: "Fido"}, {name: "Rex"}]});
+  match({"room.1b": "bla"}, {room: {"1b": "bla"}});
 
   // XXX still needs tests:
   // - $elemMatch
diff --git a/packages/minimongo/selector.js b/packages/minimongo/selector.js
index e462b5e611..4d4e33c6b3 100644
--- a/packages/minimongo/selector.js
+++ b/packages/minimongo/selector.js
@@ -398,7 +398,7 @@ LocalCollection._exprForKeypathPredicate = function (keypath, value, literals) {
   while (keyparts.length) {
     var part = keyparts.pop();
     var thisPartIsNumber = false;
-    if (/^\d+/.test(part)) {
+    if (/^\d+$/.test(part)) {
       part = +part;
       thisPartIsNumber = true;
     }

From 617d3b720718045c7da8798366a2a964bc393136 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Fri, 28 Dec 2012 16:00:50 -0800
Subject: [PATCH 12/33] Update History.md.

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

diff --git a/History.md b/History.md
index 91034276d5..1b7b6f0bf2 100644
--- a/History.md
+++ b/History.md
@@ -73,6 +73,9 @@
   Meteor. While the trailing `/sockjs` is required in these URLs, it is no
   longer supported in scheme-less URLs passed to `Meteor.connect`.
 
+* When JSON data is provided to functions like `Meteor.http.post`, the
+  `Content-Type` header now defaults to `application/json`.
+
 * Improvements to `jsparse`: hex literals, keywords as property names, ES5 line
   continuations, trailing commas in object literals, line numbers in error
   messages, decimal literals starting with `.`, regex character classes with

From 45a19ee918e55f36d5a8b420967aba4b6ba1a8fc Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Sat, 29 Dec 2012 13:28:17 -0800
Subject: [PATCH 13/33] Re-run app when --settings file changes.

---
 app/meteor/meteor.js | 27 ++--------------------
 app/meteor/run.js    | 53 ++++++++++++++++++++++++++++++++++++++------
 2 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/app/meteor/meteor.js b/app/meteor/meteor.js
index df284fa153..0121deb005 100644
--- a/app/meteor/meteor.js
+++ b/app/meteor/meteor.js
@@ -86,26 +86,6 @@ Fiber(function () {
     process.exit(1);
   };
 
-  var getSettings = function (filename) {
-    var str;
-    try {
-      str = fs.readFileSync(filename, "utf8");
-    } catch (e) {
-      throw new Error("Could not find settings file " + filename);
-    }
-    if (str.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.
-    if (str.match(/\S/)) {
-      JSON.parse(str);
-      return str;
-    } else {
-      return "";
-    }
-  };
-
   // XXX when the pass unexpected argument or unrecognized flags, print
   // an error and fail out
 
@@ -143,14 +123,11 @@ Fiber(function () {
         process.stdout.write(opt.help());
         process.exit(1);
       }
-      if (new_argv.settings) {
-        settings = getSettings(new_argv.settings);
-      }
 
       var app_dir = path.resolve(require_project("run", true)); // app or package
 
       var bundle_opts = { no_minify: !new_argv.production, symlink_dev_bundle: true };
-      runner.run(app_dir, bundle_opts, new_argv.port, new_argv.once, settings);
+      runner.run(app_dir, bundle_opts, new_argv.port, new_argv.once, new_argv.settings);
     }
   });
 
@@ -581,7 +558,7 @@ Fiber(function () {
       } else {
         var settings = undefined;
         if (new_argv.settings)
-          settings = getSettings(new_argv.settings);
+          settings = runner.getSettings(new_argv.settings);
         // accept packages iff we're deploying tests
         var project_dir = path.resolve(require_project("bundle", new_argv.tests));
         deploy.deploy_app(new_argv._[1], project_dir, new_argv.debug,
diff --git a/app/meteor/run.js b/app/meteor/run.js
index a8f4b19949..2a02fd3007 100644
--- a/app/meteor/run.js
+++ b/app/meteor/run.js
@@ -215,7 +215,7 @@ var log_to_clients = function (msg) {
 // [nodeOptions]
 // [runOnce]: boolean; default false; if true doesn't ever try to restart, and
 //          forwards server exit code.
-// [settings]
+// [settingsFile]
 
 var start_server = function (options) {
   // environment
@@ -234,8 +234,12 @@ var start_server = function (options) {
   env.PORT = options.innerPort;
   env.MONGO_URL = options.mongoURL;
   env.ROOT_URL = env.ROOT_URL || ('http://localhost:' + options.outerPort);
-  if (options.settings)
-    env.METEOR_SETTINGS = options.settings;
+  if (options.settingsFile) {
+    // Re-read the settings file each time we call start_server.
+    var settings = exports.getSettings(options.settingsFile);
+    if (settings)
+      env.METEOR_SETTINGS = settings;
+  }
 
   var nodeOptions = _.clone(options.nodeOptions);
   nodeOptions.push(path.join(options.bundlePath, 'main.js'));
@@ -308,8 +312,11 @@ var kill_server = function (handle) {
 ////////// Watching dependencies  //////////
 
 // deps is the data from dependencies.json in the bundle
+// app_dir is the root of the app
+// relativeFiles are any other files to watch, relative to the current
+//   directory (eg, the --settings file)
 // on_change is only fired once
-var DependencyWatcher = function (deps, app_dir, on_change) {
+var DependencyWatcher = function (deps, app_dir, relativeFiles, on_change) {
   var self = this;
 
   self.app_dir = app_dir;
@@ -342,6 +349,10 @@ var DependencyWatcher = function (deps, app_dir, on_change) {
     });
   };
 
+  _.each(relativeFiles, function (file) {
+    self.specific_files[file] = true;
+  });
+
   // Things that are never interesting.
   self.exclude_patterns = _.map((deps.exclude || []), function (pattern) {
     return new RegExp(pattern);
@@ -507,12 +518,34 @@ var start_update_checks = function () {
 
 ///////////////////////////////////////////////////////////////////////////////
 
+// Also used by "meteor deploy" in meteor.js.
+
+exports.getSettings = function (filename) {
+  var str;
+  try {
+    str = fs.readFileSync(filename, "utf8");
+  } catch (e) {
+    throw new Error("Could not find settings file " + filename);
+  }
+  if (str.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.
+  if (str.match(/\S/)) {
+    JSON.parse(str);
+    return str;
+  } else {
+    return "";
+  }
+};
+
 // XXX leave a pidfile and check if we are already running
 
 // This function never returns and will call process.exit() if it
 // can't continue. If you change this, remember to call
 // watcher.destroy() as appropriate.
-exports.run = function (app_dir, bundle_opts, port, once, settings) {
+exports.run = function (app_dir, bundle_opts, port, once, settingsFile) {
   var outer_port = port || 3000;
   var inner_port = outer_port + 1;
   var mongo_port = outer_port + 2;
@@ -553,7 +586,13 @@ exports.run = function (app_dir, bundle_opts, port, once, settings) {
       if (watcher)
         watcher.destroy();
 
-      watcher = new DependencyWatcher(deps_info, app_dir, function () {
+      var relativeFiles;
+      if (settingsFile) {
+        relativeFiles = [settingsFile];
+      }
+
+      watcher = new DependencyWatcher(deps_info, app_dir, relativeFiles,
+                                      function () {
         if (Status.crashing)
           log_to_clients({'system': "=> Modified -- restarting."});
         Status.reset();
@@ -634,7 +673,7 @@ exports.run = function (app_dir, bundle_opts, port, once, settings) {
       },
       nodeOptions: getNodeOptionsFromEnvironment(),
       runOnce: once,
-      settings: settings
+      settingsFile: settingsFile
     });
 
 

From 1c47ffa07f5a25af14726016e4d0b23a1e8502a0 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Mon, 31 Dec 2012 01:54:54 -0800
Subject: [PATCH 14/33] admin/node.sh: Preserve node's exit code.

---
 admin/node.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/admin/node.sh b/admin/node.sh
index 2afc873160..d22cd6bbd3 100755
--- a/admin/node.sh
+++ b/admin/node.sh
@@ -20,6 +20,7 @@ if [ "$EMACS" == t ]; then
 fi
 
 "$TOPDIR/dev_bundle/bin/node" "$@"
+EXITSTATUS=$?
 
 # Node sets stdin to non-blocking, which causes Emacs shell to die after it
 # exits. Work around this by setting stdin to blocking again.
@@ -27,3 +28,5 @@ if [ "$EMACS" == t ]; then
     perl -MFcntl=F_GETFL,F_SETFL,O_NONBLOCK -e \
         'fcntl(STDIN, F_SETFL, ~O_NONBLOCK & fcntl(STDIN, F_GETFL, 0))'
 fi
+
+exit $EXITSTATUS

From dd5bf80f5bf627a3ab19fcf37b4c207134b1d66f Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Mon, 31 Dec 2012 11:48:44 -0800
Subject: [PATCH 15/33] Make the modification needed for testing the updater
 simpler.

---
 app/lib/updater.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/lib/updater.js b/app/lib/updater.js
index af6936c6eb..54d3a62526 100644
--- a/app/lib/updater.js
+++ b/app/lib/updater.js
@@ -1,4 +1,8 @@
-exports.CURRENT_VERSION = "0.5.3";
+// During automated QA of the updater, modify this file to set testingUpdater to
+// true. This will make it act as if it is at version 0.1.0 and use test URLs
+// for update checks.
+var testingUpdater = false;
+exports.CURRENT_VERSION = testingUpdater ? "0.1.0" : "0.5.3";
 
 var fs = require("fs");
 var http = require("http");
@@ -8,11 +12,10 @@ var semver = require("semver");
 
 var files = require(path.join(__dirname, 'files.js'));
 
-var manifest_options = {
-/* uncomment for testing
+var manifest_options = testingUpdater ? {
   host: 's3.amazonaws.com',
   path: '/com.meteor.static/test/update/manifest.json'
-*/
+} : {
   host: 'update.meteor.com',
   path: '/manifest.json'
 };

From 238a7858e5393a209bc8d70c171f445d2bc52ce6 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Mon, 31 Dec 2012 12:24:29 -0800
Subject: [PATCH 16/33] admin/cli-test.sh --global should use 'meteor' from
 $PATH, not hardcode /usr/local/bin.

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

diff --git a/admin/cli-test.sh b/admin/cli-test.sh
index 27cbb42b11..beea3ca11f 100755
--- a/admin/cli-test.sh
+++ b/admin/cli-test.sh
@@ -8,7 +8,7 @@ METEOR=`pwd`/../meteor
 
 #If this ever takes more options, use getopt
 if [ "$1" == "--global" ]; then
-	METEOR=/usr/local/bin/meteor
+	METEOR=meteor
 fi
 
 DIR=`mktemp -d -t meteor-cli-test-XXXXXXXX`

From eee3352675fefd0df4c520e0ddae06461df0316a Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Mon, 31 Dec 2012 12:36:44 -0800
Subject: [PATCH 17/33] Make cli-test.sh pass on Linux.

---
 admin/cli-test.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/admin/cli-test.sh b/admin/cli-test.sh
index beea3ca11f..0bad0fc56d 100755
--- a/admin/cli-test.sh
+++ b/admin/cli-test.sh
@@ -77,7 +77,8 @@ echo "... run"
 MONGOMARK='--bind_ip 127.0.0.1 --smallfiles --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
-ps ax | grep -e 'meteor.js -p 9100' | grep -v grep | awk '{print $1}' | xargs kill
+# (the || true is needed on linux, whose xargs will invoke kill even with no args)
+ps ax | grep -e 'meteor.js -p 9100' | grep -v grep | awk '{print $1}' | xargs kill || true
 
 ! $METEOR mongo > /dev/null 2>&1
 $METEOR reset > /dev/null 2>&1
@@ -117,7 +118,7 @@ ps ax | grep -e "$MONGOMARK" | grep -v grep > /dev/null
 curl -s "http://localhost:$PORT" > /dev/null
 
 kill $METEOR_PID
-ps ax | grep -e "$MONGOMARK" | grep -v grep | awk '{print $1}' | xargs kill
+ps ax | grep -e "$MONGOMARK" | grep -v grep | awk '{print $1}' | xargs kill || true
 
 echo "... mongo message"
 

From dea8fc6d4d868d1b691c48dbe6258e050ec9f778 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Mon, 31 Dec 2012 12:43:15 -0800
Subject: [PATCH 18/33] More sleeps to help things work on Linux.

---
 admin/cli-test.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/admin/cli-test.sh b/admin/cli-test.sh
index 0bad0fc56d..7529c745f8 100755
--- a/admin/cli-test.sh
+++ b/admin/cli-test.sh
@@ -119,6 +119,7 @@ curl -s "http://localhost:$PORT" > /dev/null
 
 kill $METEOR_PID
 ps ax | grep -e "$MONGOMARK" | grep -v grep | awk '{print $1}' | xargs kill || true
+sleep 1 # need to make sure these kills take effect
 
 echo "... mongo message"
 

From 6c04fab3664b7041957f61c6890b7aa47105bc5c Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Mon, 31 Dec 2012 12:49:28 -0800
Subject: [PATCH 19/33] Make sleeps larger in cli-test.sh (cheap AWS instances
 are slow...)

---
 admin/cli-test.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/cli-test.sh b/admin/cli-test.sh
index 7529c745f8..82689e28cf 100755
--- a/admin/cli-test.sh
+++ b/admin/cli-test.sh
@@ -90,7 +90,7 @@ PORT=9100
 $METEOR -p $PORT > /dev/null 2>&1 &
 METEOR_PID=$!
 
-sleep 1 # XXX XXX lame
+sleep 2 # XXX XXX lame
 
 test -d .meteor/local/db
 ps ax | grep -e "$MONGOMARK" | grep -v grep > /dev/null
@@ -112,14 +112,14 @@ echo "... rerun"
 $METEOR -p $PORT > /dev/null 2>&1 &
 METEOR_PID=$!
 
-sleep 1 # XXX XXX lame
+sleep 2 # XXX XXX lame
 
 ps ax | grep -e "$MONGOMARK" | grep -v grep > /dev/null
 curl -s "http://localhost:$PORT" > /dev/null
 
 kill $METEOR_PID
 ps ax | grep -e "$MONGOMARK" | grep -v grep | awk '{print $1}' | xargs kill || true
-sleep 1 # need to make sure these kills take effect
+sleep 2 # need to make sure these kills take effect
 
 echo "... mongo message"
 

From 45b7ff1c7853727ed2ca86a10f8a9e73fc34e9ab Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Tue, 1 Jan 2013 16:42:42 -0800
Subject: [PATCH 20/33] Yet more sleeps in cli-test.

---
 admin/cli-test.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/admin/cli-test.sh b/admin/cli-test.sh
index 82689e28cf..4967b00fb2 100755
--- a/admin/cli-test.sh
+++ b/admin/cli-test.sh
@@ -118,6 +118,8 @@ ps ax | grep -e "$MONGOMARK" | grep -v grep > /dev/null
 curl -s "http://localhost:$PORT" > /dev/null
 
 kill $METEOR_PID
+sleep 10 # XXX XXX lame. have to wait for inner app to die via keepalive!
+
 ps ax | grep -e "$MONGOMARK" | grep -v grep | awk '{print $1}' | xargs kill || true
 sleep 2 # need to make sure these kills take effect
 

From 66b0e7caff682d17381cfd6cd5fd181126cd0884 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Wed, 2 Jan 2013 12:08:39 -0800
Subject: [PATCH 21/33] cli-test: Use perl instead of nc for portability.

---
 admin/cli-test.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/admin/cli-test.sh b/admin/cli-test.sh
index 4967b00fb2..8f222856c7 100755
--- a/admin/cli-test.sh
+++ b/admin/cli-test.sh
@@ -125,14 +125,17 @@ sleep 2 # need to make sure these kills take effect
 
 echo "... mongo message"
 
-nc -l localhost $(($PORT + 2)) &
-NC_PID=$!
+# Use perl to listen on a port, so that Mongo fails to start up. (We used to use
+# nc here, but the way you specify listener ports to nc varies between
+# platforms. Bleah.)
+perl -MIO::Socket::INET -e '$a = IO::Socket::INET->new(LocalPort=>('$PORT' + 2),LocalAddr=>"127.0.0.1",Proto=>"tcp",ReuseAddr=>1,Listen=>5); sleep' &
+PERL_PID=$!
 
 $METEOR -p $PORT > error.txt || true
 
 grep 'port was closed' error.txt > /dev/null
 
-kill -9 $NC_PID > /dev/null
+kill -9 $PERL_PID > /dev/null
 
 
 echo "... settings"

From 4f8032e57760eb0786df54c188787bf6fe646934 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Wed, 2 Jan 2013 13:54:34 -0800
Subject: [PATCH 22/33] cli-test: Error checking in mongo message test.

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

diff --git a/admin/cli-test.sh b/admin/cli-test.sh
index 8f222856c7..3e0f24294d 100755
--- a/admin/cli-test.sh
+++ b/admin/cli-test.sh
@@ -128,7 +128,7 @@ echo "... mongo message"
 # Use perl to listen on a port, so that Mongo fails to start up. (We used to use
 # nc here, but the way you specify listener ports to nc varies between
 # platforms. Bleah.)
-perl -MIO::Socket::INET -e '$a = IO::Socket::INET->new(LocalPort=>('$PORT' + 2),LocalAddr=>"127.0.0.1",Proto=>"tcp",ReuseAddr=>1,Listen=>5); sleep' &
+perl -MIO::Socket::INET -e '$a = IO::Socket::INET->new(LocalPort=>('$PORT' + 2),LocalAddr=>"127.0.0.1",Proto=>"tcp",ReuseAddr=>1,Listen=>5) or die; sleep' &
 PERL_PID=$!
 
 $METEOR -p $PORT > error.txt || true

From 8231783d225eb01fa0c45fd2ff704a6b472dcc84 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Wed, 2 Jan 2013 14:11:24 -0800
Subject: [PATCH 23/33] More sleep is always the answer! (Avoid race between
 listens.)

---
 admin/cli-test.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/admin/cli-test.sh b/admin/cli-test.sh
index 3e0f24294d..9ebc51e626 100755
--- a/admin/cli-test.sh
+++ b/admin/cli-test.sh
@@ -131,6 +131,8 @@ echo "... mongo message"
 perl -MIO::Socket::INET -e '$a = IO::Socket::INET->new(LocalPort=>('$PORT' + 2),LocalAddr=>"127.0.0.1",Proto=>"tcp",ReuseAddr=>1,Listen=>5) or die; sleep' &
 PERL_PID=$!
 
+sleep 1
+
 $METEOR -p $PORT > error.txt || true
 
 grep 'port was closed' error.txt > /dev/null

From f3940cab781ceaaa494f3be2e60b098f198300a6 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Wed, 2 Jan 2013 17:18:35 -0800
Subject: [PATCH 24/33] Use Python instead of Perl.

---
 admin/cli-test.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/admin/cli-test.sh b/admin/cli-test.sh
index 9ebc51e626..a0fea84318 100755
--- a/admin/cli-test.sh
+++ b/admin/cli-test.sh
@@ -125,11 +125,11 @@ sleep 2 # need to make sure these kills take effect
 
 echo "... mongo message"
 
-# Use perl to listen on a port, so that Mongo fails to start up. (We used to use
-# nc here, but the way you specify listener ports to nc varies between
+# Use Python to listen on a port, so that Mongo fails to start up. (We used to
+# use nc here, but the way you specify listener ports to nc varies between
 # platforms. Bleah.)
-perl -MIO::Socket::INET -e '$a = IO::Socket::INET->new(LocalPort=>('$PORT' + 2),LocalAddr=>"127.0.0.1",Proto=>"tcp",ReuseAddr=>1,Listen=>5) or die; sleep' &
-PERL_PID=$!
+python -c 'from socket import *; s = socket(); s.setsockopt(SOL_SOCKET, SO_REUSEADDR, 1); s.bind(("127.0.0.1", '$PORT'+2)); s.listen(1); s.accept()' &
+PYTHON_PID=$!
 
 sleep 1
 
@@ -137,7 +137,7 @@ $METEOR -p $PORT > error.txt || true
 
 grep 'port was closed' error.txt > /dev/null
 
-kill -9 $PERL_PID > /dev/null
+kill -9 $PYTHON_PID > /dev/null
 
 
 echo "... settings"

From 2d7d419ef8f03540de9da874b9626e6789c99760 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Wed, 2 Jan 2013 17:48:43 -0800
Subject: [PATCH 25/33] Add a comment about the now-undocumented `meteor run
 --once`.

---
 app/meteor/meteor.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/meteor/meteor.js b/app/meteor/meteor.js
index 0121deb005..32ed04ed30 100644
--- a/app/meteor/meteor.js
+++ b/app/meteor/meteor.js
@@ -101,6 +101,10 @@ Fiber(function () {
             .boolean('production')
             .describe('production', 'Run in production mode. Minify and bundle CSS and JS files.')
             .describe('settings',  'Set optional data for Meteor.settings on the server')
+            // With --once, meteor does not re-run the project if it crashes and
+            // does not monitor for file changes. Intentionally undocumented:
+            // intended for automated testing (eg, cli-test.sh), not end-user
+            // use.
             .boolean('once')
             .usage(
               "Usage: meteor run [options]\n" +

From bc9e6997d4444b242e9ef4772cf0797c41d3bc8c Mon Sep 17 00:00:00 2001
From: Nick Martin <nim@meteor.com>
Date: Wed, 2 Jan 2013 18:38:11 -0800
Subject: [PATCH 26/33] Wordsmithing on History.md.

---
 History.md | 102 ++++++++++++++++++++++-------------------------------
 1 file changed, 42 insertions(+), 60 deletions(-)

diff --git a/History.md b/History.md
index 1b7b6f0bf2..a9c745a24f 100644
--- a/History.md
+++ b/History.md
@@ -3,22 +3,13 @@
 
 ## v0.5.3
 
-* A new `--settings` argument to `meteor deploy` and `meteor run` allows you to
-  specify a file containing a JSON object which will be made available to server
-  code in the variable `Meteor.settings`.
+* Add `--settings` argument to `meteor deploy` and `meteor run`. This
+  allows you to specify deployment-specific information made available
+  to server code in the variable `Meteor.settings`.
 
-* Deployed apps now use a randomized hostname for their long-polling
-  connections, allowing users to use apps in an arbitrary number of simultaneous
-  tabs without hitting browser per-hostname connection limits. #131
-
-* In Spark, when a template is re-rendered, elements that are preserved (using
-  `Template.foo.preserve` or the `preserve-input` package) and which have
-  user-controllable "values" (eg, form inputs) now preserve the value set by the
-  user, unless the server's newly rendered value is different from the
-  previously rendered value. That is, re-rendering a template no longer reverts
-  changes to form elements made by users. Additionally, <INPUT> elements with
-  type other than TEXT can now have reactive values (eg, the labels on submit
-  buttons can now be reactive).  #510 #514 #523 #537 #558
+* Support unlimited open tabs in a single browser. Work around the
+  browser per-hostname connection limit by using randomized hostnames
+  for deployed apps. #131
 
 * minimongo improvements:
   * Allow observing cursors with `skip` or `limit`.  #528
@@ -27,62 +18,52 @@
   * `$and`, `$or`, and `$nor` no longer accept empty arrays (for consistency
     with Mongo)
 
-* JavaScript RegExp objects can now be used in selectors in Collection write
+* Re-rendering a template with Spark no longer reverts changes made by
+  users to a `preserve`d form element. Instead, the newly rendered value
+  is only applied if it is different from the previously rendered value.
+  Additionally, <INPUT> elements with type other than TEXT can now have
+  reactive values (eg, the labels on submit buttons can now be
+  reactive).  #510 #514 #523 #537 #558
+
+* Support JavaScript RegExp objects in selectors in Collection write
   methods on the client, eg `myCollection.remove({foo: /bar/})`.  #346
 
+* `meteor` command-line improvements:
+  * Improve error message when mongod fails to start.
+  * The `NODE_OPTIONS` environment variable can be used to pass command-line
+    flags to node (eg, `--debug` or `--debug-brk` to enable the debugger).
+  * Die with error if an app name is mistakenly passed to `meteor reset`.
+
+* Add support for "offline" access tokens with Google login. #464 #525
+
+* Don't remove `serviceData` fields from previous logins when logging in
+  with an external service.
+
+* Improve `OAuth1Binding` to allow making authenticated API calls to
+  OAuth1 providers (eg Twitter).  #539
+
+* New login providers automatically work with `{{loginButtons}}` without
+  needing to edit the `accounts-ui-unstyled` package.  #572
+
+* Use `Content-Type: application/json` by default when sending JSON data
+  with `Meteor.http`.
+
+* Improvements to `jsparse`: hex literals, keywords as property names, ES5 line
+  continuations, trailing commas in object literals, line numbers in error
+  messages, decimal literals starting with `.`, regex character classes with
+  slashes.
+
 * Spark IE improvements:
   * Improve rendering of <SELECT> elements on IE.  #496
   * Don't lose nested data contexts in IE9/10 after two seconds.  #458
 
 * Always use the `autoReconnect` flag when connecting to Mongo.  #425
 
-* When logging in with Google, allow apps to request an "offline" token and store
-  its expiry time.  #464 #525
-
-* When a user logs in using credentials from an external service, don't
-  overwrite `serviceData` fields that were set on a previous login and not set
-  on this login. (For example, the refresh token from Google "offline" login.)
-
-* `meteor` command-line improvements:
-  * Improve error message when mongod fails to start.
-  * The `NODE_OPTIONS` environment variable can be used to pass command-line
-    flags to node (eg, `--debug` or `--debug-brk` to enable the debugger).
-  * A new flag `meteor run --once` does not re-run the project if it crashes or
-    monitor for file changes; intended for automated testing (eg
-    `admin/cli-test.sh`).
-  * Die with error if an app name is mistakenly passed to `meteor reset`.
-
-* `OAuth1Binding` improvements:  #539
-  * `OAuth1Binding.get` and `OAuth1Binding.call` now return the full response
-    (including headers and statusCode), rather than just the data.
-  * Introduce `OAuth1Binding.post`.
-  * `OAuth1Binding.get`, `OAuth1Binding.call` and `OAuth1Binding.post` now take
-    a `params` argument. This facilitates making calls to the Twitter API.
-
-* `accounts-ui` now automatically detects new OAuth providers instead of only
-  recognizing a static list of them. This will allow `{{loginButtons}}` to
-  support new OAuth providers without needing to edit the `accounts-ui-unstyled`
-  package.  #572
-
 * Fix re-sending method calls on reconnect.  #538
 
-* `Meteor.connect` now supports URLs of the form
-  `ddp+sockjs://host-***.name/sockjs` and `ddpi+sockjs://host-***.name/sockjs`
-  to connect with DDP over HTTPS and HTTP respectively. The asterisks are
-  substituted with random digits. This syntax may change in a future version of
-  Meteor. While the trailing `/sockjs` is required in these URLs, it is no
-  longer supported in scheme-less URLs passed to `Meteor.connect`.
+* Remove deprecated `/sockjs` URL support from `Meteor.connect`.
 
-* When JSON data is provided to functions like `Meteor.http.post`, the
-  `Content-Type` header now defaults to `application/json`.
-
-* Improvements to `jsparse`: hex literals, keywords as property names, ES5 line
-  continuations, trailing commas in object literals, line numbers in error
-  messages, decimal literals starting with `.`, regex character classes with
-  slashes.
-
-* Implement the UUID v4 spec correctly (instead of losing a few bits of
-  randomness).
+* Avoid losing a few bits of randomness in UUID v4 creation.  #519
 
 * Update clean-css package from 0.8.2 to 0.8.3, fixing minification of `0%`
   values in `hsl` colors.  #515
@@ -90,6 +71,7 @@
 Patches contributed by GitHub users Ed-von-Schleck, egtann, jwulf, lvbreda,
 martin-naumann, meawoppl, nwmartin, timhaines, and zealoushacker.
 
+
 ## v0.5.2
 
 * Fix 0.5.1 regression: Cursor `observe` works during server startup.  #507

From fb24d39cbad1d073ac3e5ed43e4277bc284a6a9c Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Thu, 3 Jan 2013 00:40:08 -0800
Subject: [PATCH 27/33] cli-test: Use node instead of Python.

It's guaranteed to be there, and works better!
---
 admin/cli-test.sh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/admin/cli-test.sh b/admin/cli-test.sh
index a0fea84318..8f1b262b8f 100755
--- a/admin/cli-test.sh
+++ b/admin/cli-test.sh
@@ -6,6 +6,10 @@
 cd `dirname $0`
 METEOR=`pwd`/../meteor
 
+if [ -z "$NODE" ]; then
+    NODE=`pwd`/node.sh
+fi
+
 #If this ever takes more options, use getopt
 if [ "$1" == "--global" ]; then
 	METEOR=meteor
@@ -125,11 +129,9 @@ sleep 2 # need to make sure these kills take effect
 
 echo "... mongo message"
 
-# Use Python to listen on a port, so that Mongo fails to start up. (We used to
-# use nc here, but the way you specify listener ports to nc varies between
-# platforms. Bleah.)
-python -c 'from socket import *; s = socket(); s.setsockopt(SOL_SOCKET, SO_REUSEADDR, 1); s.bind(("127.0.0.1", '$PORT'+2)); s.listen(1); s.accept()' &
-PYTHON_PID=$!
+# Run a server on the same port as mongod, so that mongod fails to start up. Rig
+# it so that a single connection will cause it to exit.
+$NODE -e 'require("net").createServer(function(){process.exit(0)}).listen('$PORT'+2, "127.0.0.1")' &
 
 sleep 1
 
@@ -137,8 +139,8 @@ $METEOR -p $PORT > error.txt || true
 
 grep 'port was closed' error.txt > /dev/null
 
-kill -9 $PYTHON_PID > /dev/null
-
+# Kill the server by connecting to it.
+$NODE -e 'require("net").connect({host:"127.0.0.1",port:'$PORT'+2},function(){process.exit(0);})'
 
 echo "... settings"
 

From 203a82d9b977c61ac0f20a0028caf27be6baa646 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Thu, 3 Jan 2013 09:29:52 -0800
Subject: [PATCH 28/33] Fix race condition in 'meteor mongo'.

The 'exit' event on a ChildProcess doesn't necessarily occur before all the
'data' events on its stdio, so sometimes 'meteor mongo' didn't find the
process. We should have been using the 'close' event. Switch from
child_process.spawn to child_process.exec, which simplifies the code and uses
the right event.
---
 app/lib/mongo_runner.js | 55 +++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 29 deletions(-)

diff --git a/app/lib/mongo_runner.js b/app/lib/mongo_runner.js
index fec13e4d85..6599d3606e 100644
--- a/app/lib/mongo_runner.js
+++ b/app/lib/mongo_runner.js
@@ -1,6 +1,6 @@
 var fs = require("fs");
 var path = require("path");
-var spawn = require('child_process').spawn;
+var child_process = require('child_process');
 
 var files = require(path.join(__dirname, '..', 'lib', 'files.js'));
 
@@ -15,37 +15,34 @@ var _ = require('underscore');
  */
 var find_mongo_pids = function (app_dir, port, callback) {
   // 'ps ax' should be standard across all MacOS and Linux.
-  var proc = spawn('ps', ['ax']);
-  var data = '';
-  proc.stdout.on('data', function (d) {
-    data += d;
-  });
+  child_process.exec('ps ax',
+    function (error, stdout, stderr) {
+      if (error) {
+        callback({reason: error});
+      } else if (stderr) {
+        callback({reason: 'ps produced stderr ' + stderr});
+      } else {
+        var pids = [];
 
-  proc.on('exit', function (code, signal) {
-    if (code === 0) {
-      var pids = [];
+        _.each(stdout.split('\n'), function (ps_line) {
+          // matches mongos we start.
+          var m = ps_line.match(/^\s*(\d+).+mongod .+--port (\d+) --dbpath (.+)(?:\/|\\)\.meteor(?:\/|\\)local(?:\/|\\)db\s*$/);
+          if (m && m.length === 4) {
+            var found_pid =  parseInt(m[1]);
+            var found_port = parseInt(m[2]);
+            var found_path = m[3];
 
-      _.each(data.split('\n'), function (ps_line) {
-        // matches mongos we start.
-        var m = ps_line.match(/^\s*(\d+).+mongod .+--port (\d+) --dbpath (.+)(?:\/|\\)\.meteor(?:\/|\\)local(?:\/|\\)db\s*$/);
-        if (m && m.length === 4) {
-          var found_pid =  parseInt(m[1]);
-          var found_port = parseInt(m[2]);
-          var found_path = m[3];
-
-          if ( (!port || port === found_port) &&
-               (!app_dir || app_dir === found_path)) {
-            pids.push({
-              pid: found_pid, port: found_port, app_dir: found_path});
+            if ( (!port || port === found_port) &&
+                 (!app_dir || app_dir === found_path)) {
+              pids.push({
+                pid: found_pid, port: found_port, app_dir: found_path});
+            }
           }
-        }
-      });
+        });
 
-      callback(null, pids);
-    } else {
-      callback({reason: 'ps exit code ' + code});
-    }
-  });
+        callback(null, pids);
+      }
+    });
 };
 
 
@@ -162,7 +159,7 @@ exports.launch_mongo = function (app_dir, port, launch_callback, on_exit_callbac
       return;
     }
 
-    var proc = spawn(mongod_path, [
+    var proc = child_process.spawn(mongod_path, [
       '--bind_ip', '127.0.0.1',
       '--smallfiles',
       '--port', port,

From 95974f82fbc419a52c71c0de92a59b277b8c45b0 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Thu, 3 Jan 2013 10:16:21 -0800
Subject: [PATCH 29/33] Fix server-side `observe` with no `added` callback. 
 Fixes #589.

The cursor de-dup code introduced in Meteor 0.5.1 had a bug where a server-side
`observe` with no `added` callback would throw an error if the `observe` was
de-duped.
---
 History.md                                    |  2 ++
 packages/mongo-livedata/mongo_driver.js       | 10 +++++----
 .../mongo-livedata/mongo_livedata_tests.js    | 21 +++++++++++++------
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/History.md b/History.md
index a9c745a24f..77a926aee9 100644
--- a/History.md
+++ b/History.md
@@ -59,6 +59,8 @@
 
 * Always use the `autoReconnect` flag when connecting to Mongo.  #425
 
+* Fix server-side `observe` with no `added` callback.  #589
+
 * Fix re-sending method calls on reconnect.  #538
 
 * Remove deprecated `/sockjs` URL support from `Meteor.connect`.
diff --git a/packages/mongo-livedata/mongo_driver.js b/packages/mongo-livedata/mongo_driver.js
index 07a1ecb1b2..bda3fc6432 100644
--- a/packages/mongo-livedata/mongo_driver.js
+++ b/packages/mongo-livedata/mongo_driver.js
@@ -715,10 +715,12 @@ _.extend(LiveResultsSet.prototype, {
       --self._addHandleTasksScheduledButNotPerformed;
 
       // Send initial adds.
-      _.each(self._results, function (doc, i) {
-        handle._added(LocalCollection._deepcopy(doc),
-                      self._ordered ? i : undefined);
-      });
+      if (handle._added) {
+        _.each(self._results, function (doc, i) {
+          handle._added(LocalCollection._deepcopy(doc),
+                        self._ordered ? i : undefined);
+        });
+      }
     });
   },
 
diff --git a/packages/mongo-livedata/mongo_livedata_tests.js b/packages/mongo-livedata/mongo_livedata_tests.js
index a2f4e28f47..9e728f5da6 100644
--- a/packages/mongo-livedata/mongo_livedata_tests.js
+++ b/packages/mongo-livedata/mongo_livedata_tests.js
@@ -421,16 +421,19 @@ if (Meteor.isServer) {
     var run = test.runId();
     var coll = new Meteor.Collection("cursorDedup-"+run);
 
-    var observer = function () {
+    var observer = function (noAdded) {
       var output = [];
-      var handle = coll.find({foo: 22}).observe({
-        added: function (doc) {
-          output.push({added: doc._id});
-        },
+      var callbacks = {
         changed: function (newDoc) {
           output.push({changed: newDoc._id});
         }
-      });
+      };
+      if (!noAdded) {
+        callbacks.added = function (doc) {
+          output.push({added: doc._id});
+        };
+      }
+      var handle = coll.find({foo: 22}).observe(callbacks);
       return {output: output, handle: handle};
     };
 
@@ -510,7 +513,13 @@ if (Meteor.isServer) {
     test.length(o2.output, 0);
     // White-box: Different LiveResultsSet.
     test.isTrue(liveResultsSet !== o3.handle._liveResultsSet);
+
+    // Start another handle with no added callback. Regression test for #589.
+    var o4 = observer(true);
+
     o3.handle.stop();
+    o4.handle.stop();
+
     onComplete();
   });
 }

From f54b85cd479f59f3a01f3adbb0458a784fbf22f0 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Thu, 3 Jan 2013 10:40:17 -0800
Subject: [PATCH 30/33] Release notes for #392 fix.

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

diff --git a/History.md b/History.md
index 77a926aee9..60b71ec465 100644
--- a/History.md
+++ b/History.md
@@ -53,9 +53,11 @@
   messages, decimal literals starting with `.`, regex character classes with
   slashes.
 
-* Spark IE improvements:
+* Spark improvements:
   * Improve rendering of <SELECT> elements on IE.  #496
   * Don't lose nested data contexts in IE9/10 after two seconds.  #458
+  * Don't print a stack trace if DOM nodes are manually removed
+    from the document without calling `Spark.finalize`.  #392
 
 * Always use the `autoReconnect` flag when connecting to Mongo.  #425
 

From 25af4e5cdbcc9518be50ebe5196a6f45a91afc88 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Thu, 3 Jan 2013 14:56:02 -0800
Subject: [PATCH 31/33] http: Fix test failure on FF caused by 3bada2a.

---
 packages/http/httpcall_tests.js | 6 ++++--
 packages/tinytest/tinytest.js   | 8 ++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/http/httpcall_tests.js b/packages/http/httpcall_tests.js
index a045d14f22..55348f075f 100644
--- a/packages/http/httpcall_tests.js
+++ b/packages/http/httpcall_tests.js
@@ -222,7 +222,8 @@ testAsyncMulti("httpcall - methods", [
         test.equal(result.statusCode, 200);
         var data = result.data;
         test.equal(data.body, {greeting: "Hello World!"});
-        test.equal(data.headers['content-type'], 'application/json');
+        // nb: some browsers include a charset here too.
+        test.matches(data.headers['content-type'], /^application\/json\b/);
       }));
 
     Meteor.http.call(
@@ -235,7 +236,8 @@ testAsyncMulti("httpcall - methods", [
         test.equal(result.statusCode, 200);
         var data = result.data;
         test.equal(data.body, {greeting: "Hello World!"});
-        test.equal(data.headers['content-type'], 'text/stupid');
+        // nb: some browsers include a charset here too.
+        test.matches(data.headers['content-type'], /^text\/stupid\b/);
       }));
   }
 ]);
diff --git a/packages/tinytest/tinytest.js b/packages/tinytest/tinytest.js
index 9474a49ad4..c283aa6580 100644
--- a/packages/tinytest/tinytest.js
+++ b/packages/tinytest/tinytest.js
@@ -137,6 +137,14 @@ _.extend(TestCaseResults.prototype, {
       this.fail({type: "instanceOf"}); // XXX what other data?
   },
 
+  matches: function (actual, regexp, message) {
+    if (regexp.test(actual))
+      this.ok();
+    else
+      this.fail({type: "matches", message: message,
+                 actual: actual, regexp: regexp.toString()});
+  },
+
   // XXX nodejs assert.throws can take an expected error, as a class,
   // regular expression, or predicate function..
   throws: function (f) {

From fd13a9b899aca004e8b7baf44c91b84fabaaa40b Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Thu, 3 Jan 2013 14:56:45 -0800
Subject: [PATCH 32/33] http: Fix incorrect use of self in param encoding.

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

diff --git a/packages/http/httpcall_common.js b/packages/http/httpcall_common.js
index 9a1c177bb0..91774992ae 100644
--- a/packages/http/httpcall_common.js
+++ b/packages/http/httpcall_common.js
@@ -4,12 +4,12 @@ Meteor.http = Meteor.http || {};
 (function() {
 
   Meteor.http._encodeParams = function(params) {
-    self = this;
     var buf = [];
     _.each(params, function(value, key) {
       if (buf.length)
         buf.push('&');
-      buf.push(self._encodeString(key), '=', self._encodeString(value));
+      buf.push(Meteor.http._encodeString(key), '=',
+               Meteor.http._encodeString(value));
     });
     return buf.join('').replace(/%20/g, '+');
   };

From a9a7179ebf6242ef450711d5c058e86b81ace807 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Thu, 3 Jan 2013 15:33:42 -0800
Subject: [PATCH 33/33] Follow-up to 26c725 to work on more browsers.

Windows Safari (eg) seems to apply the "uncheck existing radios when new radios
are created" even earlier than other browsers, so save values earlier.
---
 packages/spark/spark.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/spark/spark.js b/packages/spark/spark.js
index 36d338dc7f..866c64db09 100644
--- a/packages/spark/spark.js
+++ b/packages/spark/spark.js
@@ -583,6 +583,18 @@ Spark.renderToRange = function (range, htmlFunc) {
     notes.originalRange = landmarkRange;
   });
 
+  // Once we render the new fragment, as soon as it is placed into the DOM (even
+  // temporarily), if any radio buttons in the new framgent are checked, any
+  // radio buttons with the same name in the entire document will be unchecked
+  // (since only one radio button of a given name can be checked at a time). So
+  // we save the current checked value of all radio buttons in an expando.
+  var radios = DomUtils.findAllClipped(
+    range.containerNode(), 'input[type=radio]',
+    range.firstNode(), range.lastNode());
+  _.each(radios, function (node) {
+    node._currentChecked = [!!node.checked];
+  });
+
   var frag = renderer.materialize(htmlFunc);
 
   DomUtils.wrapFragmentForContainer(frag, range.containerNode());
@@ -621,18 +633,6 @@ Spark.renderToRange = function (range, htmlFunc) {
 
   pc.addRoot(Spark._globalPreserves, range, tempRange);
 
-  // computePreservations is going to insert 'tempRange' into the DOM
-  // temporarily. If any radio buttons in 'tempRange' are checked, this will
-  // instantly uncheck any radio buttons with the same name in 'range' (since
-  // only one radio button of a given name can be checked at a time). So we save
-  // the current checked value of all radio buttons in an expando.
-  var radios = DomUtils.findAllClipped(
-    range.containerNode(), 'input[type=radio]',
-    range.firstNode(), range.lastNode());
-  _.each(radios, function (node) {
-    node._currentChecked = [!!node.checked];
-  });
-
   // compute preservations (must do this before destroying tempRange)
   var preservations = pc.computePreservations(range, tempRange);