Bug 1373326 - DO NOT LAND - changes applied only to date branch draft
authorJustin Wood <Callek@gmail.com>
Sat, 10 Dec 2016 15:01:56 -0500
changeset 595727 c7ee6b1b7267b59cdb8ebabfe77c34af29abbc35
parent 594702 035c25bef7b5e4175006e63eff10c61c2eef73f1
child 595728 64cceba33a6d9d4c04e4f6a285abc3f4eb6b2a4f
push id64437
push userCallek@gmail.com
push dateFri, 16 Jun 2017 20:04:52 +0000
bugs1373326
milestone56.0a1
Bug 1373326 - DO NOT LAND - changes applied only to date branch MozReview-Commit-ID: 7SL5RZv4Y3X
mobile/android/branding/nightly/configure.sh
security/manager/ssl/StaticHPKPins.h
--- a/mobile/android/branding/nightly/configure.sh
+++ b/mobile/android/branding/nightly/configure.sh
@@ -1,9 +1,9 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MOZ_APP_DISPLAYNAME="Firefox Nightly"
+MOZ_APP_DISPLAYNAME="Date Nightly"
 MOZ_UPDATER=1
 MOZ_ANDROID_ANR_REPORTER=1
 MOZ_ANDROID_SHARED_ID=org.mozilla.fennec.sharedID
 MOZ_ANDROID_GCM_SENDERID=965234145045
--- a/security/manager/ssl/StaticHPKPins.h
+++ b/security/manager/ssl/StaticHPKPins.h
@@ -687,16 +687,17 @@ static const TransportSecurityPreload kP
   { "api.twitter.com", true, false, false, -1, &kPinset_twitterCDN },
   { "apis.google.com", true, false, false, -1, &kPinset_google_root_pems },
   { "appengine.google.com", true, false, false, -1, &kPinset_google_root_pems },
   { "apps.facebook.com", true, false, false, -1, &kPinset_facebook },
   { "appspot.com", true, false, false, -1, &kPinset_google_root_pems },
   { "at.search.yahoo.com", false, true, false, -1, &kPinset_yahoo },
   { "au.search.yahoo.com", false, true, false, -1, &kPinset_yahoo },
   { "aus4.mozilla.org", true, true, true, 3, &kPinset_mozilla_services },
+  { "aus4.stage.mozaws.net", true, true, true, -1, &kPinset_mozilla_services },
   { "aus5.mozilla.org", true, true, true, 7, &kPinset_mozilla_services },
   { "az.search.yahoo.com", false, true, false, -1, &kPinset_yahoo },
   { "be.search.yahoo.com", false, true, false, -1, &kPinset_yahoo },
   { "bi.search.yahoo.com", false, true, false, -1, &kPinset_yahoo },
   { "blog.torproject.org", true, false, false, -1, &kPinset_tor },
   { "blogger.com", true, false, false, -1, &kPinset_google_root_pems },
   { "blogspot.com", true, false, false, -1, &kPinset_google_root_pems },
   { "br.search.yahoo.com", false, true, false, -1, &kPinset_yahoo },