32f7c8fec3
merge mozilla-inbound to mozilla-central. r=merge a=merge
...
MozReview-Commit-ID: 1h3kZyrtqSt
2017-10-17 11:45:16 +02:00
af89102d41
merge autoland to mozilla-central. r=merge a=merge
...
MozReview-Commit-ID: JRsSap6SwOZ
2017-10-17 11:42:24 +02:00
0498069c9a
No bug, Automated HPKP preload list update from host bld-linux64-spot-315 - a=hpkp-update
2017-10-16 23:06:00 -07:00
962f3aa143
No bug, Automated HSTS preload list update from host bld-linux64-spot-315 - a=hsts-update
2017-10-16 23:05:56 -07:00
e5bbda30b9
No bug, Automated HPKP preload list update from host bld-linux64-spot-307 - a=hpkp-update
2017-10-15 22:50:12 -07:00
28ef948b68
No bug, Automated HSTS preload list update from host bld-linux64-spot-307 - a=hsts-update
2017-10-15 22:50:09 -07:00
40b456626e
No bug, Automated HPKP preload list update from host bld-linux64-spot-301 - a=hpkp-update
2017-10-15 10:33:36 -07:00
93cacab1f5
No bug, Automated HSTS preload list update from host bld-linux64-spot-301 - a=hsts-update
2017-10-15 10:33:33 -07:00
39f4a652d1
No bug, Automated HPKP preload list update from host bld-linux64-spot-302 - a=hpkp-update
2017-10-14 22:59:04 -07:00
0c0219f6c4
No bug, Automated HSTS preload list update from host bld-linux64-spot-302 - a=hsts-update
2017-10-14 22:59:01 -07:00
01970ed92d
No bug, Automated HPKP preload list update from host bld-linux64-spot-327 - a=hpkp-update
2017-10-14 10:38:55 -07:00
957ff16de8
No bug, Automated HSTS preload list update from host bld-linux64-spot-327 - a=hsts-update
2017-10-14 10:38:51 -07:00
b864294e1e
No bug, Automated HPKP preload list update from host bld-linux64-spot-329 - a=hpkp-update
2017-10-13 23:34:33 -07:00
36c79a8634
No bug, Automated HSTS preload list update from host bld-linux64-spot-329 - a=hsts-update
2017-10-13 23:34:30 -07:00
471e3a93c9
No bug, Automated HPKP preload list update from host bld-linux64-spot-305 - a=hpkp-update
2017-10-13 10:47:02 -07:00
c478ef3218
No bug, Automated HSTS preload list update from host bld-linux64-spot-305 - a=hsts-update
2017-10-13 10:46:59 -07:00
138ee08992
No bug, Automated HPKP preload list update from host bld-linux64-spot-032 - a=hpkp-update
2017-10-13 00:02:05 -07:00
15e460fc58
No bug, Automated HSTS preload list update from host bld-linux64-spot-032 - a=hsts-update
2017-10-13 00:02:01 -07:00
5c00b8540d
merge mozilla-inbound to mozilla-central. r=merge a=merge
...
MozReview-Commit-ID: AlcL6XYDkf
2017-10-12 23:58:31 +02:00
ef0d419a79
No bug, Automated HPKP preload list update from host bld-linux64-spot-306 - a=hpkp-update
2017-10-12 10:52:26 -07:00
ee7b9d0f42
No bug, Automated HSTS preload list update from host bld-linux64-spot-306 - a=hsts-update
2017-10-12 10:52:23 -07:00
e22c8fc5ef
merge autoland to mozilla-central. r=merge a=merge
...
MozReview-Commit-ID: JX8NRn7MQY4
2017-10-12 11:34:05 +02:00
32465a09d0
No bug, Automated HPKP preload list update from host bld-linux64-spot-302 - a=hpkp-update
2017-10-11 23:23:04 -07:00
5459aabb52
No bug, Automated HSTS preload list update from host bld-linux64-spot-302 - a=hsts-update
2017-10-11 23:23:00 -07:00
28e8f43756
Bug 1408821 - Allow FIONBIO ioctl from the content sandbox. r=jld
...
--HG--
extra : rebase_source : c6a1b525bc7d9207583200fd5d5059a8155b889f
2017-10-16 14:54:46 +13:00
90fa230f6d
No bug, Automated HPKP preload list update from host bld-linux64-spot-327 - a=hpkp-update
2017-10-11 11:05:07 -07:00
5793b91bb2
No bug, Automated HSTS preload list update from host bld-linux64-spot-327 - a=hsts-update
2017-10-11 11:05:03 -07:00
6ecc0e0e1a
Bug 1401594 - land NSS 4bf658832d89 UPGRADE_NSS_RELEASE, r=me
2017-10-12 15:34:02 +02:00
e8c853cf32
No bug, Automated HPKP preload list update from host bld-linux64-spot-302 - a=hpkp-update
2017-10-10 22:59:38 -07:00
426bb81282
No bug, Automated HSTS preload list update from host bld-linux64-spot-302 - a=hsts-update
2017-10-10 22:59:34 -07:00
01cd7f3d0f
merge mozilla-inbound to mozilla-central. r=merge a=merge
...
MozReview-Commit-ID: GbmY183Epi2
2017-10-10 23:56:11 +02:00
c8b9469182
No bug, Automated HPKP preload list update from host bld-linux64-spot-303 - a=hpkp-update
2017-10-10 10:45:25 -07:00
4d59676f4f
No bug, Automated HSTS preload list update from host bld-linux64-spot-303 - a=hsts-update
2017-10-10 10:45:22 -07:00
678b6b5093
No bug, Automated HPKP preload list update from host bld-linux64-spot-302 - a=hpkp-update
2017-10-09 22:53:39 -07:00
c5ca0896eb
No bug, Automated HSTS preload list update from host bld-linux64-spot-302 - a=hsts-update
2017-10-09 22:53:35 -07:00
c2d6023454
merge mozilla-inbound to mozilla-central. r=merge a=merge
...
MozReview-Commit-ID: 36L7JL73CzG
2017-10-09 23:52:04 +02:00
c623cb074c
merge autoland to mozilla-central. r=merge a=merge
...
MozReview-Commit-ID: 63rZAVDkxDT
2017-10-09 23:46:29 +02:00
b53e29293c
No bug, Automated HPKP preload list update from host bld-linux64-spot-303 - a=hpkp-update
2017-10-09 10:45:59 -07:00
50ebdd5c44
No bug, Automated HSTS preload list update from host bld-linux64-spot-303 - a=hsts-update
2017-10-09 10:45:55 -07:00
f7efb5fc2c
Merge mozilla-central to mozilla-inbound. r=merge a=merge on a CLOSED TREE
2017-10-12 12:03:15 +02:00
17a6cb2cbf
Bug 1407766 - Remove symantec dlls from the content process dll blocklist due to process startup issues associated with symantec av products. r=bobowen
...
MozReview-Commit-ID: JMOIptO2y7F
2017-10-11 18:00:18 -05:00
aa78440a09
merge mozilla-inbound to mozilla-central. r=merge a=merge
...
MozReview-Commit-ID: EE6DcCgHufi
2017-10-09 11:19:20 +02:00
6c0975fc33
No bug, Automated HPKP preload list update from host bld-linux64-spot-303 - a=hpkp-update
2017-10-08 22:51:19 -07:00
f804ab0aa0
No bug, Automated HSTS preload list update from host bld-linux64-spot-303 - a=hsts-update
2017-10-08 22:51:15 -07:00
7e3b55bb22
No bug, Automated HPKP preload list update from host bld-linux64-spot-302 - a=hpkp-update
2017-10-07 23:08:04 -07:00
d51cd0971c
No bug, Automated HSTS preload list update from host bld-linux64-spot-302 - a=hsts-update
2017-10-07 23:08:00 -07:00
aa721cc82a
No bug, Automated HPKP preload list update from host bld-linux64-spot-308 - a=hpkp-update
2017-10-07 10:39:48 -07:00
c48db0de1a
No bug, Automated HSTS preload list update from host bld-linux64-spot-308 - a=hsts-update
2017-10-07 10:39:44 -07:00
8a68e6fb83
Bug 1403868 (part 4) - Reduce tools/profiler/public/*.h to almost nothing in non-MOZ_GECKO_PROFILER builds. r=mstange.
...
Currently the Gecko Profiler defines a moderate amount of stuff when
MOZ_GECKO_PROFILER is undefined. It also #includes various headers, including
JS ones. This is making it difficult to separate Gecko's media stack for
inclusion in Servo.
This patch greatly simplifies how things are exposed. The starting point is:
- GeckoProfiler.h can be #included unconditionally;
- everything else from the profiler must be guarded by MOZ_GECKO_PROFILER.
In practice this introduces way too many #ifdefs, so the patch loosens it by
adding no-op macros for a number of the most common operations.
The net result is that #ifdefs and macros are used a bit more, but almost
nothing is exposed in non-MOZ_GECKO_PROFILER builds (including
ProfilerMarkerPayload.h and GeckoProfiler.h), and understanding what is exposed
is much simpler than before.
Note also that in BHR, ThreadStackHelper is now entirely absent in
non-MOZ_GECKO_PROFILER builds.
2017-10-04 09:11:18 +11:00
5f608d08d6
bug 1404824 - reconcile inconsistent TLS version range settings by erring on the conservative side r=mayhemer
...
Before this patch, if a user set their TLS version range preferences to only
allow TLS 1.3, any connections made with the BE_CONSERVATIVE flag or via the
telemetry studies flags would fail because we would attempt to set an
inconsistent TLS version range (the minimum was greater than the maximum). This
fixes that by setting the minimum to the flag-configured maximum. This
intentionally overrides the user's preferences because it is in the context of
browser-critical services (i.e. update servers) or telemetry studies.
MozReview-Commit-ID: 1kKE5nOVQz8
--HG--
extra : rebase_source : 047aa03f401d75aba3f6c5f4c572d2cc451a329e
2017-10-03 14:51:57 -07:00
Sebastian Hengst
ffxbld
Matthew Gregan
Tim Taubert
Jim Mathies
Nicholas Nethercote
David Keeler