- tbb-commits - lists.torproject.org

[tor-browser/esr24] No bug, Automated HSTS preload list update from host bld-linux64-spot-367 - a=hsts-update
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit ed69ba7275bc0d146ac459e2bec8d61281a820b6 Author: ffxbld <none@none> Date: Sat May 3 03:13:48 2014 -0700 No bug, Automated HSTS preload list update from host bld-linux64-spot-367 - a=hsts-update --- security/manager/boot/src/nsSTSPreloadList.errors | 6 ++++-- security/manager/boot/src/nsSTSPreloadList.inc | 9 +++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors index 4c1a6eb..0e19384 100644 --- a/security/manager/boot/src/nsSTSPreloadList.errors +++ b/security/manager/boot/src/nsSTSPreloadList.errors @@ -1,5 +1,6 @@ admin.google.com: did not receive HSTS header alpha.irccloud.com: could not connect to host +anycoin.me: did not receive HSTS header api.mega.co.nz: could not connect to host api.recurly.com: did not receive HSTS header api.simple.com: did not receive HSTS header @@ -30,6 +31,7 @@ docs.google.com: did not receive HSTS header donmez.ws: could not connect to host drive.google.com: did not receive HSTS header dropcam.com: did not receive HSTS header +edmodo.com: did not receive HSTS header email.lookout.com: could not connect to host emailprivacytester.com: did not receive HSTS header encrypted.google.com: did not receive HSTS header @@ -61,7 +63,6 @@ lifeguard.aecom.com: did not receive HSTS header lists.mayfirst.org: did not receive HSTS header mail.google.com: did not receive HSTS header market.android.com: did not receive HSTS header -medium.com: max-age too low: 2592000 my.alfresco.com: did not receive HSTS header mydigipass.com: did not receive HSTS header mykolab.com: did not receive HSTS header @@ -82,6 +83,8 @@ sah3.net: could not connect to host saturngames.co.uk: did not receive HSTS header script.google.com: did not receive HSTS header security.google.com: did not receive HSTS header +seifried.org: did not receive HSTS header +semenkovich.com: could not connect to host serverdensity.io: did not receive HSTS header shops.neonisi.com: could not connect to host silentcircle.org: could not connect to host @@ -109,7 +112,6 @@ wepay.com: max-age too low: 2592000 whonix.org: did not receive HSTS header www.cueup.com: did not receive HSTS header www.developer.mydigipass.com: could not connect to host -www.dropcam.com: max-age too low: 2592000 www.elanex.biz: did not receive HSTS header www.gmail.com: did not receive HSTS header www.googlemail.com: did not receive HSTS header diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc index e2ecfc3..4673c6a 100644 --- a/security/manager/boot/src/nsSTSPreloadList.inc +++ b/security/manager/boot/src/nsSTSPreloadList.inc @@ -8,7 +8,7 @@ /*****************************************************************************/ #include "mozilla/StandardInteger.h" -const PRTime gPreloadListExpirationTime = INT64_C(1408788322005000); +const PRTime gPreloadListExpirationTime = INT64_C(1409997954029000); class nsSTSPreload { @@ -26,6 +26,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "alpha.irccloud.com", false }, { "api.intercom.io", false }, { "api.xero.com", false }, + { "app.manilla.com", true }, { "app.recurly.com", false }, { "app.yinxiang.com", false }, { "appseccalifornia.org", true }, @@ -60,6 +61,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "data.qld.gov.au", false }, { "davidlyness.com", true }, { "developer.mydigipass.com", false }, + { "dillonkorman.com", true }, { "dist.torproject.org", false }, { "dm.lookout.com", false }, { "dm.mylookout.com", false }, @@ -88,6 +90,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "gocardless.com", true }, { "grc.com", false }, { "grepular.com", true }, + { "harvestapp.com", true }, { "haste.ch", true }, { "heha.co", true }, { "howrandom.org", true }, @@ -123,6 +126,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "mattmccutchen.net", true }, { "mbp.banking.co.at", false }, { "mediacru.sh", true }, + { "medium.com", true }, { "mega.co.nz", false }, { "members.mayfirst.org", false }, { "members.nearlyfreespeech.net", false }, @@ -166,7 +170,6 @@ static const nsSTSPreload kSTSPreloadList[] = { { "roundcube.mayfirst.org", false }, { "sandbox.mydigipass.com", false }, { "securityheaders.com", true }, - { "seifried.org", true }, { "semenkovich.com", true }, { "shodan.io", true }, { "silentcircle.com", false }, @@ -196,7 +199,9 @@ static const nsSTSPreload kSTSPreloadList[] = { { "www.braintreepayments.com", false }, { "www.calyxinstitute.org", false }, { "www.cyveillance.com", true }, + { "www.dropcam.com", false }, { "www.entropia.de", false }, + { "www.eternalgoth.co.uk", true }, { "www.evernote.com", false }, { "www.getcloak.com", false }, { "www.gov.uk", false },

