Commit Graph

11991 Commits

Author SHA1 Message Date
Alex Gaynor
cbb91e347d Bug 1385028 - simplify handling of macOS minor version in the sandbox policy; r=haik
MozReview-Commit-ID: BDD7WzTqHC6

--HG--
extra : rebase_source : d3eb23c8217a4dad7877a663fb455a0db2660330
2017-07-27 13:58:28 -04:00
Carsten "Tomcat" Book
892bedca2e merge mozilla-inbound to mozilla-central a=merge 2017-07-28 15:24:39 +02:00
Sebastian Hengst
d7527a414d Backed out changeset 07b534f44740 (bug 1384835) for failing xpcshell's security/manager/ssl/tests/unit/test_cert_sha1.js checkCertErrorGenericAtTime on Linux x64 debug. r=backout 2017-07-28 10:30:29 +02:00
Sebastian Hengst
1d708511f0 Backed out changeset 5df4d8778602 (bug 1384835) 2017-07-28 10:29:29 +02:00
Sebastian Hengst
744a0a216b Backed out changeset ef5feef07bed (bug 1384835) 2017-07-28 10:29:24 +02:00
Nicholas Nethercote
200d8ec18b Bug 1384835 (part 3) - Remove the Preferences::Get*CString() variants that return nsAdoptingCString. r=froydnj.
This is similar like the previous patch, but for the 8-bit string variants.
Also, it changes assignment to Adopt() in GetCString() and GetDefaultCString()
to avoid an extra copy.

--HG--
extra : rebase_source : eba805c3a7b809d5ccd6e853b1c9010db9477667
2017-07-27 16:45:10 +10:00
Ryan VanderMeulen
4237da641e Backed out changeset 4d7f80401751 (bug 1385028) for bustage.
--HG--
extra : rebase_source : 74b74e1a87c5e524f15eb04917d5b2205f3f87f3
2017-07-27 20:10:23 -04:00
Alex Gaynor
7372dae53f Bug 1385028 - simplify handling of macOS minor version in the sandbox policy; r=haik
MozReview-Commit-ID: BDD7WzTqHC6

--HG--
extra : rebase_source : 1d4a4deedbf6351da61e9433738000dcf6bcd0df
2017-07-27 13:58:28 -04:00
Nicholas Nethercote
0574a6b496 Bug 1384835 (part 2) - Remove the Preferences::Get*String() variants that return nsAdoptingString. r=froydnj.
Because we want to remove nsAdoptingString. We have other variants that don't
use nsAdoptingString, which can be used instead. There are three basic
patterns.

1. The easiest case is when we don't check for success.

> nsAdoptingString s = Preferences::GetString("foo");
> foo(s);

becomes:

> nsAutoString s;
> Preferences::GetString("foo", s);
> foo(s);

2. The next case is when we check if the result is empty.

> nsAdoptingString s = Preferences::GetString("foo");
> if (s.IsEmpty()) { ... }

becomes:

> nsAutoString s;
> Preferences::GetString("foo", s);
> if (s.IsEmpty()) { ... }

3. The final case is when we null check the result.

> nsAdoptingString s = Preferences::GetString("foo");
> if (s) { ... }

becomes:

> nsAutoString s;
> nsresult rv = Preferences::GetString("foo", s);
> if (NS_SUCCEEDED(rv)) { ... }

The patch also avoids some UTF8/UTF16 conversions in a few places.

--HG--
extra : rebase_source : f339b1a3dda4dc93979d38c30c001fbe77485b55
2017-07-25 20:36:14 +10:00
Nicholas Nethercote
f314cbcbe5 Bug 1384835 (part 1) - Use nsA[C]String references instead of pointers for outparams of Get*String() pref functions. r=froydnj.
This is basically a cosmetic change; references are the normal way to do string
outparams.

--HG--
extra : rebase_source : ffc5945f269bdcd3d4116755b56713e87a44b6cd
2017-07-25 19:12:56 +10:00
Julian Seward
408d24da56 Bug 1382563 - Remove ns*String::AssignWithConversion. r=erahm.
This patch replaces four functions of the name AssignWithConversion which
are essentially wrappers around CopyASCIItoUTF16 and LossyCopyUTF16toASCII
with direct calls to the latter two functions.  The replaced functions are:

  void nsCString::AssignWithConversion( const nsAString& aData )
  void nsString::AssignWithConversion( const nsACString& aData )

  void nsTString_CharT::AssignWithConversion(
                            const incompatible_char_type* aData,
                            int32_t aLength = -1);

The last of the three exists inside the double-included nsTString* world and
so describes two functions, giving four in total.

This has two advantages:

* it removes code

* at the call points, it makes clear (from the replacement name) which
  conversion is being carried out.  The generic name "AssignWithConversion"
  doesn't make that obvious -- one had to infer it from the types.

The patch also removes two commented out lines from
editor/composer/nsComposerCommands.cpp, that appear to be related.  They are
at top level, where they would never have compiled.  They look like
leftovers from some previous change.

