diff -Nru firefox-53.0.2+build1/browser/app/blocklist.xml firefox-53.0.3+build1/browser/app/blocklist.xml --- firefox-53.0.2+build1/browser/app/blocklist.xml 2017-05-05 11:01:33.000000000 +0000 +++ firefox-53.0.3+build1/browser/app/blocklist.xml 2017-05-23 12:36:42.000000000 +0000 @@ -117,6 +117,10 @@ + + + + @@ -181,6 +185,10 @@ + + + + @@ -2636,6 +2644,11 @@ + + + https://get.adobe.com/flashplayer/ + + @@ -3103,6 +3116,11 @@ https://get.adobe.com/flashplayer/ + + + https://get.adobe.com/flashplayer/ + + @@ -3647,8 +3665,8 @@ frj5jTuqBnQ4fljPvVU3KA== - - A4g + + AMs= BAAAAAABFqoAZoI= @@ -3701,9 +3719,6 @@ BYyEX2b5+K+myAIR7eXaRQ== - - OGPFrg= - BAAAAAABLF5/Gog= @@ -3758,9 +3773,6 @@ BydiAg== - - QAEy3RIAAAAAAAAMweH5dw= - Eg== @@ -3782,8 +3794,8 @@ Pgyeh2mqlVzqI9hFntRbUQ== - - LAVIFm0MWZYH+Sv8Vf+IqkM + + ByfDtA== Gd/pPu+qLnXUdvP9sW73CQ== @@ -3821,9 +3833,6 @@ KuzHPJLdK5hNgJRo3R47Ag== - - YUlF+VXF2FWFqCo472HfZlw - WJ2qHzWUqTk= @@ -3851,6 +3860,9 @@ EEpERSryZFMagbsNw/WoWQ== + + A4w= + Aw== @@ -3869,6 +3881,9 @@ BAAAAAABM6d3Z0s= + + APt5i5rs4dIIQPwZdk9/ISc= + CjM= @@ -3884,15 +3899,9 @@ cDggUYfwJ3A1YcdoeT6s4A== - - RVWTeb5EKqE7cy7MUD2oJ3M - CrTHPEE6AZSfI3jysin2bA== - - RdHgEmEIjdyRFWDRRlk - ATE3ew== @@ -3950,18 +3959,21 @@ UW3oKZKTDsrPy/rfwmGNaQ== + + QAEy3RIAAAAAAAAMweH5dw== + AjpW E77H6yvyFQjO0PcN3x0H+Q== + + DL8= + B+U= - - AZ0 - OUvvVscW0/NltofkmV9qmg== @@ -3977,9 +3989,6 @@ JV/LVzSKI/wsDgg3UuZHlA== - - Byemag= - U+1Y1QpJc0FOR5JdCJ01gQ== @@ -4004,12 +4013,12 @@ GN2Hrh9LtnA= - - A4w - AuhvPsYZfVP6UDsuyjeZ4Q== + + cx0HrIEQg8JHWTP7DzOxSQ== + BAAAAAABJ/ufRdg= @@ -4040,6 +4049,9 @@ QAAnEQ== + + A4g= + d8AtKymQwkOPDBj+hjPzFg== @@ -4055,15 +4067,15 @@ Ew1ee9Jq7Q/Dig3ACF4V6Q== + + RVWTeb5EKqE7cy7MUD2oJ3M= + ORFgmCj072NjcJnrxOMfQA== HxT1XSjIpzjMprp9Qu1gYQ== - - DL8 - BAAAAAABL07hUBg= @@ -4085,18 +4097,12 @@ BydInw== - - ByemaQ= - F7PAjw2k0dTX5escPnyVOBo= Aa8e+91erglSMgsk/mtVaA== - - R/j2qA= - TXxtAQ== @@ -4124,12 +4130,6 @@ EAdmaA== - - RvCM2iRdkCE82ZOO2dU - - - Bydvrw= - EQ== @@ -4142,6 +4142,9 @@ OfJBIhFwAdQ= + + YUlF+VXF2FWFqCo472HfZlw= + BAAAAAABHkSHjz8= @@ -4172,9 +4175,6 @@ BHk= - - UdNjvA= - ByfNeA== @@ -4190,12 +4190,18 @@ BydKkg== + + OGPFrg== + LdbnCbsA9sOgI4mkUpWXPw== e7wSpVxmgAS5/ioLi2iBIA== + + Byemag== + FNISyWWTGi5Yco6fGh58/A== @@ -4256,24 +4262,21 @@ Xrr31RF0DoIzMKXS6XtD+g== - - Rea7UUYH3jl33BryPIo - - - QM1zZ4GZ4gfwpQtUYye3Ne0 - BAAAAAABCFiEp9s= PAdKZPiaac2CvPxbOrsHOw== - - IHj3eiEK3K1Xrpu1uvtBuvE - a9rf7/BmG9JkKvRuy7J5QA== + + QM1zZ4GZ4gfwpQtUYye3Ne0= + + + UbQGvw== + M0VSOewW3WI= @@ -4352,6 +4355,9 @@ GN2Hrh9Ltm4= + + UdNjvA== + Os2rnHWYhryvdOXfgan06A== @@ -4370,9 +4376,6 @@ BAAAAAABJQcQRNU= - - ByfDtA= - VOcIuNbTqkpOMUyI108FOg== @@ -4397,12 +4400,18 @@ AJiU+bpWh2Uc4xFRf8GM9yA= + + AZ0= + CcHC1w== UV9aaDeNRNtQuXjRYk4Skhg= + + RdHgEmEIjdyRFWDRRlk= + AQw= @@ -4460,21 +4469,18 @@ Mq0P6o03FDk0B2bnJ+mYPGo= - - APt5i5rs4dIIQPwZdk9/ISc - ESAyW/JX3+hZIp44EAMlXU2b + + Bydvrw== + Aw== GN2Hrh9Ltms= - - AMs - Qh/QbQ== @@ -4502,6 +4508,9 @@ TAA2G+UIK6mqznQKBT77NA== + + RvCM2iRdkCE82ZOO2dU= + ESCyHU+xOECnh9Rf2IvgR8zS @@ -4514,6 +4523,9 @@ BAAAAAABHkSl5AQ= + + ByemaQ== + K1ftto7Xcb0YKwQ6uMvOIA== @@ -4574,14 +4586,17 @@ ESBrHE7sFC7CQ8EM681xA3CY + + Rea7UUYH3jl33BryPIo= + eR1nUEz8k+nDSBD+bb5uIQ== Ermwtg== - - cx0HrIEQg8JHWTP7DzOxSQ= + + LAVIFm0MWZYH+Sv8Vf+IqkM= STMAeg== @@ -4655,6 +4670,9 @@ J2La+q+JOURNWkX60OP2lQ== + + R/j2qA== + CdWFNw== @@ -4685,9 +4703,6 @@ Aw1SPC56593ZCZ9vCNHKwQ== - - UbQGvw= - JD1wxDd8IgmiqX7MyPPg1g== @@ -4730,6 +4745,9 @@ ATFpsA== + + IHj3eiEK3K1Xrpu1uvtBuvE= + cpqpXVWPk5AXzGw+zNIcBw== diff -Nru firefox-53.0.2+build1/browser/config/version_display.txt firefox-53.0.3+build1/browser/config/version_display.txt --- firefox-53.0.2+build1/browser/config/version_display.txt 2017-05-05 11:01:33.000000000 +0000 +++ firefox-53.0.3+build1/browser/config/version_display.txt 2017-05-23 12:36:52.000000000 +0000 @@ -1 +1 @@ -53.0.2 +53.0.3 diff -Nru firefox-53.0.2+build1/browser/config/version.txt firefox-53.0.3+build1/browser/config/version.txt --- firefox-53.0.2+build1/browser/config/version.txt 2017-05-05 11:01:33.000000000 +0000 +++ firefox-53.0.3+build1/browser/config/version.txt 2017-05-23 12:36:52.000000000 +0000 @@ -1 +1 @@ -53.0.2 +53.0.3 diff -Nru firefox-53.0.2+build1/config/milestone.txt firefox-53.0.3+build1/config/milestone.txt --- firefox-53.0.2+build1/config/milestone.txt 2017-05-05 11:01:33.000000000 +0000 +++ firefox-53.0.3+build1/config/milestone.txt 2017-05-23 12:36:52.000000000 +0000 @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -53.0.2 +53.0.3 diff -Nru firefox-53.0.2+build1/debian/changelog firefox-53.0.3+build1/debian/changelog --- firefox-53.0.2+build1/debian/changelog 2017-05-05 14:34:18.000000000 +0000 +++ firefox-53.0.3+build1/debian/changelog 2017-05-23 14:12:12.000000000 +0000 @@ -1,3 +1,10 @@ +firefox (53.0.3+build1-0ubuntu0.14.04.2) trusty-security; urgency=medium + + * New upstream stable release (53.0.3build1) + - see USN-3299-1 + + -- Chris Coulson Tue, 23 May 2017 15:12:12 +0100 + firefox (53.0.2+build1-0ubuntu0.14.04.2) trusty-security; urgency=medium * New upstream stable release (53.0.2build1) diff -Nru firefox-53.0.2+build1/dom/media/platforms/android/MediaCodecDataDecoder.cpp firefox-53.0.3+build1/dom/media/platforms/android/MediaCodecDataDecoder.cpp --- firefox-53.0.2+build1/dom/media/platforms/android/MediaCodecDataDecoder.cpp 2017-05-05 11:01:35.000000000 +0000 +++ firefox-53.0.3+build1/dom/media/platforms/android/MediaCodecDataDecoder.cpp 2017-05-23 12:36:44.000000000 +0000 @@ -467,7 +467,11 @@ MonitorAutoLock lock(mMonitor); if (mState == ModuleState::kFlushing) { - mDecoder->Flush(); + // Flush MediaCodec only when there is input in progress to works around a bug + // in some Android 4.2.2 devices. See bug 1362969. + if (!mDurations.empty()) { + mDecoder->Flush(); + } ClearQueue(); SetState(ModuleState::kDecoding); lock.Notify(); diff -Nru firefox-53.0.2+build1/l10n/changesets firefox-53.0.3+build1/l10n/changesets --- firefox-53.0.2+build1/l10n/changesets 2017-05-05 11:15:09.000000000 +0000 +++ firefox-53.0.3+build1/l10n/changesets 2017-05-23 12:50:06.000000000 +0000 @@ -1,93 +1,93 @@ ach 805:ad4861cc8b97 af 1035:ed2ad4994929 an 911:99f7617b5ca8 -ar 2394:2c965e6acaae +ar 2395:708b2fb5ac2e as 1123:ec72c8873d6f -ast 1915:52664de33265 +ast 1916:35ef75b1520f az 930:a343b97c361b -bg 1986:9633b57f2b73 -bn-BD 1624:cae6bc74c7bd +bg 1987:87f182cd693f +bn-BD 1625:7ede34ddb8ee bn-IN 1392:9f8087a5f6cd -br 1952:01d7658bfb3f +br 1953:8a2b6d3bb9f0 bs 946:bd981c758c72 -ca 3170:0aa9c605ec2a +ca 3171:f83825f31cd5 cak 660:3ad4113a7360 -cs 4987:8703fb2ad5f5 -cy 1770:fcec188d3346 -da 2897:3246c090fffc -de 5681:bfd3c41230b3 -dsb 973:277cf2f5cb66 -el 2082:2e21448965cd -en-GB 2572:8b368c9ac6b4 +cs 4988:758ea39d5c14 +cy 1771:218395feb76e +da 2898:038056825e08 +de 5682:f85c3a05d429 +dsb 974:299e7be3b8d0 +el 2083:a68d7c3b38ea +en-GB 2573:82274101fb4a en-ZA 938:3e25fa2becca eo 1449:49831294d72e -es-AR 3833:db102dfff15b +es-AR 3834:e4b832803a09 es-CL 1753:58ac3780452e -es-ES 5017:49c80112aaa4 +es-ES 5018:3b3ffbbddada es-MX 1700:aa55d36c0695 -et 2376:a1a43617c06b -eu 2234:0969e7e15de4 +et 2377:6787290958c6 +eu 2235:649fe11c030d fa 1765:d5f8a48f15d2 ff 1013:fd37d118280c -fi 2973:50c3d005ed32 -fr 8023:3129e2e69b85 -fy-NL 3422:eae2c33135ba -ga-IE 2461:8d888697ab8f -gd 2286:33f939cc55f6 -gl 3582:2c6466b3dc25 +fi 2974:53397c4a07b5 +fr 8024:5d63d8a6a29a +fy-NL 3423:f686d202e06d +ga-IE 2462:8eda86a1960e +gd 2287:1613f69c50a2 +gl 3583:64fbf0968700 gn 331:51054649b046 gu-IN 1602:c713ea51e83a -he 2122:c1b9fdc254d8 +he 2123:43e995588303 hi-IN 1613:24a69ca3f8ea -hr 2329:fe842c90e74d -hsb 1155:25e88af75b17 -hu 3247:deb8181a512f -hy-AM 1839:d51c497ca8e8 -id 2349:a748673262b1 -is 1990:aab0b3e5d0d0 -it 7711:e8b5518df9f6 -ja 3104:1c6c0e10c961 -ja-JP-mac 2545:c02b0f092a7f +hr 2330:30ec54b5cd66 +hsb 1156:aa20198813e6 +hu 3248:abf82d82d8bb +hy-AM 1840:3bd05362d540 +id 2350:0306f1e806c9 +is 1991:68bf4c51b142 +it 7712:0c43262446e6 +ja 3105:6b351d14b06f +ja-JP-mac 2546:1e36b81b1cb7 ka 311:3b036c9e61a6 -kab 483:ab492e4203ee +kab 484:e895a463c7ea kk 1597:08696f7c8a1a km 1097:c68136590500 kn 1521:6160ec938484 -ko 2631:c2492a990be8 +ko 2632:29e76bdb676b lij 1063:6f8083311567 -lt 3757:7f46df6b82e7 +lt 3758:64cb73a260b0 lv 1804:10389753c571 mai 1213:7e4a8262ce47 mk 872:123d0c7a029e ml 1386:6489a17e1231 mr 1575:6e618c26bbbc ms 1112:f1b58ca03654 -nb-NO 3388:5f6540708490 -nl 6281:9e41751d66a6 -nn-NO 2114:06680c26d644 +nb-NO 3389:0c77db48f8ba +nl 6282:d4aecb3edd6d +nn-NO 2115:1d1e53d2e8ec or 1208:16dd77306673 -pa-IN 2357:c91312275ef3 -pl 9865:9146b315b1ce -pt-BR 3321:1269367330bb -pt-PT 5928:f95b09f04e8b -rm 1893:d799df05bddf -ro 2654:7dd3ee78d52f -ru 4896:9820f7f7e28c -si 1620:7ad73034fa26 -sk 4746:7fc8a100d657 -sl 3162:856d3f538a4d +pa-IN 2358:5742d6d3668c +pl 9866:e36b91b008ab +pt-BR 3322:845ae7fe3307 +pt-PT 5929:f197e6c939f9 +rm 1894:bec36f4d5d5f +ro 2655:44cec24df102 +ru 4897:2a941fe0ede0 +si 1621:de26f22935dc +sk 4747:3ff202e952b7 +sl 3163:573cf42740f9 son 1287:8a18464fb645 -sq 2546:5ba6b10d1f5c -sr 1784:59c0b23a2898 -sv-SE 5477:fce70dbd1ce4 +sq 2547:e55ae8a47254 +sr 1785:76134ed4dd1c +sv-SE 5478:cf32cc445426 ta 1342:1e7e519542ff te 1629:510cff80cfbe th 2078:5aa843627cdb -tr 2962:1a280610680a -uk 3869:48aec3b37d08 +tr 2963:c493c58b282d +uk 3870:0e79020144d3 ur 472:8916a4a4ac78 uz 852:4f2be0c7cf61 -vi 1291:6f4f4548f211 +vi 1292:8d2bb0ef23c5 xh 1115:0bbddd61bf1d -zh-CN 3221:b455ae1d809f -zh-TW 3300:7706209f0ade +zh-CN 3222:18d054657c3f +zh-TW 3301:021114430978 diff -Nru firefox-53.0.2+build1/netwerk/base/CaptivePortalService.cpp firefox-53.0.3+build1/netwerk/base/CaptivePortalService.cpp --- firefox-53.0.2+build1/netwerk/base/CaptivePortalService.cpp 2017-05-05 11:01:39.000000000 +0000 +++ firefox-53.0.3+build1/netwerk/base/CaptivePortalService.cpp 2017-05-23 12:36:47.000000000 +0000 @@ -85,6 +85,13 @@ mTimer->Cancel(); } + // If we have successfully determined the state, and we have never detected + // a captive portal, we don't need to keep polling, but will rely on events + // to trigger detection. + if (mState == NOT_CAPTIVE) { + return NS_OK; + } + if (!mTimer) { mTimer = do_CreateInstance(NS_TIMER_CONTRACTID); } diff -Nru firefox-53.0.2+build1/netwerk/protocol/http/Http2Compression.cpp firefox-53.0.3+build1/netwerk/protocol/http/Http2Compression.cpp --- firefox-53.0.2+build1/netwerk/protocol/http/Http2Compression.cpp 2017-05-05 11:01:39.000000000 +0000 +++ firefox-53.0.3+build1/netwerk/protocol/http/Http2Compression.cpp 2017-05-23 12:36:47.000000000 +0000 @@ -17,6 +17,7 @@ #include "Http2HuffmanIncoming.h" #include "Http2HuffmanOutgoing.h" #include "mozilla/StaticPtr.h" +#include "nsCharSeparatedTokenizer.h" #include "nsHttpHandler.h" namespace mozilla { @@ -452,6 +453,12 @@ // with the server. softfail_rv = rv; rv = NS_OK; + } else if (rv == NS_ERROR_NET_RESET) { + // This happens when we detect connection-based auth being requested in + // the response headers. We'll paper over it for now, and the session will + // handle this as if it received RST_STREAM with HTTP_1_1_REQUIRED. + softfail_rv = rv; + rv = NS_OK; } } @@ -518,6 +525,23 @@ return NS_OK; } +static bool +HasConnectionBasedAuth(const nsACString& headerValue) +{ + nsCCharSeparatedTokenizer t(headerValue, '\n'); + while (t.hasMoreTokens()) { + const nsDependentCSubstring& authMethod = t.nextToken(); + if (authMethod.LowerCaseEqualsLiteral("ntlm")) { + return true; + } + if (authMethod.LowerCaseEqualsLiteral("negotiate")) { + return true; + } + } + + return false; +} + nsresult Http2Decompressor::OutputHeader(const nsACString &name, const nsACString &value) { @@ -613,6 +637,20 @@ mOutput->AppendLiteral(": "); mOutput->Append(value); mOutput->AppendLiteral("\r\n"); + + // Need to check if the server is going to try to speak connection-based auth + // with us. If so, we need to kill this via h2, and dial back with http/1.1. + // Technically speaking, the server should've just reset or goaway'd us with + // HTTP_1_1_REQUIRED, but there are some busted servers out there, so we need + // to check on our own to work around them. + if (name.EqualsLiteral("www-authenticate") || + name.EqualsLiteral("proxy-authenticate")) { + if (HasConnectionBasedAuth(value)) { + LOG3(("Http2Decompressor %p connection-based auth found in %s", this, + name.BeginReading())); + return NS_ERROR_NET_RESET; + } + } return NS_OK; } @@ -957,7 +995,9 @@ if (NS_SUCCEEDED(rv)) { rv = OutputHeader(name, value); } - if (NS_FAILED(rv)) { + // Let NET_RESET continue on so that we don't get out of sync, as it is just + // used to kill the stream, not the session. + if (NS_FAILED(rv) && rv != NS_ERROR_NET_RESET) { return rv; } @@ -968,7 +1008,7 @@ room, name.get(), value.get())); LOG(("Decompressor state after ClearHeaderTable")); DumpState(); - return NS_OK; + return rv; } MakeRoom(room, "decompressor"); @@ -989,7 +1029,7 @@ LOG(("HTTP decompressor literal with index 0 %s %s\n", name.get(), value.get())); - return NS_OK; + return rv; } nsresult diff -Nru firefox-53.0.2+build1/netwerk/protocol/http/Http2Session.cpp firefox-53.0.3+build1/netwerk/protocol/http/Http2Session.cpp --- firefox-53.0.2+build1/netwerk/protocol/http/Http2Session.cpp 2017-05-05 11:01:39.000000000 +0000 +++ firefox-53.0.3+build1/netwerk/protocol/http/Http2Session.cpp 2017-05-23 12:36:47.000000000 +0000 @@ -1351,14 +1351,12 @@ mDecompressBuffer, mFlatHTTPResponseHeaders, httpResponseCode); - if (rv == NS_ERROR_ABORT) { - LOG(("Http2Session::ResponseHeadersComplete ConvertResponseHeaders aborted\n")); - if (mInputFrameDataStream->IsTunnel()) { - gHttpHandler->ConnMgr()->CancelTransactions( - mInputFrameDataStream->Transaction()->ConnectionInfo(), - NS_ERROR_CONNECTION_REFUSED); - } - CleanupStream(mInputFrameDataStream, rv, CANCEL_ERROR); + if (rv == NS_ERROR_NET_RESET) { + LOG(("Http2Session::ResponseHeadersComplete %p ConvertResponseHeaders reset\n", this)); + // This means the stream found connection-oriented auth. Treat this like we + // got a reset with HTTP_1_1_REQUIRED. + mInputFrameDataStream->Transaction()->DisableSpdy(); + CleanupStream(mInputFrameDataStream, NS_ERROR_NET_RESET, CANCEL_ERROR); ResetDownstreamState(); return NS_OK; } else if (NS_FAILED(rv)) { diff -Nru firefox-53.0.2+build1/netwerk/protocol/http/nsHttpChannelAuthProvider.cpp firefox-53.0.3+build1/netwerk/protocol/http/nsHttpChannelAuthProvider.cpp --- firefox-53.0.2+build1/netwerk/protocol/http/nsHttpChannelAuthProvider.cpp 2017-05-05 11:01:39.000000000 +0000 +++ firefox-53.0.3+build1/netwerk/protocol/http/nsHttpChannelAuthProvider.cpp 2017-05-23 12:36:47.000000000 +0000 @@ -817,10 +817,6 @@ } mConnectionBased = !!(authFlags & nsIHttpAuthenticator::CONNECTION_BASED); - if (mConnectionBased) { - rv = mAuthChannel->ForceNoSpdy(); - MOZ_ASSERT(NS_SUCCEEDED(rv)); - } if (identityInvalid) { if (entry) { diff -Nru firefox-53.0.2+build1/netwerk/protocol/http/nsHttpChannel.cpp firefox-53.0.3+build1/netwerk/protocol/http/nsHttpChannel.cpp --- firefox-53.0.2+build1/netwerk/protocol/http/nsHttpChannel.cpp 2017-05-05 11:01:39.000000000 +0000 +++ firefox-53.0.3+build1/netwerk/protocol/http/nsHttpChannel.cpp 2017-05-23 12:36:48.000000000 +0000 @@ -5591,25 +5591,6 @@ return NS_OK; } -NS_IMETHODIMP nsHttpChannel::ForceNoSpdy() -{ - LOG(("nsHttpChannel::ForceNoSpdy this=%p", this)); - - MOZ_ASSERT(mTransaction); - if (!mTransaction) { - return NS_ERROR_UNEXPECTED; - } - - mAllowSpdy = 0; - mCaps |= NS_HTTP_DISALLOW_SPDY; - - if (!(mTransaction->Caps() & NS_HTTP_DISALLOW_SPDY)) { - mTransaction->DisableSpdy(); - } - - return NS_OK; -} - //----------------------------------------------------------------------------- // nsHttpChannel::nsISupports //----------------------------------------------------------------------------- diff -Nru firefox-53.0.2+build1/netwerk/protocol/http/nsHttpChannel.h firefox-53.0.3+build1/netwerk/protocol/http/nsHttpChannel.h --- firefox-53.0.2+build1/netwerk/protocol/http/nsHttpChannel.h 2017-05-05 11:01:39.000000000 +0000 +++ firefox-53.0.3+build1/netwerk/protocol/http/nsHttpChannel.h 2017-05-23 12:36:48.000000000 +0000 @@ -111,7 +111,6 @@ NS_IMETHOD OnAuthAvailable() override; NS_IMETHOD OnAuthCancelled(bool userCancel) override; NS_IMETHOD CloseStickyConnection() override; - NS_IMETHOD ForceNoSpdy() override; // Functions we implement from nsIHttpAuthenticableChannel but are // declared in HttpBaseChannel must be implemented in this class. We // just call the HttpBaseChannel:: impls. diff -Nru firefox-53.0.2+build1/netwerk/protocol/http/nsHttpTransaction.cpp firefox-53.0.3+build1/netwerk/protocol/http/nsHttpTransaction.cpp --- firefox-53.0.2+build1/netwerk/protocol/http/nsHttpTransaction.cpp 2017-05-05 11:01:39.000000000 +0000 +++ firefox-53.0.3+build1/netwerk/protocol/http/nsHttpTransaction.cpp 2017-05-23 12:36:47.000000000 +0000 @@ -2016,11 +2016,6 @@ MOZ_ASSERT(mResponseHead); MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread); - if (mClosed) { - LOG((" closed, not checking")); - return; - } - CheckForStickyAuthSchemeAt(nsHttp::WWW_Authenticate); CheckForStickyAuthSchemeAt(nsHttp::Proxy_Authenticate); } diff -Nru firefox-53.0.2+build1/netwerk/protocol/http/nsHttpTransaction.h firefox-53.0.3+build1/netwerk/protocol/http/nsHttpTransaction.h --- firefox-53.0.2+build1/netwerk/protocol/http/nsHttpTransaction.h 2017-05-05 11:01:39.000000000 +0000 +++ firefox-53.0.3+build1/netwerk/protocol/http/nsHttpTransaction.h 2017-05-23 12:36:48.000000000 +0000 @@ -134,8 +134,6 @@ void DispatchedAsBlocking(); void RemoveDispatchedAsBlocking(); - void DisableSpdy() override; - nsHttpTransaction *QueryHttpTransaction() override { return this; } Http2PushedStream *GetPushedStream() { return mPushedStream; } @@ -200,6 +198,7 @@ bool ResponseTimeoutEnabled() const final; + void DisableSpdy() override; void ReuseConnectionOnRestartOK(bool reuseOk) override { mReuseOnRestart = reuseOk; } // Called right after we parsed the response head. Checks for connection based diff -Nru firefox-53.0.2+build1/netwerk/protocol/http/nsIHttpAuthenticableChannel.idl firefox-53.0.3+build1/netwerk/protocol/http/nsIHttpAuthenticableChannel.idl --- firefox-53.0.2+build1/netwerk/protocol/http/nsIHttpAuthenticableChannel.idl 2017-05-05 11:01:39.000000000 +0000 +++ firefox-53.0.3+build1/netwerk/protocol/http/nsIHttpAuthenticableChannel.idl 2017-05-23 12:36:48.000000000 +0000 @@ -112,10 +112,4 @@ * the same connection. */ void closeStickyConnection(); - - /** - * Tells the channel to not use SPDY-like protocols, since this will be - * using connection-oriented auth. - */ - void forceNoSpdy(); }; diff -Nru firefox-53.0.2+build1/security/manager/ssl/nsSTSPreloadList.inc firefox-53.0.3+build1/security/manager/ssl/nsSTSPreloadList.inc --- firefox-53.0.2+build1/security/manager/ssl/nsSTSPreloadList.inc 2017-05-05 11:01:39.000000000 +0000 +++ firefox-53.0.3+build1/security/manager/ssl/nsSTSPreloadList.inc 2017-05-23 12:36:48.000000000 +0000 @@ -8,7 +8,7 @@ /*****************************************************************************/ #include -const PRTime gPreloadListExpirationTime = INT64_C(1499616972516000); +const PRTime gPreloadListExpirationTime = INT64_C(1502150400000000); static const char kSTSHostTable[] = { /* "0.me.uk", true */ '0', '.', 'm', 'e', '.', 'u', 'k', '\0', diff -Nru firefox-53.0.2+build1/security/manager/ssl/StaticHPKPins.h firefox-53.0.3+build1/security/manager/ssl/StaticHPKPins.h --- firefox-53.0.2+build1/security/manager/ssl/StaticHPKPins.h 2017-05-05 11:01:39.000000000 +0000 +++ firefox-53.0.3+build1/security/manager/ssl/StaticHPKPins.h 2017-05-23 12:36:48.000000000 +0000 @@ -1155,4 +1155,4 @@ static const int32_t kUnknownId = -1; -static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1497197779613000); +static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1502150400000000); diff -Nru firefox-53.0.2+build1/SOURCE_CHANGESET firefox-53.0.3+build1/SOURCE_CHANGESET --- firefox-53.0.2+build1/SOURCE_CHANGESET 2017-05-05 11:01:43.000000000 +0000 +++ firefox-53.0.3+build1/SOURCE_CHANGESET 2017-05-23 12:36:52.000000000 +0000 @@ -1 +1 @@ -f87a819106bd98895e38bd26c134031c534a19ff \ No newline at end of file +1fe643b3421a27640a61a3b2b8b0986c7234e314 \ No newline at end of file diff -Nru firefox-53.0.2+build1/testing/mozharness/mozharness/mozilla/proxxy.py firefox-53.0.3+build1/testing/mozharness/mozharness/mozilla/proxxy.py --- firefox-53.0.2+build1/testing/mozharness/mozharness/mozilla/proxxy.py 2017-05-05 11:01:39.000000000 +0000 +++ firefox-53.0.3+build1/testing/mozharness/mozharness/mozilla/proxxy.py 2017-05-23 12:36:48.000000000 +0000 @@ -37,9 +37,8 @@ "instances": [ 'proxxy1.srv.releng.use1.mozilla.com', 'proxxy1.srv.releng.usw2.mozilla.com', - 'proxxy1.srv.releng.scl3.mozilla.com', ], - "regions": [".use1.", ".usw2.", ".scl3"], + "regions": [".use1.", ".usw2."], } def __init__(self, config, log_obj): diff -Nru firefox-53.0.2+build1/testing/mozharness/scripts/release/beet_mover.py firefox-53.0.3+build1/testing/mozharness/scripts/release/beet_mover.py --- firefox-53.0.2+build1/testing/mozharness/scripts/release/beet_mover.py 2017-05-05 11:01:39.000000000 +0000 +++ firefox-53.0.3+build1/testing/mozharness/scripts/release/beet_mover.py 2017-05-23 12:36:48.000000000 +0000 @@ -76,6 +76,10 @@ "dest": "bucket", "help": "s3 bucket to move beets to.", }], + [["--product"], { + "dest": "product", + "help": "product for which artifacts are beetmoved", + }], [["--exclude"], { "dest": "excludes", "action": "append", @@ -151,7 +155,6 @@ "mar", ], "virtualenv_path": "venv", - 'product': 'firefox', }, } #todo do excludes need to be configured via command line for specific builds? diff -Nru firefox-53.0.2+build1/toolkit/mozapps/installer/signing.mk firefox-53.0.3+build1/toolkit/mozapps/installer/signing.mk --- firefox-53.0.2+build1/toolkit/mozapps/installer/signing.mk 2017-05-05 11:01:41.000000000 +0000 +++ firefox-53.0.3+build1/toolkit/mozapps/installer/signing.mk 2017-05-23 12:36:50.000000000 +0000 @@ -23,7 +23,7 @@ endif # Windows ifeq (Darwin, $(OS_ARCH)) -MOZ_INTERNAL_SIGNING_FORMAT := dmgv2 +MOZ_INTERNAL_SIGNING_FORMAT := macapp MOZ_EXTERNAL_SIGNING_FORMAT := endif # Darwin