1 0

[tor-browser/esr24] No bug, Automated blocklist update from host bld-linux64-spot-445 - a=blocklist-update
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 95aaea3eb4639452833c46a98bde5d121bcf14a8 Author: ffxbld <none@none> Date: Sat May 3 03:11:30 2014 -0700 No bug, Automated blocklist update from host bld-linux64-spot-445 - a=blocklist-update --- browser/app/blocklist.xml | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml index 8de9f0f..ffbfe51 100644 --- a/browser/app/blocklist.xml +++ b/browser/app/blocklist.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1398202482000"> +<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1398899403000"> <emItems> <emItem blockID="i454" id="sqlmoz(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> @@ -113,6 +113,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i578" id="jid1-XLjasWL55iEE1Q@jetpack"> + <versionRange minVersion="0" maxVersion="*" severity="3"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i529" id="/^(torntv@torntv\.com|trtv3@trtv\.com|torntv2@torntv\.com|e2fd07a6-e282-4f2e-8965-85565fcb6384@b69158e6-3c3b-476c-9d98-ae5838c5b707\.com)$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> @@ -139,8 +145,13 @@ <prefs> </prefs> </emItem> - <emItem blockID="i10" id="{8CE11043-9A15-4207-A565-0C94C42D590D}"> - <prefs> + <emItem blockID="i4" id="{4B3803EA-5230-4DC3-A7FC-33638F3D3542}"> + <versionRange minVersion="1.2" maxVersion="1.2"> + <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> + <versionRange minVersion="3.0a1" maxVersion="*" /> + </targetApplication> + </versionRange> + <prefs> </prefs> </emItem> <emItem blockID="i492" id="{af95cc15-3b9b-45ae-8d9b-98d08eda3111}"> @@ -245,8 +256,8 @@ <prefs> </prefs> </emItem> - <emItem blockID="i84" id="pink(a)rosaplugin.info"> - <versionRange minVersion="0" maxVersion="*"> + <emItem blockID="i582" id="discoverypro(a)discoverypro.com"> + <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> <prefs> </prefs> @@ -562,11 +573,8 @@ <prefs> </prefs> </emItem> - <emItem blockID="i4" id="{4B3803EA-5230-4DC3-A7FC-33638F3D3542}"> - <versionRange minVersion="1.2" maxVersion="1.2"> - <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"> - <versionRange minVersion="3.0a1" maxVersion="*" /> - </targetApplication> + <emItem blockID="i101" id="{3a12052a-66ef-49db-8c39-e5b0bd5c83fa}"> + <versionRange minVersion="0" maxVersion="*"> </versionRange> <prefs> </prefs> @@ -732,6 +740,10 @@ <prefs> </prefs> </emItem> + <emItem blockID="i10" id="{8CE11043-9A15-4207-A565-0C94C42D590D}"> + <prefs> + </prefs> + </emItem> <emItem blockID="i548" id="/^firefox@(jumpflip|webconnect|browsesmart|mybuzzsearch|outobox|greygray|lemurleap|divapton|secretsauce|batbrowse|whilokii|linkswift|qualitink|browsefox|kozaka|diamondata|glindorus|saltarsmart|bizzybolt|websparkle)\.(com?|net|org|info|biz)$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> @@ -1356,7 +1368,7 @@ <prefs> </prefs> </emItem> - <emItem blockID="i101" id="{3a12052a-66ef-49db-8c39-e5b0bd5c83fa}"> + <emItem blockID="i84" id="pink(a)rosaplugin.info"> <versionRange minVersion="0" maxVersion="*"> </versionRange> <prefs> @@ -1523,6 +1535,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i580" id="{51c77233-c0ad-4220-8388-47c11c18b355}"> + <versionRange minVersion="0" maxVersion="*" severity="1"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i541" id="/^({988919ff-0cd8-4d0c-bc7e-60d55a49eb64}|{494b9726-9084-415c-a499-68c07e187244}|{55b95864-3251-45e9-bb30-1a82589aaff1}|{eef3855c-fc2d-41e6-8d91-d368f51b3055}|{90a1b331-c2b4-4933-9f63-ba7b84d60d58}|{d2cf9842-af95-48cd-b873-bfbb48cd7f5e})$/"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange>