--HG--
extra : rebase_source : fb47bf450771c3c9ee3341dd14520f5da69ec4f5
2017-07-24 19:23:52 +02:00
Kai Engert
7f80188815 Bug 1370890, uplift NSS_3_32_RTM, no code changes, only version numbers, r=me
UPGRADE_NSS_RELEASE, DONTBUILD
2017-07-27 19:38:41 +02:00
Haik Aftandilian
7f9d32b10e Bug 1384153 - Artifact and local builds crashing content tabs on latest autoland to m-c merge. r=spohl
MozReview-Commit-ID: 6xHFTCXVgr7

--HG--
extra : rebase_source : b74fd0f4cece68bbf3f251c533d7b239cbc7e7ee
2017-07-26 22:47:10 -07:00
Carsten "Tomcat" Book
d360d49d2a merge mozilla-inbound to mozilla-central a=merge 2017-07-27 10:57:25 +02:00
David Keeler
e3018d572d bug 1382866 - prompt for authentication when changing certificate trust fails r=Cykesiopka,jcj
MozReview-Commit-ID: 3ryUyAfbNCs

--HG--
rename : security/manager/ssl/tests/unit/test_certDB_import.js => security/manager/ssl/tests/unit/test_certDB_import_with_master_password.js
extra : rebase_source : ad39258078c1084166f0c59250352cd899b10507
2017-07-21 16:58:42 -07:00
Jed Davis
709a96c2ee Backed out 3 changesets (bug 1383007, bug 1376910)
Backed out changeset 394b3d22db19 (bug 1383007)
Backed out changeset 17e2e2aa8f56 (bug 1376910)
Backed out changeset d11cd5c3fc6f (bug 1376910)
2017-07-26 12:50:28 -06:00
Alex Gaynor
3229d39dba Bug 1384677 - remove com.apple.cookied access from content processes; r=haik
MozReview-Commit-ID: 5mI4VXf7J8Q

--HG--
extra : rebase_source : 8514a3e7e73059964b29e240d7979b3a2758bb69
2017-07-25 11:03:43 -04:00
Kartikaya Gupta
ba4b3b9101 Bug 1384233 - Remove SizePrintfMacros.h. r=froydnj
We have a minimum requirement of VS 2015 for Windows builds, which supports
the z length modifier for format specifiers. So we don't need SizePrintfMacros.h
any more, and can just use %zu and friends directly everywhere.

MozReview-Commit-ID: 6s78RvPFMzv

--HG--
extra : rebase_source : 009ea39eb4dac1c927aa03e4f97d8ab673de8a0e
2017-07-26 16:03:57 -04:00
Carsten "Tomcat" Book
679210723b merge mozilla-inbound to mozilla-central a=merge 2017-07-25 14:27:17 +02:00
Wes Kocher
fd09155f06 Merge m-c to inbound, a=merge
MozReview-Commit-ID: 418vKEKrk3n
2017-07-24 18:10:56 -07:00
Wes Kocher
2673406be5 Merge inbound to central, a=merge
MozReview-Commit-ID: 1oTeP8uycV2
2017-07-24 18:06:39 -07:00
ffxbld
ef646e1a27 No bug, Automated HPKP preload list update from host bld-linux64-spot-307 - a=hpkp-update 2017-07-24 09:28:36 -07:00
ffxbld
fedef7afe3 No bug, Automated HSTS preload list update from host bld-linux64-spot-307 - a=hsts-update 2017-07-24 09:28:32 -07:00
ffxbld
8040d0c385 No bug, Automated HPKP preload list update from host bld-linux64-spot-302 - a=hpkp-update 2017-07-23 09:19:42 -07:00
ffxbld
2374a8dca9 No bug, Automated HSTS preload list update from host bld-linux64-spot-302 - a=hsts-update 2017-07-23 09:19:39 -07:00
ffxbld
39bc5ffdf3 No bug, Automated HPKP preload list update from host bld-linux64-spot-388 - a=hpkp-update 2017-07-22 09:24:29 -07:00
ffxbld
f2b288f21a No bug, Automated HSTS preload list update from host bld-linux64-spot-388 - a=hsts-update 2017-07-22 09:24:26 -07:00
Sebastian Hengst
f16a7f8371 merge mozilla-inbound to mozilla-central. r=merge a=merge
MozReview-Commit-ID: 4EWdTlEncz7
2017-07-22 11:38:42 +02:00
Wes Kocher
d45eb771f0 Merge m-c to inbound, a=merge
MozReview-Commit-ID: Ah48RzFU8Mt
2017-07-21 18:20:46 -07:00
ffxbld
fe79f566df No bug, Automated HPKP preload list update from host bld-linux64-spot-309 - a=hpkp-update 2017-07-21 09:18:15 -07:00
ffxbld
9681568945 No bug, Automated HSTS preload list update from host bld-linux64-spot-309 - a=hsts-update 2017-07-21 09:18:11 -07:00
Sebastian Hengst
367f0ac5a2 merge mozilla-inbound to mozilla-central. r=merge a=merge
MozReview-Commit-ID: IWRTFZdtzaE
2017-07-21 12:56:44 +02:00
ffxbld
6aae95fab2 No bug, Automated HPKP preload list update from host bld-linux64-spot-303 - a=hpkp-update 2017-07-20 09:22:20 -07:00
ffxbld
eaa9f8ab1b No bug, Automated HSTS preload list update from host bld-linux64-spot-303 - a=hsts-update 2017-07-20 09:22:17 -07:00
Tristan Bourvon
64e1ded43a Bug 1382994 - Fix UAF in InitializeNSSWithFallbacks. r=keeler
MozReview-Commit-ID: 6OYl5wlPy5W

