Merge pull request #2889 from mozilla/2012.11.23-hotfix-issue2863

fix cache poisioning introduced by borked production push

Author: jrgm

ChangeLog

@@ -4,6 +4,7 @@ train-2012.11.23:
   * (hotfix 2012.12.03) nodejs version in .spec file >= 0.8.12
   * (hotfix 2012.12.05) when an email is re-staged, ensure the latest password is used: issue #2822
   * (hotfix 2012.12.11) verifier default port number fix
+  * (hotfix 2012.12.19) resolve issue caused by improper ETag header: issue #2863
 
 train-2012.11.09:
   * code cleanup, including jshinting of source and code coverage: #2643, #2272

resources/static/common/css/ie8.css

@@ -7,8 +7,8 @@
  */
 
 .submit button,
-.submit button:hover,
 .submit button:focus,
+.submit button:hover,
 .submit .button:hover,
 .submit .button:focus {
     background-image: url("/common/i/button-arrow.png");

resources/static/common/css/style.css

@@ -17,8 +17,8 @@ html, body {
 }
 
 body {
-  font: 14px/21px 'Open Sans', "Lucida Sans", "Lucida Grande", "Lucida Sans Unicode", Verdana, sans-serif;
   overflow-y: auto;
+  font: 14px/21px 'Open Sans', "Lucida Sans", "Lucida Grande", "Lucida Sans Unicode", Verdana, sans-serif;
 }
 
 /* for floats */

resources/static/common/js/lib/winchan.js

@@ -1,6 +1,6 @@
 ;WinChan = (function() {
-  var RELAY_FRAME_NAME = "__winchan_relay_frame";
   var CLOSE_CMD = "die";
+  var RELAY_FRAME_NAME = "__winchan_relay_frame";
 
   // a portable addListener implementation
   function addListener(w, event, cb) {

resources/static/common/js/network.js

@@ -8,8 +8,8 @@ BrowserID.Network = (function() {
   var jwcrypto = require("./lib/jwcrypto"),
       bid = BrowserID,
       complete = bid.Helpers.complete,
-      context,
       server_time,
+      context,
       domain_key_creation_time,
       auth_status,
       code_version,

resources/static/include_js/include.js

@@ -1227,6 +1227,12 @@
     };
 
     navigator.id = {
+      watch: function(options) {
+        if (this != navigator.id)
+          throw new Error("all navigator.id calls must be made on the navigator.id object");
+        checkCompat(false);
+        internalWatch(options);
+      },
       request: function(options) {
         if (this != navigator.id)
           throw new Error("all navigator.id calls must be made on the navigator.id object");
@@ -1237,12 +1243,6 @@
         if (!options.returnTo) options.returnTo = document.location.pathname;
         return internalRequest(options);
       },
-      watch: function(options) {
-        if (this != navigator.id)
-          throw new Error("all navigator.id calls must be made on the navigator.id object");
-        checkCompat(false);
-        internalWatch(options);
-      },
       // logout from the current website
       // The callback parameter is DEPRECATED, instead you should use the
       // the .onlogout observer of the .watch() api.

scripts/browserid.spec

@@ -2,7 +2,7 @@
 
 Name:          browserid-server
 Version:       0.2012.11.23
-Release:       4%{?dist}_%{svnrev}
+Release:       5%{?dist}_%{svnrev}
 Summary:       BrowserID server
 Packager:      Gene Wood <gene@mozilla.com>
 Group:         Development/Libraries