1 0

[tor-browser/esr24] Bug 994907 - imgDecoderObserver does reference counting on different threads, so should be using thread safe reference counting. r=sfowler, r=ehsan, a=abillings
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit d1a76b53ffd0876efbe77c22b8b181843eebfd57 Author: Milan Sreckovic <milan(a)mozilla.com> Date: Wed May 7 15:31:52 2014 -0400 Bug 994907 - imgDecoderObserver does reference counting on different threads, so should be using thread safe reference counting. r=sfowler, r=ehsan, a=abillings --- image/src/imgDecoderObserver.h | 7 +++++-- image/src/imgStatusTracker.cpp | 5 +++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/image/src/imgDecoderObserver.h b/image/src/imgDecoderObserver.h index 138f6b0..06d1798 100644 --- a/image/src/imgDecoderObserver.h +++ b/image/src/imgDecoderObserver.h @@ -32,10 +32,10 @@ * loaded data fire before the call returns. If FLAG_SYNC_DECODE is not passed, * all, some, or none of the notifications may fire before the call returns. */ -class imgDecoderObserver : public mozilla::RefCounted<imgDecoderObserver> +class imgDecoderObserver { public: - virtual ~imgDecoderObserver() = 0; + NS_INLINE_DECL_THREADSAFE_REFCOUNTING(imgDecoderObserver); /** * Load notification. @@ -124,6 +124,9 @@ public: * Called when an image is realized to be in error state. */ virtual void OnError() = 0; + +protected: + virtual ~imgDecoderObserver() = 0; }; // We must define a destructor because derived classes call our destructor from diff --git a/image/src/imgStatusTracker.cpp b/image/src/imgStatusTracker.cpp index 06a352b..99c8f48 100644 --- a/image/src/imgStatusTracker.cpp +++ b/image/src/imgStatusTracker.cpp @@ -228,8 +228,6 @@ public: imgStatusTrackerObserver(imgStatusTracker* aTracker) : mTracker(aTracker) {} - virtual ~imgStatusTrackerObserver() {} - void SetTracker(imgStatusTracker* aTracker) { mTracker = aTracker; } @@ -317,6 +315,9 @@ public: mTracker->RecordError(); } +protected: + virtual ~imgStatusTrackerObserver() {} + private: imgStatusTracker* mTracker; };

1 0