--HG--
extra : rebase_source : fce3e52edc55c970feca67a82c71fa2bb2b5d9b7
2017-07-21 12:14:38 +02:00
Wes Kocher
61354cf6c0 Merge m-c to autoland, a=merge CLOSED TREE
MozReview-Commit-ID: 9pPsy8McMun
2017-07-21 18:18:35 -07:00
Sylvestre Ledru
7c0ae251cd Bug 1381253 - Remove redundant control flow declarations rs=ehsan
MozReview-Commit-ID: FFxP4aMCbOL

--HG--
extra : amend_source : 3aec108430b11048f47ffe19d5da7ac5034770a9
2017-07-15 19:03:04 +02:00
Wes Kocher
a1eadef812 Merge m-c to autoland, a=merge
MozReview-Commit-ID: B7oWq7qfpJ0
2017-07-24 18:13:05 -07:00
Sylvestre Ledru
6202d4908b Bug 1383007 - Move the declaration in the #ifdef declaration to silent a warning r=jld
Otherwise, a warning is triggered because the statement will never be executed [-

Found with -Wswitch-unreachable with gcc 7

MozReview-Commit-ID: FVStzyFlhJp

--HG--
extra : rebase_source : 1db87153c3e7dcde8d5a9e0f1f0ff607307c9ca2
2017-07-21 23:28:47 +02:00
Carsten "Tomcat" Book
2023b2d8e5 Merge mozilla-central to inbound 2017-07-24 14:59:06 +02:00
Franziskus Kiefer
84cdbc91a3 Bug 1370890 - land NSS f212be04f3d0 UPGRADE_NSS_RELEASE, r=me
--HG--
extra : rebase_source : 82c0c1e7b6487693fb0ace15edb374f95a9c0208
2017-07-24 10:12:57 +02:00
Gian-Carlo Pascutto
7ee246522d Bug 1308400 - Report failures in file processes too. r=jld
MozReview-Commit-ID: 549WuWKaJeM

--HG--
extra : rebase_source : 22d6348e602f2ceae546502fa0050ab0960ec075
2017-07-10 20:20:49 +02:00
Gian-Carlo Pascutto
d791c78487 Bug 1308400 - Symlink handling for read brokering. r=jld
MozReview-Commit-ID: BP1gFdDbqXD

--HG--
extra : rebase_source : 5db26ad21e40ab19228ac8a978215b97cf8b3b28
2017-07-06 15:31:13 +02:00
Gian-Carlo Pascutto
8bc55108f2 Bug 1308400 - Support file process, whitelist path prefs. r=jld
MozReview-Commit-ID: 3eX06AioPZL

--HG--
extra : rebase_source : 56bcfaad3360fe92ce605a0413bb3a9cacb4446d
2017-07-24 16:32:22 +02:00
Kate McKinley
a85cfefb59 Bug 1380872 remove EV treatment for "China Internet Network Information Center EV Certificates Root" r=keeler
Disable EV treatment in preparation for removing the CNNIC root certificates
from NSS.

MozReview-Commit-ID: Anz1vXqABUM

--HG--
extra : rebase_source : 694d8321b9f5994fe57e81cb3169681c5e491910
2017-07-18 11:18:47 -07:00
Kate McKinley
67464ef73c Bug 1380821 remove EV treatment for UTN-USERFirst-Hardware r=keeler
The CA, Comodo, has requested that we remove the UTN-USERFirst-Hardware
root certificate from NSS. First remove EV treatment.

MozReview-Commit-ID: 8OTsevYOuKq

--HG--
extra : rebase_source : aabb219bcbee1c667bae29df618449df4b50d548
2017-07-18 11:28:26 -07:00
Wes Kocher
56c014ca6b Merge autoland to central, a=merge CLOSED TREE
MozReview-Commit-ID: 9RON7kHON0g
2017-07-19 16:32:03 -07:00
ffxbld
3a3af33f51 No bug, Automated HPKP preload list update from host bld-linux64-spot-302 - a=hpkp-update 2017-07-19 09:22:45 -07:00
ffxbld
5005f0245a No bug, Automated HSTS preload list update from host bld-linux64-spot-302 - a=hsts-update 2017-07-19 09:22:42 -07:00
Jed Davis
4634e2a332 Bug 1376910 - Unshare the SysV IPC namespace in content processes. r=gcp
MozReview-Commit-ID: 1Uajj68rEuC

--HG--
extra : rebase_source : 5a6c86a104911146cfb56243dec8016fca536dc3
2017-06-28 07:11:55 -07:00