[tor-browser/esr24] Bug 997820 - Properly set the reftest pref on esr24. a=bustage
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 6317e1c9d1d835fffbbcb3a871d52681038de416 Author: Ryan VanderMeulen <ryanvm(a)gmail.com> Date: Tue Apr 29 10:50:52 2014 -0400 Bug 997820 - Properly set the reftest pref on esr24. a=bustage --- layout/tools/reftest/runreftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layout/tools/reftest/runreftest.py b/layout/tools/reftest/runreftest.py index 70323a7..683b0a1 100644 --- a/layout/tools/reftest/runreftest.py +++ b/layout/tools/reftest/runreftest.py @@ -73,7 +73,7 @@ class RefTest(object): # Ensure that telemetry is disabled, so we don't connect to the telemetry # server in the middle of the tests. - prefs['toolkit.telemetry.enabled'] = False + prefsFile.write('user_pref("toolkit.telemetry.enabled", false);\n') for v in options.extraPrefs: thispref = v.split("=")

1 0

[tor-browser/esr24] Bug 997820 - Disable telemetry in tests. r=ted, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 4fdb5662d96302066846bc29ba4c06f2633dd610 Author: Nathan Froyd <froydnj(a)gmail.com> Date: Fri Apr 18 11:03:00 2014 -0400 Bug 997820 - Disable telemetry in tests. r=ted, a=test-only --- js/src/tests/user.js | 2 +- layout/tools/reftest/runreftest.py | 4 ++++ testing/profiles/prefs_general.js | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/js/src/tests/user.js b/js/src/tests/user.js index a5c88b1..8849221 100755 --- a/js/src/tests/user.js +++ b/js/src/tests/user.js @@ -26,4 +26,4 @@ user_pref("javascript.options.strict", false); user_pref("javascript.options.werror", false); user_pref("toolkit.startup.max_resumed_crashes", -1); user_pref("security.turn_off_all_security_so_that_viruses_can_take_over_this_computer", true); - +user_pref("toolkit.telemetry.enabled", false); diff --git a/layout/tools/reftest/runreftest.py b/layout/tools/reftest/runreftest.py index 88c3199..70323a7 100644 --- a/layout/tools/reftest/runreftest.py +++ b/layout/tools/reftest/runreftest.py @@ -71,6 +71,10 @@ class RefTest(object): prefsFile.write('user_pref("reftest.filter", %s);\n' % self.makeJSString(options.filter)) prefsFile.write('user_pref("reftest.focusFilterMode", %s);\n' % self.makeJSString(options.focusFilterMode)) + # Ensure that telemetry is disabled, so we don't connect to the telemetry + # server in the middle of the tests. + prefs['toolkit.telemetry.enabled'] = False + for v in options.extraPrefs: thispref = v.split("=") if len(thispref) < 2: diff --git a/testing/profiles/prefs_general.js b/testing/profiles/prefs_general.js index 3032a65..44b29b1 100644 --- a/testing/profiles/prefs_general.js +++ b/testing/profiles/prefs_general.js @@ -141,3 +141,6 @@ user_pref("media.webaudio.legacy.AudioParam", true); user_pref("media.webaudio.legacy.BiquadFilterNode", true); user_pref("media.webaudio.legacy.PannerNode", true); user_pref("media.webaudio.legacy.OscillatorNode", true); + +// We want to collect telemetry, but we don't want to send in the results. +user_pref('toolkit.telemetry.server', 'https://%(server)s/telemetry-dummy/');

1 0

[tor-browser/esr24] No bug, Automated blocklist update from host bld-linux64-spot-333 - a=blocklist-update
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 02fe2535cbf3166ea6b4ee02d5f3efdbfff815f5 Author: ffxbld <none@none> Date: Sat Apr 26 03:13:14 2014 -0700 No bug, Automated blocklist update from host bld-linux64-spot-333 - a=blocklist-update --- browser/app/blocklist.xml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml index 5f776e3..8de9f0f 100644 --- a/browser/app/blocklist.xml +++ b/browser/app/blocklist.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1396993434000"> +<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1398202482000"> <emItems> <emItem blockID="i454" id="sqlmoz(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> @@ -182,7 +182,7 @@ <prefs> </prefs> </emItem> - <emItem blockID="i566" id="{77BEC163-D389-42c1-91A4-C758846296A5}"> + <emItem blockID="i491" id="{515b2424-5911-40bd-8a2c-bdb20286d8f5}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> <prefs> @@ -1103,6 +1103,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i566" id="{77BEC163-D389-42c1-91A4-C758846296A5}"> + <versionRange minVersion="0" maxVersion="*" severity="1"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i533" id="extension(a)Fast_Free_Converter.com"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> @@ -1121,8 +1127,8 @@ <prefs> </prefs> </emItem> - <emItem blockID="i491" id="{515b2424-5911-40bd-8a2c-bdb20286d8f5}"> - <versionRange minVersion="0" maxVersion="*" severity="1"> + <emItem blockID="i576" id="newmoz(a)facebook.com"> + <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> <prefs> </prefs>

1 0

[tor-browser/esr24] Bug 772823 - Focus the main test window before closing the newly opened window in order to work around an unknown focus manager bug. r=gavin, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 745f14404e5e5d7ee21e3d70b5f09fd1f1533907 Author: Ehsan Akhgari <ehsan(a)mozilla.com> Date: Thu Apr 17 10:59:10 2014 -0400 Bug 772823 - Focus the main test window before closing the newly opened window in order to work around an unknown focus manager bug. r=gavin, a=test-only --- docshell/test/chrome/mozFrameType_window.xul | 31 ++++++++++++++------------ 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/docshell/test/chrome/mozFrameType_window.xul b/docshell/test/chrome/mozFrameType_window.xul index 020e6f0..aa811c3 100644 --- a/docshell/test/chrome/mozFrameType_window.xul +++ b/docshell/test/chrome/mozFrameType_window.xul @@ -33,20 +33,23 @@ "iframe with mozFrameType='content' in chrome document is typeContent"); SimpleTest.executeSoon(function () { - // Wait for the window to be closed before finishing the test - let ww = Components.classes["@mozilla.org/embedcomp/window-watcher;1"] - .getService(Components.interfaces.nsIWindowWatcher); - ww.registerNotification(function windowObs(subject, topic, data) { - if (topic == "domwindowclosed") { - ww.unregisterNotification(windowObs); - - SimpleTest.waitForFocus(function() { - SimpleTest.finish(); - }, opener); - } - }); - - window.close(); + // First focus the parent window and then close this one. + SimpleTest.waitForFocus(function() { + let ww = Components.classes["@mozilla.org/embedcomp/window-watcher;1"] + .getService(Components.interfaces.nsIWindowWatcher); + ww.registerNotification(function windowObs(subject, topic, data) { + if (topic == "domwindowclosed") { + ww.unregisterNotification(windowObs); + + // Don't start the next test synchronously! + SimpleTest.executeSoon(function() { + SimpleTest.finish(); + }); + } + }); + + window.close(); + }, opener); }); } ]]></script>

1 0

[tor-browser/esr24] Automated checkin: version bump for firefox 24.5.0esr release. DONTBUILD CLOSED TREE a=release
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit f5d107462c23081418999ca2e41f0a680d35e7d4 Author: ffxbld <none@none> Date: Mon Apr 21 19:00:36 2014 -0400 Automated checkin: version bump for firefox 24.5.0esr release. DONTBUILD CLOSED TREE a=release --- browser/config/version.txt | 2 +- config/milestone.txt | 2 +- js/src/config/milestone.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/browser/config/version.txt b/browser/config/version.txt index 2781e2b..3bd5cba 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -24.4.0esrpre +24.5.0esrpre diff --git a/config/milestone.txt b/config/milestone.txt index c0110c9..3c59cb3 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.4.0 +24.5.0esrpre diff --git a/js/src/config/milestone.txt b/js/src/config/milestone.txt index c0110c9..3c59cb3 100644 --- a/js/src/config/milestone.txt +++ b/js/src/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.4.0 +24.5.0esrpre

1 0

[tor-browser/esr24] Automated checkin: version bump for thunderbird 24.5.0 release. DONTBUILD CLOSED TREE a=release
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 0a1739dd79858b1330c0e995f85da3a231104b30 Author: tbirdbld <none@none> Date: Thu Apr 24 11:52:32 2014 -0400 Automated checkin: version bump for thunderbird 24.5.0 release. DONTBUILD CLOSED TREE a=release --- config/milestone.txt | 2 +- js/src/config/milestone.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/milestone.txt b/config/milestone.txt index 3c59cb3..dbc95cf 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.5.0esrpre +24.5.0 diff --git a/js/src/config/milestone.txt b/js/src/config/milestone.txt index 3c59cb3..dbc95cf 100644 --- a/js/src/config/milestone.txt +++ b/js/src/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.5.0esrpre +24.5.0

1 0

[tor-browser/esr24] Bug 991471 - Fix offset when setting host on URL. r=mcmanus, a=abillings
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 6f92a1feadf46e50286dfed67835e92038196dc2 Author: Valentin Gosu <valentin.gosu(a)gmail.com> Date: Thu Apr 10 10:23:04 2014 -0400 Bug 991471 - Fix offset when setting host on URL. r=mcmanus, a=abillings --- netwerk/base/src/nsStandardURL.cpp | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/netwerk/base/src/nsStandardURL.cpp b/netwerk/base/src/nsStandardURL.cpp index 2216580..d97718a 100644 --- a/netwerk/base/src/nsStandardURL.cpp +++ b/netwerk/base/src/nsStandardURL.cpp @@ -1476,7 +1476,14 @@ nsStandardURL::SetHost(const nsACString &input) len = flat.Length(); if (mHost.mLen < 0) { - mHost.mPos = mAuthority.mPos; + int port_length = 0; + if (mPort != -1) { + nsAutoCString buf; + buf.Assign(':'); + buf.AppendInt(mPort); + port_length = buf.Length(); + } + mHost.mPos = mAuthority.mPos + mAuthority.mLen - port_length; mHost.mLen = 0; } @@ -1520,7 +1527,7 @@ nsStandardURL::SetPort(int32_t port) nsAutoCString buf; buf.Assign(':'); buf.AppendInt(port); - mSpec.Insert(buf, mHost.mPos + mHost.mLen); + mSpec.Insert(buf, mAuthority.mPos + mAuthority.mLen); mAuthority.mLen += buf.Length(); ShiftFromPath(buf.Length()); } @@ -1528,9 +1535,14 @@ nsStandardURL::SetPort(int32_t port) // Don't allow mPort == mDefaultPort port = -1; + // compute length of the current port + nsAutoCString buf; + buf.Assign(':'); + buf.AppendInt(mPort); + // need to remove the port number from the URL spec - uint32_t start = mHost.mPos + mHost.mLen; - int32_t lengthToCut = mPath.mPos - start; + uint32_t start = mAuthority.mPos + mAuthority.mLen - buf.Length(); + int32_t lengthToCut = buf.Length(); mSpec.Cut(start, lengthToCut); mAuthority.mLen -= lengthToCut; ShiftFromPath(-lengthToCut); @@ -1538,9 +1550,13 @@ nsStandardURL::SetPort(int32_t port) else { // need to replace the existing port nsAutoCString buf; + buf.Assign(':'); + buf.AppendInt(mPort); + uint32_t start = mAuthority.mPos + mAuthority.mLen - buf.Length(); + uint32_t length = buf.Length(); + + buf.Assign(':'); buf.AppendInt(port); - uint32_t start = mHost.mPos + mHost.mLen + 1; - uint32_t length = mPath.mPos - start; mSpec.Replace(start, length, buf); if (buf.Length() != length) { mAuthority.mLen += buf.Length() - length;

1 0