From d35748de01cafac9e082ef628355a3722d9c0dda Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Sat, 28 Oct 2017 17:38:59 -0400 Subject: [PATCH 01/18] Bug 1163171 - part 1 - switch to r11c NDKs that include clang; r=snorp The first thing to do to make Fennec compile with clang is to use NDK tarballs that actually include LLVM. --- .../config/tooltool-manifests/android-x86/releng.manifest | 6 +++--- .../config/tooltool-manifests/android/releng.manifest | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mobile/android/config/tooltool-manifests/android-x86/releng.manifest b/mobile/android/config/tooltool-manifests/android-x86/releng.manifest index e28284839f91..f90891d57c86 100644 --- a/mobile/android/config/tooltool-manifests/android-x86/releng.manifest +++ b/mobile/android/config/tooltool-manifests/android-x86/releng.manifest @@ -1,9 +1,9 @@ [ { - "version": "Android NDK r11c", - "size": 299040511, + "version": "Android NDK r11c + LLVM", + "size": 351025448, "visibility": "internal", - "digest": "0f9ba6efbc5379225ebe13b956b9f19d055654f9b0ae999b1eb18ca836e1665be820bcc05193ba24c9a328a1bfea63fe814c1f364b28ae29266effaa04eedbee", + "digest": "4ed8abb4dd2a45e2c7705c84b8a07aaf7785c8f0e9c5191db6257e48b5029d1c38d9c5a9d4874d8d6de9515aa97d3bb5f39d01ad269dd3e527a6be00500855a0", "algorithm": "sha512", "filename": "android-ndk.tar.bz2", "unpack": true diff --git a/mobile/android/config/tooltool-manifests/android/releng.manifest b/mobile/android/config/tooltool-manifests/android/releng.manifest index e28284839f91..f90891d57c86 100644 --- a/mobile/android/config/tooltool-manifests/android/releng.manifest +++ b/mobile/android/config/tooltool-manifests/android/releng.manifest @@ -1,9 +1,9 @@ [ { - "version": "Android NDK r11c", - "size": 299040511, + "version": "Android NDK r11c + LLVM", + "size": 351025448, "visibility": "internal", - "digest": "0f9ba6efbc5379225ebe13b956b9f19d055654f9b0ae999b1eb18ca836e1665be820bcc05193ba24c9a328a1bfea63fe814c1f364b28ae29266effaa04eedbee", + "digest": "4ed8abb4dd2a45e2c7705c84b8a07aaf7785c8f0e9c5191db6257e48b5029d1c38d9c5a9d4874d8d6de9515aa97d3bb5f39d01ad269dd3e527a6be00500855a0", "algorithm": "sha512", "filename": "android-ndk.tar.bz2", "unpack": true From bce27af988353ee41d2d0f1e9dfbc2fd68639e1d Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Sat, 28 Oct 2017 17:38:59 -0400 Subject: [PATCH 02/18] Bug 1163171 - part 2 - switch to using -isystem rather than -idirafter for Android; r=glandium This command-line flag is a little more evocative and works correctly with both GCC and clang. --- build/autoconf/android.m4 | 5 +++-- build/moz.configure/android-ndk.configure | 2 +- build/unix/elfhack/inject/moz.build | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build/autoconf/android.m4 b/build/autoconf/android.m4 index 035456a8d61d..a493d33085d1 100644 --- a/build/autoconf/android.m4 +++ b/build/autoconf/android.m4 @@ -8,10 +8,11 @@ AC_DEFUN([MOZ_ANDROID_NDK], case "$target" in *-android*|*-linuxandroid*) dnl $android_platform will be set for us by Python configure. - CPPFLAGS="-idirafter $android_platform/usr/include $CPPFLAGS" + directory_include_args="-isystem $android_platform/usr/include" + CPPFLAGS="$directory_include_args $CPPFLAGS" CFLAGS="-fno-short-enums -fno-exceptions $CFLAGS" CXXFLAGS="-fno-short-enums -fno-exceptions $CXXFLAGS $stlport_cppflags" - ASFLAGS="-idirafter $android_platform/usr/include -DANDROID $ASFLAGS" + ASFLAGS="$directory_include_args -DANDROID $ASFLAGS" dnl Add --allow-shlib-undefined, because libGLESv2 links to an dnl undefined symbol (present on the hardware, just not in the diff --git a/build/moz.configure/android-ndk.configure b/build/moz.configure/android-ndk.configure index 3118014ad46e..89b59d561488 100644 --- a/build/moz.configure/android-ndk.configure +++ b/build/moz.configure/android-ndk.configure @@ -151,7 +151,7 @@ add_old_configure_assignment('android_platform', android_platform) def extra_toolchain_flags(platform_dir): if not platform_dir: return [] - return ['-idirafter', + return ['-isystem', os.path.join(platform_dir, 'usr', 'include')] diff --git a/build/unix/elfhack/inject/moz.build b/build/unix/elfhack/inject/moz.build index 0581236e83f2..967371015b06 100644 --- a/build/unix/elfhack/inject/moz.build +++ b/build/unix/elfhack/inject/moz.build @@ -28,9 +28,9 @@ for v in ('OS_CPPFLAGS', 'OS_CFLAGS', 'DEBUG', 'CLANG_PLUGIN', 'OPTIMIZE', flags = [] idx = 0 for flag in COMPILE_FLAGS[v]: - if flag == '-idirafter': + if flag == '-isystem': flags.append(''.join(COMPILE_FLAGS[v][idx:idx + 2])) - elif flag.startswith(('-m', '-I', '-idirafter')): + elif flag.startswith(('-m', '-I', '-isystem')): flags.append(flag) idx += 1 COMPILE_FLAGS[v] = flags From 2c5288d26ce34562f674572c5f37f083c454766c Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Sat, 28 Oct 2017 17:38:59 -0400 Subject: [PATCH 03/18] Bug 1163171 - part 3a - expose the NDK clang binaries to toolchain configury; r=glandium Our normal method of locating the compilers in the NDK is to set --with-toolchain-prefix when compiling for Android. However, the clang binaries are in a different location than would otherwise be implied by --with-toolchain-prefix. Additionally, we still need to know about --with-toolchain-prefix because the NDK clang needs to be pointed there so clang can find important binaries like the linker and because various other bits of the build system depend on the --with-toolchain-prefix value as well. So we need a separate mechanism for communicating the whereabouts of the NDK clang. We can't set CC and CXX because doing so would conflict with the CC and CXX values exported to the js/src/ subconfigure. But Android already has an extra_toolchain_flags function that we use for informing moz.configure about additional flags needed solely for Android, and we can use a similar trick to communicate the existence of the NDK's clang to the main C/C++ compiler selection process. --- build/moz.configure/android-ndk.configure | 22 ++++++++++++++++++++++ build/moz.configure/toolchain.configure | 9 +++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/build/moz.configure/android-ndk.configure b/build/moz.configure/android-ndk.configure index 89b59d561488..d65fb9677ccc 100644 --- a/build/moz.configure/android-ndk.configure +++ b/build/moz.configure/android-ndk.configure @@ -271,3 +271,25 @@ def bindgen_cflags_defaults(stlport_cppflags, android_platform, toolchain, toolchain, os.path.join(gcc_include, 'include'), os.path.join(gcc_include, 'include-fixed')) + +@depends(host, ndk) +@imports(_from='os.path', _import='exists') +@imports(_from='os.path', _import='isdir') +def android_clang_compiler(host, ndk): + if not ndk: + return + + llvm_path = '%s/toolchains/llvm/prebuilt/%s-%s/bin' % (ndk, + host.kernel.lower(), + host.cpu) + if not isdir(llvm_path) and host.cpu == 'x86_64': + llvm_path = toolchain_format % (ndk, host.kernel.lower(), 'x86') + + if not isdir(llvm_path): + die("Couldn't find path to LLVM toolchain at %s" % llvm_path) + + clang = '%s/clang' % llvm_path + if not exists(clang): + die("Couln't find clang in LLVM toolchain at %s" % clang) + + return clang diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure index a1dff3d9fc0d..144d90a8bb08 100755 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure @@ -647,11 +647,16 @@ def default_c_compilers(host_or_target): ''' assert host_or_target in (host, target) - @depends(host_or_target, target, toolchain_prefix) - def default_c_compilers(host_or_target, target, toolchain_prefix): + @depends(host_or_target, target, toolchain_prefix, android_clang_compiler) + def default_c_compilers(host_or_target, target, toolchain_prefix, android_clang_compiler): gcc = ('gcc',) if toolchain_prefix and host_or_target is target: gcc = tuple('%sgcc' % p for p in toolchain_prefix) + gcc + # Android sets toolchain_prefix and android_clang_compiler, but + # we want the latter to take precedence, because the latter can + # point at clang, which is what we want to use. + if android_clang_compiler and host_or_target is target: + gcc = (android_clang_compiler,) + gcc if host_or_target.kernel == 'WINNT': return ('cl', 'clang-cl') + gcc + ('clang',) From 69423fba9bcfdddec99cfc3353e04755ccd8e0cc Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Sat, 28 Oct 2017 17:38:59 -0400 Subject: [PATCH 04/18] Bug 1163171 - part 3b - inform clang about the NDK's gcc toolchain; r=glandium The NDK clang needs to be informed about the existence of a GCC toolchain, so important programs like the linker can be located. With this change, we're starting to use command-line options that are incompatible with GCC, so we also add a check to inform the user about the non-support for this configuration. --- build/autoconf/android.m4 | 8 ++++++++ build/moz.configure/android-ndk.configure | 19 +++++++++++-------- build/moz.configure/toolchain.configure | 4 ++++ 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/build/autoconf/android.m4 b/build/autoconf/android.m4 index a493d33085d1..c6ac83057a9f 100644 --- a/build/autoconf/android.m4 +++ b/build/autoconf/android.m4 @@ -9,6 +9,14 @@ case "$target" in *-android*|*-linuxandroid*) dnl $android_platform will be set for us by Python configure. directory_include_args="-isystem $android_platform/usr/include" + + # clang will do any number of interesting things with host tools unless we tell + # it to use the NDK tools. + extra_opts="-gcc-toolchain $(dirname $(dirname $TOOLCHAIN_PREFIX))" + CPPFLAGS="$extra_opts $CPPFLAGS" + ASFLAGS="$extra_opts $ASFLAGS" + LDFLAGS="$extra_opts $LDFLAGS" + CPPFLAGS="$directory_include_args $CPPFLAGS" CFLAGS="-fno-short-enums -fno-exceptions $CFLAGS" CXXFLAGS="-fno-short-enums -fno-exceptions $CXXFLAGS $stlport_cppflags" diff --git a/build/moz.configure/android-ndk.configure b/build/moz.configure/android-ndk.configure index d65fb9677ccc..c87667084def 100644 --- a/build/moz.configure/android-ndk.configure +++ b/build/moz.configure/android-ndk.configure @@ -147,14 +147,6 @@ def android_platform(target, android_version, ndk, _): add_old_configure_assignment('android_platform', android_platform) -@depends(android_platform) -def extra_toolchain_flags(platform_dir): - if not platform_dir: - return [] - return ['-isystem', - os.path.join(platform_dir, 'usr', 'include')] - - @depends(target, host, ndk, '--with-android-toolchain', '--help') @checking('for the Android toolchain directory', lambda x: x or 'not found') @imports(_from='os.path', _import='isdir') @@ -203,6 +195,17 @@ def android_toolchain_prefix_base(target): return target.toolchain +@depends(android_platform, android_toolchain) +def extra_toolchain_flags(platform_dir, toolchain_dir): + if not platform_dir: + return [] + return ['-isystem', + os.path.join(platform_dir, 'usr', 'include'), + '-gcc-toolchain', + toolchain_dir, + ] + + @depends(android_toolchain_prefix_base, android_toolchain) def android_toolchain_prefix(prefix_base, toolchain): if toolchain: diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure index 144d90a8bb08..6047443040bf 100755 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure @@ -881,6 +881,10 @@ def compiler(language, host_or_target, c_compiler=None, other_compiler=None, 'Only GCC 4.9 or newer is supported (found version %s).' % info.version) + if info.type == 'gcc' and host_or_target.os == 'Android': + raise FatalCheckError('GCC is not supported on Android.\n' + 'Please use clang from the Android NDK instead.') + # If you want to bump the version check here search for # cxx_alignof above, and see the associated comment. if info.type == 'clang' and not info.version: From fc41938428b038a644100f3d5e8e109b5c0919fc Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Sat, 28 Oct 2017 17:38:58 -0400 Subject: [PATCH 05/18] Bug 1163171 - part 4 - fix jsapi-tests link errors with __atomic_* intrinsics on x86/Android with clang; r=glandium NDK r15+ clang changed the code generation strategy for the __atomic_* intrinics such that using them with 64-bit types now requires linking with libatomic. Our current configure tests for libatomic doesn't catch this, because the std::atomic implementation is such that it doesn't require an external library, even for 64-bit types, whereas the __atomic_* intrinsics do. The safest thing to do is to force this configure check to always return true when we are compiling for x86/Android with clang. --- build/autoconf/toolchain.m4 | 32 +++++++++++++++++++++----------- js/src/jsapi-tests/moz.build | 3 +++ 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/build/autoconf/toolchain.m4 b/build/autoconf/toolchain.m4 index 4abca9e5189d..d0e063af0b00 100644 --- a/build/autoconf/toolchain.m4 +++ b/build/autoconf/toolchain.m4 @@ -95,21 +95,31 @@ AC_LANG_CPLUSPLUS if test "$GNU_CXX"; then AC_CACHE_CHECK([whether 64-bits std::atomic requires -latomic], ac_cv_needs_atomic, - AC_TRY_LINK( - [#include - #include ], - [ std::atomic foo; foo = 1; ], - ac_cv_needs_atomic=no, - _SAVE_LIBS="$LIBS" - LIBS="$LIBS -latomic" + dnl x86 with clang is a little peculiar. std::atomic does not require + dnl linking with libatomic, but using atomic intrinsics does, so we + dnl force the setting on for such systems. (This setting is probably + dnl applicable to all x86 systems using clang, but Android is currently + dnl the one we care most about, and nobody has reported problems on + dnl other platforms before this point.) + if test "$CC_TYPE" = "clang" -a "$CPU_ARCH" = "x86" -a "$OS_TARGET" = "Android"; then + ac_cv_needs_atomic=yes + else AC_TRY_LINK( [#include #include ], [ std::atomic foo; foo = 1; ], - ac_cv_needs_atomic=yes, - ac_cv_needs_atomic="do not know; assuming no") - LIBS="$_SAVE_LIBS" - ) + ac_cv_needs_atomic=no, + _SAVE_LIBS="$LIBS" + LIBS="$LIBS -latomic" + AC_TRY_LINK( + [#include + #include ], + [ std::atomic foo; foo = 1; ], + ac_cv_needs_atomic=yes, + ac_cv_needs_atomic="do not know; assuming no") + LIBS="$_SAVE_LIBS" + ) + fi ) if test "$ac_cv_needs_atomic" = yes; then MOZ_NEEDS_LIBATOMIC=1 diff --git a/js/src/jsapi-tests/moz.build b/js/src/jsapi-tests/moz.build index c638ebde4314..9ea1ddf5d1a7 100644 --- a/js/src/jsapi-tests/moz.build +++ b/js/src/jsapi-tests/moz.build @@ -153,6 +153,9 @@ USE_LIBS += [ 'static:js', ] +if CONFIG['MOZ_NEEDS_LIBATOMIC']: + OS_LIBS += ['atomic'] + OS_LIBS += CONFIG['MOZ_ZLIB_LIBS'] if CONFIG['GNU_CXX']: From f0a815d0e29455585b11d1a8a4897a28eeb1e371 Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Sat, 28 Oct 2017 17:38:58 -0400 Subject: [PATCH 06/18] Bug 1163171 - part 6 - update to NDK r15c; r=snorp --- .../config/tooltool-manifests/android-x86/releng.manifest | 6 +++--- .../config/tooltool-manifests/android/releng.manifest | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mobile/android/config/tooltool-manifests/android-x86/releng.manifest b/mobile/android/config/tooltool-manifests/android-x86/releng.manifest index f90891d57c86..ade8db163577 100644 --- a/mobile/android/config/tooltool-manifests/android-x86/releng.manifest +++ b/mobile/android/config/tooltool-manifests/android-x86/releng.manifest @@ -1,9 +1,9 @@ [ { - "version": "Android NDK r11c + LLVM", - "size": 351025448, + "version": "Android NDK r15c + LLVM", + "size": 403602514, "visibility": "internal", - "digest": "4ed8abb4dd2a45e2c7705c84b8a07aaf7785c8f0e9c5191db6257e48b5029d1c38d9c5a9d4874d8d6de9515aa97d3bb5f39d01ad269dd3e527a6be00500855a0", + "digest": "8515b8f615935e9ee81c1ada55ec46a9ebd46ca095b33bf2bf34d794b7737ffa8f32b4e3f410d3f63e2f2510fef7a5836a72c34b942a0687af8ca5a5d50efdb6", "algorithm": "sha512", "filename": "android-ndk.tar.bz2", "unpack": true diff --git a/mobile/android/config/tooltool-manifests/android/releng.manifest b/mobile/android/config/tooltool-manifests/android/releng.manifest index f90891d57c86..ade8db163577 100644 --- a/mobile/android/config/tooltool-manifests/android/releng.manifest +++ b/mobile/android/config/tooltool-manifests/android/releng.manifest @@ -1,9 +1,9 @@ [ { - "version": "Android NDK r11c + LLVM", - "size": 351025448, + "version": "Android NDK r15c + LLVM", + "size": 403602514, "visibility": "internal", - "digest": "4ed8abb4dd2a45e2c7705c84b8a07aaf7785c8f0e9c5191db6257e48b5029d1c38d9c5a9d4874d8d6de9515aa97d3bb5f39d01ad269dd3e527a6be00500855a0", + "digest": "8515b8f615935e9ee81c1ada55ec46a9ebd46ca095b33bf2bf34d794b7737ffa8f32b4e3f410d3f63e2f2510fef7a5836a72c34b942a0687af8ca5a5d50efdb6", "algorithm": "sha512", "filename": "android-ndk.tar.bz2", "unpack": true From 2aeb0307eaab1b1ddc450787ef648643b1fe0cbc Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Sat, 28 Oct 2017 17:38:58 -0400 Subject: [PATCH 07/18] Bug 1163171 - part 7 - mark counter tests as passing now that we use clang; r=dholbert These tests were failing because of some misoptimizations that GCC did. clang is generating correct code here, and the tests correctly pass, so we can mark them as such. --- layout/generic/crashtests/crashtests.list | 2 +- layout/reftests/counters/reftest.list | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/layout/generic/crashtests/crashtests.list b/layout/generic/crashtests/crashtests.list index 6cfdff7897d5..7530afb1e795 100644 --- a/layout/generic/crashtests/crashtests.list +++ b/layout/generic/crashtests/crashtests.list @@ -563,7 +563,7 @@ load 944909-1.html load 946167-1.html load 947158.html load 949932.html -asserts-if(Android,0-1) load 964078.html # bug 989718 +load 964078.html load 970710.html load 973701-1.xhtml load 973701-2.xhtml diff --git a/layout/reftests/counters/reftest.list b/layout/reftests/counters/reftest.list index b7eb0bec9d4d..ac5316d2231e 100644 --- a/layout/reftests/counters/reftest.list +++ b/layout/reftests/counters/reftest.list @@ -60,10 +60,10 @@ == text-boundaries-subpixel.html text-boundaries-subpixel-ref.html == counter-hebrew-test.html counter-hebrew-reference.html == counters-hebrew-test.html counters-hebrew-reference.html -fails-if(xulRuntime.XPCOMABI.match(/arm/)) == counter-reset-integer-range.html counter-reset-integer-range-ref.html # bug 989718 +== counter-reset-integer-range.html counter-reset-integer-range-ref.html == counter-ua-limits-00.html counter-ua-limits-00-ref.html == counter-ua-limits-01.html counter-ua-limits-01-ref.html -fails-if(xulRuntime.XPCOMABI.match(/arm/)) == counter-ua-limits-02.html counter-ua-limits-02-ref.html # bug 989718 +== counter-ua-limits-02.html counter-ua-limits-02-ref.html == counter-ua-limits-03.html counter-ua-limits-03-ref.html == counter-ua-limits-list-00.html counter-ua-limits-list-00-ref.html == counter-ua-limits-list-01.html counter-ua-limits-list-01-ref.html From f29e0181c8a8d6d1ca3e1f3cb382371d1e248dfa Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Sat, 28 Oct 2017 17:38:58 -0400 Subject: [PATCH 08/18] Bug 1163171 - part 8 - touch CLOBBER because we're changing compilers; r=me --- CLOBBER | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CLOBBER b/CLOBBER index e6501141dd89..3558c7b08b69 100644 --- a/CLOBBER +++ b/CLOBBER @@ -22,4 +22,4 @@ # changes to stick? As of bug 928195, this shouldn't be necessary! Please # don't change CLOBBER for WebIDL changes any more. -Bug 1408789, Windows compiler change +Bug 1163171, Android compiler change From 286061948f4b6c1a703bf3807f016d6a148ed117 Mon Sep 17 00:00:00 2001 From: Sebastian Hengst Date: Sun, 29 Oct 2017 00:08:13 +0200 Subject: [PATCH 09/18] Bug 1163171 - part 9 - fix flake8 complains in android-ndk.configure. r=me --- build/moz.configure/android-ndk.configure | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/moz.configure/android-ndk.configure b/build/moz.configure/android-ndk.configure index c87667084def..da153ffc5954 100644 --- a/build/moz.configure/android-ndk.configure +++ b/build/moz.configure/android-ndk.configure @@ -203,7 +203,7 @@ def extra_toolchain_flags(platform_dir, toolchain_dir): os.path.join(platform_dir, 'usr', 'include'), '-gcc-toolchain', toolchain_dir, - ] + ] @depends(android_toolchain_prefix_base, android_toolchain) @@ -275,6 +275,7 @@ def bindgen_cflags_defaults(stlport_cppflags, android_platform, toolchain, os.path.join(gcc_include, 'include'), os.path.join(gcc_include, 'include-fixed')) + @depends(host, ndk) @imports(_from='os.path', _import='exists') @imports(_from='os.path', _import='isdir') From 91f3b3ac1d8e58587157eca839348bb09527e73d Mon Sep 17 00:00:00 2001 From: Jeff Muizelaar Date: Sat, 28 Oct 2017 18:32:24 -0400 Subject: [PATCH 10/18] Bug 1380014. Fix up the webrender bindings. r=kats The earlier patches in this bug were written before we had sophisticated binding generation so the types didn't match very well. This fixes all of that. MozReview-Commit-ID: DpcblpB8vxW --- gfx/webrender_bindings/Moz2DImageRenderer.cpp | 8 +-- gfx/webrender_bindings/src/moz2d_renderer.rs | 4 +- .../webrender_ffi_generated.h | 68 +++++++++++-------- 3 files changed, 44 insertions(+), 36 deletions(-) diff --git a/gfx/webrender_bindings/Moz2DImageRenderer.cpp b/gfx/webrender_bindings/Moz2DImageRenderer.cpp index 965ba233ef47..32bd68beefb9 100644 --- a/gfx/webrender_bindings/Moz2DImageRenderer.cpp +++ b/gfx/webrender_bindings/Moz2DImageRenderer.cpp @@ -43,9 +43,9 @@ static MOZ_THREAD_LOCAL(FT_Library) sFTLibrary; #endif struct FontTemplate { - void *mData; + const uint8_t *mData; size_t mSize; - int mIndex; + uint32_t mIndex; const VecU8 *mVec; RefPtr mUnscaledFont; }; @@ -55,7 +55,7 @@ std::unordered_map sFontDataTable; extern "C" { void -AddFontData(wr::FontKey aKey, void *aData, size_t aSize, int aIndex, ArcVecU8 *aVec) { +AddFontData(WrFontKey aKey, const uint8_t *aData, size_t aSize, uint32_t aIndex, const ArcVecU8 *aVec) { auto i = sFontDataTable.find(aKey); if (i == sFontDataTable.end()) { FontTemplate font; @@ -68,7 +68,7 @@ AddFontData(wr::FontKey aKey, void *aData, size_t aSize, int aIndex, ArcVecU8 *a } void -DeleteFontData(wr::FontKey aKey) { +DeleteFontData(WrFontKey aKey) { auto i = sFontDataTable.find(aKey); if (i != sFontDataTable.end()) { sFontDataTable.erase(i); diff --git a/gfx/webrender_bindings/src/moz2d_renderer.rs b/gfx/webrender_bindings/src/moz2d_renderer.rs index f9c916badc9f..a8bdea16224e 100644 --- a/gfx/webrender_bindings/src/moz2d_renderer.rs +++ b/gfx/webrender_bindings/src/moz2d_renderer.rs @@ -1,6 +1,6 @@ #![allow(improper_ctypes)] // this is needed so that rustc doesn't complain about passing the &Arc to an extern function use webrender_api::*; -use bindings::{ByteSlice, MutByteSlice, wr_moz2d_render_cb}; +use bindings::{ByteSlice, MutByteSlice, wr_moz2d_render_cb, ArcVecU8}; use rayon::ThreadPool; use std::collections::hash_map::{HashMap, Entry}; @@ -198,7 +198,7 @@ impl BlobImageRenderer for Moz2dImageRenderer { use bindings::WrFontKey; extern "C" { #[allow(improper_ctypes)] - fn AddFontData(key: WrFontKey, data: *const u8, size: usize, index: u32, vec: &Arc>); + fn AddFontData(key: WrFontKey, data: *const u8, size: usize, index: u32, vec: &ArcVecU8); fn DeleteFontData(key: WrFontKey); } diff --git a/gfx/webrender_bindings/webrender_ffi_generated.h b/gfx/webrender_bindings/webrender_ffi_generated.h index e799438b76d1..e4aa9156308f 100644 --- a/gfx/webrender_bindings/webrender_ffi_generated.h +++ b/gfx/webrender_bindings/webrender_ffi_generated.h @@ -224,10 +224,39 @@ struct WrState; struct WrThreadPool; -typedef Vec_u8 VecU8; +struct IdNamespace { + uint32_t mHandle; + + bool operator==(const IdNamespace& aOther) const { + return mHandle == aOther.mHandle; + } + bool operator!=(const IdNamespace& aOther) const { + return mHandle != aOther.mHandle; + } + bool operator<(const IdNamespace& aOther) const { + return mHandle < aOther.mHandle; + } + bool operator<=(const IdNamespace& aOther) const { + return mHandle <= aOther.mHandle; + } +}; + +struct FontKey { + IdNamespace mNamespace; + uint32_t mHandle; + + bool operator==(const FontKey& aOther) const { + return mNamespace == aOther.mNamespace && + mHandle == aOther.mHandle; + } +}; + +typedef FontKey WrFontKey; typedef Arc_VecU8 ArcVecU8; +typedef Vec_u8 VecU8; + struct Epoch { uint32_t mHandle; @@ -375,23 +404,6 @@ struct WrTransformProperty { LayoutTransform transform; }; -struct IdNamespace { - uint32_t mHandle; - - bool operator==(const IdNamespace& aOther) const { - return mHandle == aOther.mHandle; - } - bool operator!=(const IdNamespace& aOther) const { - return mHandle != aOther.mHandle; - } - bool operator<(const IdNamespace& aOther) const { - return mHandle < aOther.mHandle; - } - bool operator<=(const IdNamespace& aOther) const { - return mHandle <= aOther.mHandle; - } -}; - typedef IdNamespace WrIdNamespace; // Represents RGBA screen colors with floating point numbers. @@ -772,18 +784,6 @@ struct WrImageDescriptor { typedef ExternalImageType WrExternalImageBufferType; -struct FontKey { - IdNamespace mNamespace; - uint32_t mHandle; - - bool operator==(const FontKey& aOther) const { - return mNamespace == aOther.mNamespace && - mHandle == aOther.mHandle; - } -}; - -typedef FontKey WrFontKey; - struct FontInstanceOptions { FontRenderMode render_mode; SubpixelDirection subpx_dir; @@ -873,6 +873,14 @@ typedef TypedRect_u32__DevicePixel DeviceUintRect; * 2. Run `rustup run nightly cbindgen toolkit/library/rust/ --crate webrender_bindings -o gfx/webrender_bindings/webrender_ffi_generated.h` */ +extern void AddFontData(WrFontKey aKey, + const uint8_t *aData, + size_t aSize, + uint32_t aIndex, + const ArcVecU8 *aVec); + +extern void DeleteFontData(WrFontKey aKey); + extern void gfx_critical_note(const char *aMsg); extern bool gfx_use_wrench(); From a29f4ac5f823ea616231b92a7dae348c92161dac Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Sat, 28 Oct 2017 18:58:59 -0400 Subject: [PATCH 11/18] Bug 1163171 - part 9.1 - attempt to pacify flake8 complaints for real; r=me --- build/moz.configure/android-ndk.configure | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build/moz.configure/android-ndk.configure b/build/moz.configure/android-ndk.configure index da153ffc5954..1b7339badc95 100644 --- a/build/moz.configure/android-ndk.configure +++ b/build/moz.configure/android-ndk.configure @@ -202,8 +202,7 @@ def extra_toolchain_flags(platform_dir, toolchain_dir): return ['-isystem', os.path.join(platform_dir, 'usr', 'include'), '-gcc-toolchain', - toolchain_dir, - ] + toolchain_dir] @depends(android_toolchain_prefix_base, android_toolchain) From e4e37ae9d0ec9f8a07e22b3314ecf5ab83eb3758 Mon Sep 17 00:00:00 2001 From: Jorg K Date: Sun, 29 Oct 2017 08:59:26 +0100 Subject: [PATCH 12/18] Bug 1412497 - fix test for buffered input stream. r=baku --- netwerk/base/nsInputStreamPump.cpp | 5 ++++- netwerk/base/nsInputStreamPump.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/netwerk/base/nsInputStreamPump.cpp b/netwerk/base/nsInputStreamPump.cpp index 2d90702f634e..99688f6383fb 100644 --- a/netwerk/base/nsInputStreamPump.cpp +++ b/netwerk/base/nsInputStreamPump.cpp @@ -43,6 +43,7 @@ nsInputStreamPump::nsInputStreamPump() , mWaitingForInputStreamReady(false) , mCloseWhenDone(false) , mRetargeting(false) + , mAsyncStreamIsBuffered(false) , mMutex("nsInputStreamPump") { } @@ -714,7 +715,7 @@ nsInputStreamPump::OnStateStop() nsresult nsInputStreamPump::CreateBufferedStreamIfNeeded() { - if (mAsyncStream) { + if (mAsyncStreamIsBuffered) { return NS_OK; } @@ -722,6 +723,7 @@ nsInputStreamPump::CreateBufferedStreamIfNeeded() // it, we wrap a nsIBufferedInputStream around it, if needed. if (NS_InputStreamIsBuffered(mAsyncStream)) { + mAsyncStreamIsBuffered = true; return NS_OK; } @@ -733,6 +735,7 @@ nsInputStreamPump::CreateBufferedStreamIfNeeded() // A buffered inputStream must implement nsIAsyncInputStream. mAsyncStream = do_QueryInterface(stream); MOZ_DIAGNOSTIC_ASSERT(mAsyncStream); + mAsyncStreamIsBuffered = true; return NS_OK; } diff --git a/netwerk/base/nsInputStreamPump.h b/netwerk/base/nsInputStreamPump.h index 5c6f60fa007c..a7544a4f8e87 100644 --- a/netwerk/base/nsInputStreamPump.h +++ b/netwerk/base/nsInputStreamPump.h @@ -100,6 +100,7 @@ protected: bool mWaitingForInputStreamReady; bool mCloseWhenDone; bool mRetargeting; + bool mAsyncStreamIsBuffered; // Protects state/member var accesses across multiple threads. mozilla::RecursiveMutex mMutex; }; From b2bd1f0d80aaa532ae90639332e133f8849c9df8 Mon Sep 17 00:00:00 2001 From: Tom Schuster Date: Sun, 29 Oct 2017 12:19:48 +0100 Subject: [PATCH 13/18] Bug 1410620 - Change CacheInfo interfaces in network to use ACString. r=michal,froydnj --- netwerk/cache/nsCache.cpp | 28 ++++++++++-------------- netwerk/cache/nsCache.h | 4 ++-- netwerk/cache/nsCacheEntry.cpp | 22 +++++++++++-------- netwerk/cache/nsCacheEntryDescriptor.cpp | 27 ++++++++++------------- netwerk/cache/nsDiskCacheDevice.cpp | 14 +++++------- netwerk/cache/nsDiskCacheDeviceSQL.cpp | 25 ++++++++++----------- netwerk/cache/nsDiskCacheEntry.cpp | 12 +++++----- netwerk/cache/nsICacheVisitor.idl | 8 +++---- netwerk/cache/nsMemoryCacheDevice.cpp | 14 +++++------- netwerk/cache2/OldWrappers.cpp | 4 ++-- 10 files changed, 70 insertions(+), 88 deletions(-) diff --git a/netwerk/cache/nsCache.cpp b/netwerk/cache/nsCache.cpp index ef2a47d1e0c0..56f98e4c720d 100644 --- a/netwerk/cache/nsCache.cpp +++ b/netwerk/cache/nsCache.cpp @@ -49,11 +49,8 @@ PRTimeFromSeconds(uint32_t seconds) nsresult -ClientIDFromCacheKey(const nsACString& key, char ** result) +ClientIDFromCacheKey(const nsACString& key, nsACString& result) { - nsresult rv = NS_OK; - *result = nullptr; - nsReadingIterator colon; key.BeginReading(colon); @@ -64,21 +61,18 @@ ClientIDFromCacheKey(const nsACString& key, char ** result) key.EndReading(end); if (FindCharInReadable(':', colon, end)) { - *result = ToNewCString( Substring(start, colon)); - if (!*result) rv = NS_ERROR_OUT_OF_MEMORY; - } else { - NS_ASSERTION(false, "FindCharInRead failed to find ':'"); - rv = NS_ERROR_UNEXPECTED; + result.Assign(Substring(start, colon)); + return NS_OK; } - return rv; + + NS_ASSERTION(false, "FindCharInRead failed to find ':'"); + return NS_ERROR_UNEXPECTED; } nsresult ClientKeyFromCacheKey(const nsCString& key, nsACString &result) { - nsresult rv = NS_OK; - nsReadingIterator start; key.BeginReading(start); @@ -88,10 +82,10 @@ ClientKeyFromCacheKey(const nsCString& key, nsACString &result) if (FindCharInReadable(':', start, end)) { ++start; // advance past clientID ':' delimiter result.Assign(Substring(start, end)); - } else { - NS_ASSERTION(false, "FindCharInRead failed to find ':'"); - rv = NS_ERROR_UNEXPECTED; - result.Truncate(0); + return NS_OK; } - return rv; + + NS_ASSERTION(false, "FindCharInRead failed to find ':'"); + result.Truncate(0); + return NS_ERROR_UNEXPECTED; } diff --git a/netwerk/cache/nsCache.h b/netwerk/cache/nsCache.h index 3c4513140530..035865f9b188 100644 --- a/netwerk/cache/nsCache.h +++ b/netwerk/cache/nsCache.h @@ -35,8 +35,8 @@ extern uint32_t SecondsFromPRTime(PRTime prTime); extern PRTime PRTimeFromSeconds(uint32_t seconds); -extern nsresult ClientIDFromCacheKey(const nsACString& key, char ** result); -extern nsresult ClientKeyFromCacheKey(const nsCString& key, nsACString &result); +extern nsresult ClientIDFromCacheKey(const nsACString& key, nsACString& result); +extern nsresult ClientKeyFromCacheKey(const nsCString& key, nsACString& result); #endif // _nsCache_h diff --git a/netwerk/cache/nsCacheEntry.cpp b/netwerk/cache/nsCacheEntry.cpp index 963e10d08182..d57640561cf4 100644 --- a/netwerk/cache/nsCacheEntry.cpp +++ b/netwerk/cache/nsCacheEntry.cpp @@ -272,23 +272,27 @@ NS_IMPL_ISUPPORTS(nsCacheEntryInfo, nsICacheEntryInfo) NS_IMETHODIMP -nsCacheEntryInfo::GetClientID(char ** clientID) +nsCacheEntryInfo::GetClientID(nsACString& aClientID) { - NS_ENSURE_ARG_POINTER(clientID); - if (!mCacheEntry) return NS_ERROR_NOT_AVAILABLE; + if (!mCacheEntry) { + aClientID.Truncate(); + return NS_ERROR_NOT_AVAILABLE; + } - return ClientIDFromCacheKey(*mCacheEntry->Key(), clientID); + return ClientIDFromCacheKey(*mCacheEntry->Key(), aClientID); } NS_IMETHODIMP -nsCacheEntryInfo::GetDeviceID(char ** deviceID) +nsCacheEntryInfo::GetDeviceID(nsACString& aDeviceID) { - NS_ENSURE_ARG_POINTER(deviceID); - if (!mCacheEntry) return NS_ERROR_NOT_AVAILABLE; + if (!mCacheEntry) { + aDeviceID.Truncate(); + return NS_ERROR_NOT_AVAILABLE; + } - *deviceID = NS_strdup(mCacheEntry->GetDeviceID()); - return *deviceID ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + aDeviceID.Assign(mCacheEntry->GetDeviceID()); + return NS_OK; } diff --git a/netwerk/cache/nsCacheEntryDescriptor.cpp b/netwerk/cache/nsCacheEntryDescriptor.cpp index b682f2a736bf..f9ede9ad9272 100644 --- a/netwerk/cache/nsCacheEntryDescriptor.cpp +++ b/netwerk/cache/nsCacheEntryDescriptor.cpp @@ -111,32 +111,29 @@ nsCacheEntryDescriptor::~nsCacheEntryDescriptor() NS_IMETHODIMP -nsCacheEntryDescriptor::GetClientID(char ** result) +nsCacheEntryDescriptor::GetClientID(nsACString& aClientID) { - NS_ENSURE_ARG_POINTER(result); - nsCacheServiceAutoLock lock(LOCK_TELEM(NSCACHEENTRYDESCRIPTOR_GETCLIENTID)); - if (!mCacheEntry) return NS_ERROR_NOT_AVAILABLE; + if (!mCacheEntry) { + aClientID.Truncate(); + return NS_ERROR_NOT_AVAILABLE; + } - return ClientIDFromCacheKey(*(mCacheEntry->Key()), result); + return ClientIDFromCacheKey(*(mCacheEntry->Key()), aClientID); } NS_IMETHODIMP -nsCacheEntryDescriptor::GetDeviceID(char ** aDeviceID) +nsCacheEntryDescriptor::GetDeviceID(nsACString& aDeviceID) { - NS_ENSURE_ARG_POINTER(aDeviceID); nsCacheServiceAutoLock lock(LOCK_TELEM(NSCACHEENTRYDESCRIPTOR_GETDEVICEID)); - if (!mCacheEntry) return NS_ERROR_NOT_AVAILABLE; - - const char* deviceID = mCacheEntry->GetDeviceID(); - if (!deviceID) { - *aDeviceID = nullptr; - return NS_OK; + if (!mCacheEntry) { + aDeviceID.Truncate(); + return NS_ERROR_NOT_AVAILABLE; } - *aDeviceID = NS_strdup(deviceID); - return *aDeviceID ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + aDeviceID.Assign(mCacheEntry->GetDeviceID()); + return NS_OK; } diff --git a/netwerk/cache/nsDiskCacheDevice.cpp b/netwerk/cache/nsDiskCacheDevice.cpp index bf305ac872c8..656ad39e6dd5 100644 --- a/netwerk/cache/nsDiskCacheDevice.cpp +++ b/netwerk/cache/nsDiskCacheDevice.cpp @@ -197,16 +197,14 @@ private: NS_IMPL_ISUPPORTS(nsDiskCacheDeviceInfo, nsICacheDeviceInfo) -NS_IMETHODIMP nsDiskCacheDeviceInfo::GetDescription(char ** aDescription) +NS_IMETHODIMP nsDiskCacheDeviceInfo::GetDescription(nsACString& aDescription) { - NS_ENSURE_ARG_POINTER(aDescription); - *aDescription = NS_strdup("Disk cache device"); - return *aDescription ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + aDescription.AssignLiteral("Disk cache device"); + return NS_OK; } -NS_IMETHODIMP nsDiskCacheDeviceInfo::GetUsageReport(char ** usageReport) +NS_IMETHODIMP nsDiskCacheDeviceInfo::GetUsageReport(nsACString& aUsageReport) { - NS_ENSURE_ARG_POINTER(usageReport); nsCString buffer; buffer.AssignLiteral(" \n" @@ -224,9 +222,7 @@ NS_IMETHODIMP nsDiskCacheDeviceInfo::GetUsageReport(char ** usageReport) buffer.AppendLiteral("\n" " \n"); - *usageReport = ToNewCString(buffer); - if (!*usageReport) return NS_ERROR_OUT_OF_MEMORY; - + aUsageReport.Assign(buffer); return NS_OK; } diff --git a/netwerk/cache/nsDiskCacheDeviceSQL.cpp b/netwerk/cache/nsDiskCacheDeviceSQL.cpp index 8eabc59edaa1..03736305d755 100644 --- a/netwerk/cache/nsDiskCacheDeviceSQL.cpp +++ b/netwerk/cache/nsDiskCacheDeviceSQL.cpp @@ -348,14 +348,14 @@ private: NS_IMPL_ISUPPORTS(nsOfflineCacheDeviceInfo, nsICacheDeviceInfo) NS_IMETHODIMP -nsOfflineCacheDeviceInfo::GetDescription(char **aDescription) +nsOfflineCacheDeviceInfo::GetDescription(nsACString& aDescription) { - *aDescription = NS_strdup("Offline cache device"); - return *aDescription ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + aDescription.AssignLiteral("Offline cache device"); + return NS_OK; } NS_IMETHODIMP -nsOfflineCacheDeviceInfo::GetUsageReport(char ** usageReport) +nsOfflineCacheDeviceInfo::GetUsageReport(nsACString& aUsageReport) { nsAutoCString buffer; buffer.AssignLiteral(" \n" @@ -375,10 +375,7 @@ nsOfflineCacheDeviceInfo::GetUsageReport(char ** usageReport) buffer.AppendLiteral("\n" " \n"); - *usageReport = ToNewCString(buffer); - if (!*usageReport) - return NS_ERROR_OUT_OF_MEMORY; - + aUsageReport.Assign(buffer); return NS_OK; } @@ -590,17 +587,17 @@ public: NS_IMPL_ISUPPORTS(nsOfflineCacheEntryInfo, nsICacheEntryInfo) NS_IMETHODIMP -nsOfflineCacheEntryInfo::GetClientID(char **result) +nsOfflineCacheEntryInfo::GetClientID(nsACString& aClientID) { - *result = NS_strdup(mRec->clientID); - return *result ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + aClientID.Assign(mRec->clientID); + return NS_OK; } NS_IMETHODIMP -nsOfflineCacheEntryInfo::GetDeviceID(char ** deviceID) +nsOfflineCacheEntryInfo::GetDeviceID(nsACString& aDeviceID) { - *deviceID = NS_strdup(OFFLINE_CACHE_DEVICE_ID); - return *deviceID ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + aDeviceID.Assign(OFFLINE_CACHE_DEVICE_ID); + return NS_OK; } NS_IMETHODIMP diff --git a/netwerk/cache/nsDiskCacheEntry.cpp b/netwerk/cache/nsDiskCacheEntry.cpp index f5b1c4b0701f..e2812f374203 100644 --- a/netwerk/cache/nsDiskCacheEntry.cpp +++ b/netwerk/cache/nsDiskCacheEntry.cpp @@ -70,18 +70,16 @@ nsDiskCacheEntry::CreateCacheEntry(nsCacheDevice * device) NS_IMPL_ISUPPORTS(nsDiskCacheEntryInfo, nsICacheEntryInfo) -NS_IMETHODIMP nsDiskCacheEntryInfo::GetClientID(char ** clientID) +NS_IMETHODIMP nsDiskCacheEntryInfo::GetClientID(nsACString& aClientID) { - NS_ENSURE_ARG_POINTER(clientID); - return ClientIDFromCacheKey(nsDependentCString(mDiskEntry->Key()), clientID); + return ClientIDFromCacheKey(nsDependentCString(mDiskEntry->Key()), aClientID); } extern const char DISK_CACHE_DEVICE_ID[]; -NS_IMETHODIMP nsDiskCacheEntryInfo::GetDeviceID(char ** deviceID) +NS_IMETHODIMP nsDiskCacheEntryInfo::GetDeviceID(nsACString& aDeviceID) { - NS_ENSURE_ARG_POINTER(deviceID); - *deviceID = NS_strdup(mDeviceID); - return *deviceID ? NS_OK : NS_ERROR_OUT_OF_MEMORY; + aDeviceID.Assign(mDeviceID); + return NS_OK; } diff --git a/netwerk/cache/nsICacheVisitor.idl b/netwerk/cache/nsICacheVisitor.idl index ddc993635726..b9fad5254725 100644 --- a/netwerk/cache/nsICacheVisitor.idl +++ b/netwerk/cache/nsICacheVisitor.idl @@ -48,13 +48,13 @@ interface nsICacheDeviceInfo : nsISupports /** * Get a human readable description of the cache device. */ - readonly attribute string description; + readonly attribute ACString description; /** * Get a usage report, statistics, miscellaneous data about * the cache device. */ - readonly attribute string usageReport; + readonly attribute ACString usageReport; /** * Get the number of stored cache entries. @@ -79,12 +79,12 @@ interface nsICacheEntryInfo : nsISupports /** * Get the client id associated with this cache entry. */ - readonly attribute string clientID; + readonly attribute ACString clientID; /** * Get the id for the device that stores this cache entry. */ - readonly attribute string deviceID; + readonly attribute ACString deviceID; /** * Get the key identifying the cache entry. diff --git a/netwerk/cache/nsMemoryCacheDevice.cpp b/netwerk/cache/nsMemoryCacheDevice.cpp index 08c44b581cbd..8c22d5fa1495 100644 --- a/netwerk/cache/nsMemoryCacheDevice.cpp +++ b/netwerk/cache/nsMemoryCacheDevice.cpp @@ -563,20 +563,17 @@ NS_IMPL_ISUPPORTS(nsMemoryCacheDeviceInfo, nsICacheDeviceInfo) NS_IMETHODIMP -nsMemoryCacheDeviceInfo::GetDescription(char ** result) +nsMemoryCacheDeviceInfo::GetDescription(nsACString& aDescription) { - NS_ENSURE_ARG_POINTER(result); - *result = NS_strdup("Memory cache device"); - if (!*result) return NS_ERROR_OUT_OF_MEMORY; + aDescription.AssignLiteral("Memory cache device"); return NS_OK; } NS_IMETHODIMP -nsMemoryCacheDeviceInfo::GetUsageReport(char ** result) +nsMemoryCacheDeviceInfo::GetUsageReport(nsACString& aUsageReport) { - NS_ENSURE_ARG_POINTER(result); - nsCString buffer; + nsCString buffer; buffer.AssignLiteral(" \n" " Inactive storage:\n" @@ -585,8 +582,7 @@ nsMemoryCacheDeviceInfo::GetUsageReport(char ** result) buffer.AppendLiteral(" KiB\n" " \n"); - *result = ToNewCString(buffer); - if (!*result) return NS_ERROR_OUT_OF_MEMORY; + aUsageReport.Assign(buffer); return NS_OK; } diff --git a/netwerk/cache2/OldWrappers.cpp b/netwerk/cache2/OldWrappers.cpp index 698c7af6526b..676eefc825bc 100644 --- a/netwerk/cache2/OldWrappers.cpp +++ b/netwerk/cache2/OldWrappers.cpp @@ -207,8 +207,8 @@ NS_IMETHODIMP _OldVisitCallbackWrapper::VisitEntry(const char * deviceID, *_retval = true; // Read all informative properties from the entry. - nsCString clientId; - rv = entryInfo->GetClientID(getter_Copies(clientId)); + nsAutoCString clientId; + rv = entryInfo->GetClientID(clientId); if (NS_FAILED(rv)) return NS_OK; From b55c2d4000d3d75e187f61911c350735df9be692 Mon Sep 17 00:00:00 2001 From: Makoto Kato Date: Sun, 29 Oct 2017 22:56:41 +0900 Subject: [PATCH 14/18] Bug 1411802 - Build stylo on Android as default. r=nalexander,snorp,jryans - Building is nightly channel only. Beta and release for Fennec 58 don't build stylo. It means that the package size for 58 beta/release isn't incremented by this change. - The preference for stylo is still turned off Nightly 58. It will be turned on 59 after fixing some bugs for crashtests and etc. Our target to enable stylo for Android is 59. - ./mach bootstrap already installs clang etc to build stylo and bindgen. Developers for mobile won't require additional build options for this change. MozReview-Commit-ID: CIpYl8I5d7x --HG-- extra : rebase_source : 6387704e4a94db080d4add10298cf1cc254ddec0 --- mobile/android/config/mozconfigs/common | 4 ++++ taskcluster/ci/build/android.yml | 12 ++++++++++++ toolkit/moz.configure | 10 ++++++---- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/mobile/android/config/mozconfigs/common b/mobile/android/config/mozconfigs/common index 453b81f06ed0..1733374a004e 100644 --- a/mobile/android/config/mozconfigs/common +++ b/mobile/android/config/mozconfigs/common @@ -7,6 +7,10 @@ if [ "x$IS_NIGHTLY" = "xyes" ]; then MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1} fi +if [ -z "$NO_NDK" ]; then + . "$topsrcdir/build/mozconfig.stylo" +fi + MOZ_AUTOMATION_L10N_CHECK=0 . "$topsrcdir/build/mozconfig.common" diff --git a/taskcluster/ci/build/android.yml b/taskcluster/ci/build/android.yml index 3826a9451328..b212c2219913 100644 --- a/taskcluster/ci/build/android.yml +++ b/taskcluster/ci/build/android.yml @@ -25,6 +25,7 @@ android-api-16/debug: tooltool-downloads: internal toolchains: - android-sdk-linux + - linux64-clang - linux64-rust-android - linux64-sccache - proguard-jar @@ -56,6 +57,7 @@ android-x86/opt: tooltool-downloads: internal toolchains: - android-sdk-linux + - linux64-clang - linux64-rust-android - linux64-sccache - proguard-jar @@ -91,6 +93,7 @@ android-x86-nightly/opt: tooltool-downloads: internal toolchains: - android-sdk-linux + - linux64-clang - linux64-rust-android - linux64-sccache - proguard-jar @@ -122,6 +125,7 @@ android-api-16/opt: tooltool-downloads: internal toolchains: - android-sdk-linux + - linux64-clang - linux64-rust-android - linux64-sccache - proguard-jar @@ -157,6 +161,7 @@ android-api-16-nightly/opt: tooltool-downloads: internal toolchains: - android-sdk-linux + - linux64-clang - linux64-rust-android - linux64-sccache - proguard-jar @@ -189,6 +194,7 @@ android-x86-old-id/opt: run-on-projects: [ 'mozilla-central' ] toolchains: - android-sdk-linux + - linux64-clang - linux64-rust-android - linux64-sccache - proguard-jar @@ -225,6 +231,7 @@ android-x86-old-id-nightly/opt: run-on-projects: [ 'mozilla-central' ] toolchains: - android-sdk-linux + - linux64-clang - linux64-rust-android - linux64-sccache - proguard-jar @@ -257,6 +264,7 @@ android-api-16-old-id/opt: run-on-projects: [ 'mozilla-central' ] toolchains: - android-sdk-linux + - linux64-clang - linux64-rust-android - linux64-sccache - proguard-jar @@ -293,6 +301,7 @@ android-api-16-old-id-nightly/opt: run-on-projects: [ 'mozilla-central' ] toolchains: - android-sdk-linux + - linux64-clang - linux64-rust-android - linux64-sccache - proguard-jar @@ -337,6 +346,7 @@ android-api-16-gradle/opt: toolchains: - android-gradle-dependencies - android-sdk-linux + - linux64-clang - linux64-rust-android - linux64-sccache - proguard-jar @@ -368,6 +378,7 @@ android-aarch64/opt: tooltool-downloads: internal toolchains: - android-sdk-linux + - linux64-clang - linux64-rust-android - linux64-sccache - proguard-jar @@ -403,6 +414,7 @@ android-aarch64-nightly/opt: tooltool-downloads: internal toolchains: - android-sdk-linux + - linux64-clang - linux64-rust-android - linux64-sccache - proguard-jar diff --git a/toolkit/moz.configure b/toolkit/moz.configure index 64098a3cbcd7..534ccc68363a 100644 --- a/toolkit/moz.configure +++ b/toolkit/moz.configure @@ -570,17 +570,19 @@ simple_keyfile('Pocket API') option('--enable-stylo', nargs='?', choices=('build',), help='Include Stylo in the build and/or enable it at runtime') -@depends('--enable-stylo', '--help', target) -def stylo_config(value, _, target): +@depends('--enable-stylo', '--help', target, milestone) +def stylo_config(value, _, target, milestone): build_stylo = None enable_stylo = None # If nothing is specified, default to building and enabling Stylo where it # is known to work. if value.origin == 'default': + # Build stylo on Android Nighly, but this is still turned off yet. if target.os == 'Android': - # Stylo on Android is happening Later(tm). - pass + if milestone.is_nightly: + build_stylo = True + enable_stylo = None else: build_stylo = True enable_stylo = True From 41d5df0bac2262a2b44b98ceadd5218c3cb264a7 Mon Sep 17 00:00:00 2001 From: Makoto Kato Date: Sun, 29 Oct 2017 14:02:09 +0900 Subject: [PATCH 15/18] Bug 1411802 - Fix bustage after updating NDK r15c. r=me MozReview-Commit-ID: 2kMieFmFWsJ --HG-- extra : rebase_source : 2bea8a6590cadaeec3bfd807474f41535167b11f --- build/moz.configure/android-ndk.configure | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build/moz.configure/android-ndk.configure b/build/moz.configure/android-ndk.configure index 1b7339badc95..5bad7fb63d6d 100644 --- a/build/moz.configure/android-ndk.configure +++ b/build/moz.configure/android-ndk.configure @@ -259,13 +259,17 @@ add_old_configure_assignment('stlport_cppflags', stlport_cppflags) @depends(stlport_cppflags, android_platform, android_toolchain, android_toolchain_prefix_base, '--help') +@imports(_from='os.path', _import='isdir') def bindgen_cflags_defaults(stlport_cppflags, android_platform, toolchain, toolchain_prefix, _): if not stlport_cppflags: return gcc_include = os.path.join( - toolchain, 'lib', 'gcc', toolchain_prefix, '4.9') + toolchain, 'lib', 'gcc', toolchain_prefix, '4.9.x') + if not isdir(gcc_include): + gcc_include = os.path.join( + toolchain, 'lib', 'gcc', toolchain_prefix, '4.9') cflags_format = "%s -isystem %s -gcc-toolchain %s -I%s -I%s" return cflags_format % (stlport_cppflags, From c61725847a62ba52074291ae9f4c3c6ad530134a Mon Sep 17 00:00:00 2001 From: ffxbld Date: Sun, 29 Oct 2017 11:34:15 -0700 Subject: [PATCH 16/18] No bug, Automated HSTS preload list update from host bld-linux64-spot-033 - a=hsts-update --- security/manager/ssl/nsSTSPreloadList.errors | 206 +++++++++++-------- security/manager/ssl/nsSTSPreloadList.inc | 93 +++------ 2 files changed, 154 insertions(+), 145 deletions(-) diff --git a/security/manager/ssl/nsSTSPreloadList.errors b/security/manager/ssl/nsSTSPreloadList.errors index 5a14640b86bb..122c20cc3c0a 100644 --- a/security/manager/ssl/nsSTSPreloadList.errors +++ b/security/manager/ssl/nsSTSPreloadList.errors @@ -1,13 +1,15 @@ 06se.com: could not connect to host 0day.su: could not connect to host +0x65.net: could not connect to host +38888msc.com: could not connect to host 47tech.com: could not connect to host 4loc.us: could not connect to host 4x4.lk: could not connect to host 8560.be: could not connect to host 87577.com: could not connect to host 8887999.com: could not connect to host +888msc.vip: could not connect to host 8ack.de: could not connect to host -8ox.ru: could not connect to host 8t88.biz: could not connect to host 91-freedom.com: could not connect to host 9ss6.com: could not connect to host @@ -20,6 +22,7 @@ adzie.xyz: could not connect to host aevpn.org: could not connect to host afrikarl.de: could not connect to host agowa.eu: could not connect to host +ajetaci.cz: could not connect to host akiba-server.info: could not connect to host akoww.de: could not connect to host akul.co.in: could not connect to host @@ -30,7 +33,8 @@ alexmol.tk: could not connect to host alexperry.io: could not connect to host alilialili.ga: could not connect to host alistairstowing.com: could not connect to host -alkel.info: could not connect to host +aljammaz.holdings: could not connect to host +all4os.com: could not connect to host alphie.me: could not connect to host altahrim.net: could not connect to host ameho.me: could not connect to host @@ -40,7 +44,6 @@ andrepicard.de: could not connect to host andrewhowden.com: could not connect to host annetaan.fi: could not connect to host anoneko.com: could not connect to host -answers-online.ru: could not connect to host anyways.at: could not connect to host aoku3d.com: could not connect to host apkoyunlar.club: could not connect to host @@ -48,7 +51,6 @@ arent.kz: could not connect to host arksan.com.tr: could not connect to host artisense.de: could not connect to host artyland.ru: could not connect to host -asdyx.de: could not connect to host askmagicconch.com: could not connect to host assdecoeur.org: could not connect to host astutikhonda.com: could not connect to host @@ -56,15 +58,15 @@ at1.co: could not connect to host athi.pl: could not connect to host austinsutphin.com: could not connect to host australiancattle.dog: could not connect to host -auto-anleitung.de: could not connect to host autostop-occasions.be: could not connect to host +avi9526.pp.ua: could not connect to host awan.tech: could not connect to host awf0.xyz: could not connect to host -b422edu.com: could not connect to host baitulongbaycruises.com: could not connect to host balonmano.co: could not connect to host bandarifamily.com: could not connect to host -batfoundry.com: could not connect to host +barcodeberlin.com: could not connect to host +battleboxx.com: could not connect to host bbdos.ru: could not connect to host beasel.biz: could not connect to host bellavistaoutdoor.com: could not connect to host @@ -73,11 +75,13 @@ bencorby.com: could not connect to host benjamin-horvath.com: could not connect to host benzou-space.com: could not connect to host berthelier.me: could not connect to host +bestwebsite.gallery: could not connect to host bey.io: could not connect to host billdestler.com: could not connect to host bip.gov.sa: could not connect to host blumen-garage.de: could not connect to host bm-i.ch: could not connect to host +bobep.ru: could not connect to host bodrumfarm.com: could not connect to host bolwerk.com.br: could not connect to host boomsaki.com: could not connect to host @@ -85,22 +89,23 @@ boomsakis.com: could not connect to host borisbesemer.com: could not connect to host bouncourseplanner.net: could not connect to host brettabel.com: could not connect to host +brfvh24.se: could not connect to host buenotour.ru: could not connect to host bullbits.com: could not connect to host +burlesquemakeup.com: could not connect to host businessfurs.info: could not connect to host businessmodeler.se: could not connect to host buyshoe.org: could not connect to host bvexplained.co.uk: could not connect to host by1898.com: could not connect to host c16t.uk: could not connect to host -cais.de: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]" nsresult: "0x80004005 (NS_ERROR_FAILURE)" location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 119" data: no] calculatoaresecondhand.xyz: could not connect to host callabs.net: could not connect to host +candylion.rocks: could not connect to host carlandfaith.com: could not connect to host catgirl.me: could not connect to host centos.pub: could not connect to host challengeskins.com: could not connect to host -chaoslab.org: could not connect to host chaoticlaw.com: could not connect to host cheah.xyz: could not connect to host cheesefusion.com: could not connect to host @@ -109,15 +114,12 @@ china-line.org: could not connect to host chloehorler.com: could not connect to host chosenplaintext.org: could not connect to host chrisself.xyz: could not connect to host -christiangaetano.com: could not connect to host chziyue.com: could not connect to host clearviewwealthprojector.com.au: could not connect to host cloudbleed.info: could not connect to host cloudimproved.com: could not connect to host -cmahy.be: could not connect to host cmpr.es: could not connect to host cnlic.com: could not connect to host -cocaine-import.agency: could not connect to host codercross.com: could not connect to host coffeetocode.me: could not connect to host colleencornez.com: could not connect to host @@ -131,13 +133,13 @@ cpaneltips.com: could not connect to host criticalaim.com: could not connect to host crystalmachine.net: could not connect to host csgo77.com: could not connect to host +csokolade.hu: could not connect to host cubela.tech: could not connect to host cyberpeace.nl: could not connect to host cypherpunk.ws: could not connect to host d-bood.site: could not connect to host dahlberg.cologne: could not connect to host daniel-stahl.net: could not connect to host -danielzuzevich.com: could not connect to host darlo.co.uk: could not connect to host datorb.com: could not connect to host davros.eu: could not connect to host @@ -145,7 +147,6 @@ davros.ru: could not connect to host dawnsonb.com: could not connect to host dbcom.ru: could not connect to host de-servers.de: could not connect to host -deadsoul.net: could not connect to host decoyrouting.com: could not connect to host derchris.me: could not connect to host derivativeshub.pro: could not connect to host @@ -163,6 +164,7 @@ disco-crazy-world.de: could not connect to host djangogolf.com: could not connect to host dojifish.space: could not connect to host domengrad.ru: could not connect to host +domypapers.com: could not connect to host dostavkakurierom.ru: could not connect to host dreizwosechs.de: could not connect to host droomhuis-in-zuid-holland-kopen.nl: could not connect to host @@ -171,11 +173,15 @@ duelsow.eu: could not connect to host duks.com.br: could not connect to host duo.money: could not connect to host e-wishlist.net: could not connect to host +e3q.de: could not connect to host eagleridgecampground.com: could not connect to host eatfitoutlet.com.br: could not connect to host +edisonchee.com: could not connect to host +edp-collaborative.com: could not connect to host eeb98.com: could not connect to host eez.ee: could not connect to host ehuber.info: could not connect to host +einaros.is: could not connect to host eled.io: could not connect to host elexel.ru: could not connect to host endlessdiy.ca: could not connect to host @@ -188,9 +194,6 @@ eurostrategy.vn.ua: could not connect to host eveshaiwu.com: could not connect to host evio.com: could not connect to host exceed.global: could not connect to host -expatads.com: could not connect to host -extreme-gaming.de: could not connect to host -extreme-gaming.us: could not connect to host ezhik-din.ru: could not connect to host fabrysociety.org: could not connect to host factureenlinea.com: could not connect to host @@ -207,6 +210,7 @@ first-time-offender.com: could not connect to host fixmyglitch.com: could not connect to host flam.io: could not connect to host fletchto99.com: could not connect to host +florian-schlachter.de: could not connect to host foodserve.in: could not connect to host fossewayflowers.co.uk: could not connect to host fossewayflowers.com: could not connect to host @@ -228,6 +232,8 @@ funksteckdosen24.de: could not connect to host futbolvivo.tv: could not connect to host fyol.pw: could not connect to host g4w.co: could not connect to host +gaiserik.com: could not connect to host +gala.kiev.ua: could not connect to host gam3rs.de: could not connect to host game-gentle.com: could not connect to host garagemhermetica.org: could not connect to host @@ -235,9 +241,10 @@ gasbarkenora.com: could not connect to host gasnews.net: could not connect to host gaygeeks.de: could not connect to host gbcsummercamps.com: could not connect to host -gdevpenze.ru: could not connect to host gdhzcgs.com: could not connect to host geeks.berlin: could not connect to host +gehrke.nrw: could not connect to host +generationnext.pl: could not connect to host geneve.guide: could not connect to host georgmayer.eu: could not connect to host geti2p.com: could not connect to host @@ -246,8 +253,7 @@ gevaulug.fr: could not connect to host gfoss.gr: could not connect to host ggss.cf: could not connect to host ghostblog.info: could not connect to host -giveme.online: could not connect to host -gizmo.ovh: could not connect to host +glasner.photo: could not connect to host gnom.me: could not connect to host godrealms.com: could not connect to host google: could not connect to host @@ -264,20 +270,22 @@ gritte.net: could not connect to host grizzlys.com: could not connect to host gvt2.com: could not connect to host gvt3.com: could not connect to host +hackerchai.com: could not connect to host haktec.de: could not connect to host halcyonsbastion.com: could not connect to host harmfarm.nl: could not connect to host hasabig.wang: could not connect to host hasalittle.wang: could not connect to host +head.org: could not connect to host heijblok.com: could not connect to host hellomouse.tk: could not connect to host helsingfors.guide: could not connect to host henry.gg: could not connect to host hentaimaster.net: could not connect to host +heptner24.de: could not connect to host here.ml: could not connect to host hg881.com: could not connect to host hiraku.me: could not connect to host -hollermann.eu: could not connect to host hoodoo.io: could not connect to host hoodoo.tech: could not connect to host horvathd.eu: could not connect to host @@ -287,6 +295,7 @@ hukkatavara.com: could not connect to host hundter.com: could not connect to host ibase.com: could not connect to host icbemp.gov: could not connect to host +identifyme.net: could not connect to host ifxnet.com: could not connect to host ikenmeyer.eu: could not connect to host ileat.com: could not connect to host @@ -311,6 +320,7 @@ jaredfraser.com: could not connect to host javascriptlab.fr: could not connect to host jessevictors.com: could not connect to host jhburton.co.uk: could not connect to host +jialinwu.com: could not connect to host jie.dance: could not connect to host jiyuu-ni.com: could not connect to host jiyuu-ni.net: could not connect to host @@ -318,21 +328,21 @@ jobmedic.com: could not connect to host joecod.es: could not connect to host jonathansanchez.pro: could not connect to host jonpads.com: could not connect to host -jons.org: could not connect to host joostbovee.nl: could not connect to host just-pools.co.za: could not connect to host justmy.website: could not connect to host +juventusmania1897.com: could not connect to host k-wallet.com: could not connect to host k82.org: could not connect to host kamikaichimaru.com: could not connect to host kanjo.de: could not connect to host +kanuvu.de: could not connect to host kapo.info: could not connect to host karanlyons.com: could not connect to host karuneshjohri.com: could not connect to host katzen.me: could not connect to host kawaiiku.com: could not connect to host kawaiiku.de: could not connect to host -kbfl.org: could not connect to host kenrogers.co: could not connect to host kenvix.com: could not connect to host kieranweightman.me: could not connect to host @@ -340,6 +350,7 @@ kinepolis-studio.ga: could not connect to host kjoglum.me: could not connect to host knownsec.cf: could not connect to host kollawat.me: could not connect to host +konicaprinterdriver.com: could not connect to host konventseliten.se: could not connect to host kousaku.jp: could not connect to host kozmik.co: could not connect to host @@ -348,7 +359,6 @@ kylling.io: could not connect to host laboutiquemarocaineduconvoyeur.ma: could not connect to host lacasa.fr: could not connect to host lachawoj.de: could not connect to host -lafosseobservatoire.be: could not connect to host lathamlabs.com: could not connect to host lathamlabs.net: could not connect to host lathamlabs.org: could not connect to host @@ -369,6 +379,7 @@ linksextremist.at: could not connect to host linuxcommand.ru: could not connect to host lissabon.guide: could not connect to host littleservice.cn: could not connect to host +litvideoserver.de: could not connect to host litz.ca: could not connect to host litzenberger.ca: could not connect to host liukang.tech: could not connect to host @@ -384,6 +395,7 @@ macedopesca.com.br: could not connect to host madrants.net: could not connect to host magnacumlaude.co: could not connect to host mail4geek.com: could not connect to host +mare92.cz: could not connect to host markoh.co.uk: could not connect to host markus-ullmann.de: could not connect to host martin-mattel.com: could not connect to host @@ -431,7 +443,6 @@ niouininon.eu: could not connect to host niva.synology.me: could not connect to host nkb.in.th: could not connect to host nlegall.fr: could not connect to host -nodelab-it.de: could not connect to host notcompletelycorrect.com: could not connect to host notesforpebble.com: could not connect to host novascan.net: could not connect to host @@ -441,7 +452,6 @@ nowremindme.com: could not connect to host nup.pw: could not connect to host obdolbacca.ru: could not connect to host oberhof.co: could not connect to host -octal.es: could not connect to host octosys.net: could not connect to host octosys.org: could not connect to host octosys.ru: could not connect to host @@ -459,6 +469,7 @@ oxygaming.com: could not connect to host oxymc.com: could not connect to host palmavile.us: could not connect to host palmaville.com: could not connect to host +pardnoy.com: could not connect to host pascalchristen.ch: could not connect to host pear2pear.de: could not connect to host perkbrian.com: could not connect to host @@ -467,13 +478,14 @@ persoform.ch: could not connect to host peter.org.ua: could not connect to host pgpmail.cc: could not connect to host philippa.cool: could not connect to host -php-tuning.de: could not connect to host picallo.es: could not connect to host pinebaylibrary.org: could not connect to host pitfire.io: could not connect to host plaasprodukte.com: could not connect to host planbox.info: could not connect to host plussizereviews.com: could not connect to host +pm13.cz: could not connect to host +pm13.org: could not connect to host pointagri.com: could not connect to host polit.im: could not connect to host poolinstallers.co.za: could not connect to host @@ -494,14 +506,15 @@ reignsphere.net: could not connect to host reinaertvandecruys.me: could not connect to host reismil.ch: could not connect to host repaxan.com: could not connect to host -reporting.gov: could not connect to host reqognize.com: could not connect to host reth.ch: could not connect to host retube.ga: could not connect to host reykjavik.guide: could not connect to host ricknox.com: could not connect to host +risada.nl: could not connect to host robinvdmarkt.nl: could not connect to host robomonkey.org: could not connect to host +roeldevries.me: could not connect to host roguesignal.net: could not connect to host rohanbassett.com: could not connect to host rolodato.com: could not connect to host @@ -521,6 +534,7 @@ sanatrans.com: could not connect to host sanmuding.com: could not connect to host sarndipity.com: could not connect to host schamlosharmlos.de: could not connect to host +schnapke.name: could not connect to host scm-2017.org: could not connect to host seanstrout.com: could not connect to host sebastian-lutsch.de: could not connect to host @@ -536,6 +550,7 @@ shadowplus.net: could not connect to host shadowrocket.net: could not connect to host sharevari.com: could not connect to host shavingks.com: could not connect to host +shellday.cc: could not connect to host sheratan.web.id: could not connect to host sheying.tm: could not connect to host shirakaba-cc.com: could not connect to host @@ -560,6 +575,7 @@ socialworkout.org: could not connect to host socialworkout.tv: could not connect to host socketize.com: could not connect to host sodiao.cc: could not connect to host +sohamroy.me: could not connect to host solos.im: could not connect to host somali-derp.com: could not connect to host soulema.com: could not connect to host @@ -576,11 +592,12 @@ stefanovski.io: could not connect to host stickswag.cf: could not connect to host stpip.com: could not connect to host stylle.me: could not connect to host -surdam.casa: could not connect to host sussexwebdesigns.com: could not connect to host sviz.pro: could not connect to host +swuosa.org: could not connect to host takusan.ru: could not connect to host talktwincities.com: could not connect to host +talsi.eu: could not connect to host tdsb.cf: could not connect to host tdsbhack.tk: could not connect to host techask.it: could not connect to host @@ -599,15 +616,14 @@ tiliaze.info: could not connect to host tiliaze.net: could not connect to host timysewyn.be: could not connect to host tobi-mayer.de: could not connect to host +topwin.la: could not connect to host totallynotaserver.com: could not connect to host totch.de: could not connect to host totot.net: could not connect to host traces.ml: could not connect to host transcendmotor.sg: could not connect to host -troianet.com.br: could not connect to host tucidi.net: could not connect to host turn-sticks.com: could not connect to host -tusb.ml: could not connect to host twentymilliseconds.com: could not connect to host twiri.net: could not connect to host twotube.ie: could not connect to host @@ -618,7 +634,6 @@ umsapi.com: could not connect to host unicorn.li: could not connect to host uniformehumboldt.com.br: could not connect to host unterschicht.tv: could not connect to host -upr.com.ua: could not connect to host vadik.me: could not connect to host vanderstraeten.dynv6.net: could not connect to host vapehour.com: could not connect to host @@ -630,10 +645,11 @@ verteilergetriebe.info: could not connect to host viditut.com: could not connect to host visiontree.eu: could not connect to host vlogge.com: could not connect to host -vmgirls.com: could not connect to host vmug.pl: could not connect to host w-w-auto.de: could not connect to host +w4nvu.org: could not connect to host wahhoi.net: could not connect to host +warezaddict.com: could not connect to host watashi.bid: could not connect to host watchweasel.com: could not connect to host weareincognito.org: could not connect to host @@ -642,7 +658,6 @@ webdesigneauclaire.com: could not connect to host webtech.com.br: could not connect to host webthings.com.br: could not connect to host wecanvisit.com: could not connect to host -weicn.org: could not connect to host welby.cat: could not connect to host welcomehelp.de: could not connect to host werhatunsverraten.eu: could not connect to host @@ -655,6 +670,8 @@ wkz.io: could not connect to host wolfemg.com: could not connect to host wolfenland.net: could not connect to host woomu.me: could not connect to host +wp-fastsearch.de: could not connect to host +wp6.pw: could not connect to host www-8887999.com: could not connect to host www.re: could not connect to host www.sb: could not connect to host @@ -676,11 +693,11 @@ zberger.com: could not connect to host zellari.ru: could not connect to host zenfusion.fr: could not connect to host zenghx.tk: could not connect to host +zenlogic.com: could not connect to host zerosource.net: could not connect to host zeug.co: could not connect to host zopyx.com: could not connect to host zorz.info: could not connect to host -ztytian.com: could not connect to host zulu7.com: could not connect to host zuviel.space: could not connect to host zzw.ca: could not connect to host @@ -733,6 +750,7 @@ zzw.ca: could not connect to host 16packets.com: could not connect to host 173vpn.cn: could not connect to host 173vpns.com: did not receive HSTS header +188522.com: did not receive HSTS header 188betwarriors.co.uk: could not connect to host 188trafalgar.ca: did not receive HSTS header 195gm.com: could not connect to host @@ -763,7 +781,7 @@ zzw.ca: could not connect to host 2intermediate.co.uk: did not receive HSTS header 2or3.tk: could not connect to host 2smart4food.com: did not receive HSTS header -2ss.jp: could not connect to host +2ss.jp: did not receive HSTS header 300651.ru: did not receive HSTS header 300m.com: did not receive HSTS header 300mbmovie24.com: did not receive HSTS header @@ -873,6 +891,7 @@ zzw.ca: could not connect to host 98laba.net: could not connect to host 99511.fi: could not connect to host 99998522.com: could not connect to host +9iwan.net: did not receive HSTS header 9point6.com: could not connect to host 9tolife.be: did not receive HSTS header a-plus.space: could not connect to host @@ -932,7 +951,6 @@ accuritpresence.com: did not receive HSTS header acgmoon.org: did not receive HSTS header acheirj.com.br: could not connect to host acheritage.co.uk: could not connect to host -achterstieg.dedyn.io: did not receive HSTS header acisonline.net: did not receive HSTS header acoffeeshops.com: could not connect to host acorns.com: did not receive HSTS header @@ -973,6 +991,7 @@ adonairelogios.com.br: could not connect to host adopteunsiteflash.com: could not connect to host adquisitio.de: could not connect to host adquisitio.in: could not connect to host +adriancohea.ninja: did not receive HSTS header adrianseo.ro: did not receive HSTS header adrl.ca: could not connect to host adsfund.org: could not connect to host @@ -1075,12 +1094,13 @@ alfa24.pro: could not connect to host alfredxing.com: did not receive HSTS header alittlebitcheeky.com: did not receive HSTS header aljmz.com: could not connect to host -alkami.com: could not connect to host +alkami.com: did not receive HSTS header all-subtitles.com: could not connect to host all.tf: could not connect to host alldaymonitoring.com: could not connect to host allemobieleproviders.nl: did not receive HSTS header allinnote.com: could not connect to host +allladyboys.com: did not receive HSTS header allmbw.com: could not connect to host allmystery.de: did not receive HSTS header allo-symo.fr: did not receive HSTS header @@ -1142,6 +1162,8 @@ anabol.nl: could not connect to host anadoluefessporkulubu.org: could not connect to host anagra.ms: could not connect to host analangelsteen.com: did not receive HSTS header +analpantyhose.org: did not receive HSTS header +analteengirls.net: did not receive HSTS header analytic-s.ml: did not receive HSTS header analyticsinmotion.net: could not connect to host ancientkarma.com: could not connect to host @@ -1344,6 +1366,7 @@ au-pair24.de: did not receive HSTS header au.search.yahoo.com: max-age too low: 172800 aubiosales.com: could not connect to host aucubin.moe: could not connect to host +audiolibri.org: did not receive HSTS header audiovisualdevices.com.au: did not receive HSTS header auditmatrix.com: did not receive HSTS header augias.org: could not connect to host @@ -1436,6 +1459,7 @@ bakkerdesignandbuild.com: did not receive HSTS header balcan-underground.net: could not connect to host baldwinkoo.com: could not connect to host baleares.party: could not connect to host +ballbusting-cbt.com: did not receive HSTS header balloonphp.com: could not connect to host balnearionaturaspa.com: did not receive HSTS header bambooforest.nl: could not connect to host @@ -1469,9 +1493,11 @@ bb-shiokaze.jp: did not receive HSTS header bbb1991.me: did not receive HSTS header bblovess.cn: could not connect to host bbrinck.eu: could not connect to host +bbw-wrestling.com: did not receive HSTS header bbwdom.xyz: could not connect to host bbwfacesitting.xyz: could not connect to host bbwfight.xyz: could not connect to host +bbwteens.org: did not receive HSTS header bcbsmagentprofile.com: could not connect to host bcchack.com: could not connect to host bccx.com: could not connect to host @@ -1484,6 +1510,7 @@ bcsytv.com: could not connect to host bcweightlifting.ca: could not connect to host bddemir.com: could not connect to host bde-epitech.fr: could not connect to host +bdsmxxxpics.com: did not receive HSTS header be-real.life: did not receive HSTS header beach-inspector.com: did not receive HSTS header beachi.es: could not connect to host @@ -1499,7 +1526,6 @@ bedabox.com: max-age too low: 0 bedeta.de: could not connect to host bedreid.dk: did not receive HSTS header bedrijvenadministratie.nl: could not connect to host -beepan.com: did not receive HSTS header beerboutique.com.br: could not connect to host beetleroadstories.com: could not connect to host befundup.com: could not connect to host @@ -1540,7 +1566,6 @@ besola.de: did not receive HSTS header bestbeards.ca: could not connect to host bestcellular.com: did not receive HSTS header besthost.cz: did not receive HSTS header -bestmodels.su: did not receive HSTS header bestof1001.de: did not receive HSTS header bestorangeseo.com: could not connect to host betaclean.fr: did not receive HSTS header @@ -1683,6 +1708,7 @@ bodo-wolff.de: could not connect to host bodyblog.nl: did not receive HSTS header bodybuilding-legends.com: could not connect to host bodyweightsolution.com: could not connect to host +boel073.nl: did not receive HSTS header boensou.com: did not receive HSTS header bogosity.se: could not connect to host bohan.life: could not connect to host @@ -1760,6 +1786,7 @@ bsociabl.com: could not connect to host btc-e.com: did not receive HSTS header btcdlc.com: could not connect to host btio.pw: did not receive HSTS header +btxiaobai.com: did not receive HSTS header buben.tech: did not receive HSTS header bubulazi.com: did not receive HSTS header bubulazy.com: did not receive HSTS header @@ -1914,7 +1941,7 @@ cardurl.com: did not receive HSTS header careerstuds.com: could not connect to host cargobay.net: could not connect to host caringladies.org: could not connect to host -carlo.mx: did not receive HSTS header +carlo.mx: could not connect to host carlolly.co.uk: could not connect to host carlosalves.info: could not connect to host carpliyz.com: could not connect to host @@ -1961,7 +1988,7 @@ centralpoint.be: did not receive HSTS header centralpoint.nl: did not receive HSTS header centralvacsunlimited.net: could not connect to host centrepoint-community.com: could not connect to host -centsforchange.net: did not receive HSTS header +centsforchange.net: could not connect to host ceresia.ch: could not connect to host ceritamalam.net: could not connect to host cerize.love: could not connect to host @@ -2034,6 +2061,7 @@ chris-web.info: could not connect to host chrisandsarahinasia.com: did not receive HSTS header chrisbrakebill.com: could not connect to host chrisbrown.id.au: could not connect to host +chrisburnell.com: did not receive HSTS header chrisfaber.com: could not connect to host chriskirchner.de: did not receive HSTS header chriskyrouac.com: could not connect to host @@ -2071,6 +2099,7 @@ citiagent.cz: could not connect to host cityoflaurel.org: did not receive HSTS header cium.ru: could not connect to host cjcaron.org: could not connect to host +cjtkfan.club: did not receive HSTS header claimit.ml: could not connect to host clan-ww.com: did not receive HSTS header clara-baumert.de: could not connect to host @@ -2100,6 +2129,7 @@ clintonbloodworth.com: could not connect to host clintonbloodworth.io: could not connect to host clintwilson.technology: max-age too low: 2592000 clipped4u.com: could not connect to host +closient.com: did not receive HSTS header cloud-project.com: could not connect to host cloud.wtf: could not connect to host cloudapi.vc: could not connect to host @@ -2164,7 +2194,7 @@ codigosddd.com.br: did not receive HSTS header coffeeetc.co.uk: max-age too low: 7889238 coffeestrategies.com: max-age too low: 5184000 cogniflex.com: did not receive HSTS header -cohesive.io: could not connect to host +cohesive.io: did not receive HSTS header coinbit.trade: did not receive HSTS header coindam.com: could not connect to host coldlostsick.net: could not connect to host @@ -2463,8 +2493,7 @@ davidglidden.eu: did not receive HSTS header davidhunter.scot: did not receive HSTS header davidnoren.com: did not receive HSTS header davidreinhardt.de: could not connect to host -davidscherzer.at: could not connect to host -daylightcompany.com: did not receive HSTS header +daylightcompany.com: could not connect to host daytonaseaside.com: did not receive HSTS header db.gy: could not connect to host dbx.ovh: could not connect to host @@ -2570,7 +2599,6 @@ diannaobos.com: did not receive HSTS header dicando.com: max-age too low: 2592000 dicelab.co.uk: could not connect to host dicionariofinanceiro.com: did not receive HSTS header -dicoding.com: did not receive HSTS header dieb.photo: could not connect to host dierenkruiden.nl: could not connect to host diewebstube.de: could not connect to host @@ -2978,7 +3006,7 @@ erichalv.com: did not receive HSTS header ericyl.com: could not connect to host eridanus.uk: could not connect to host eriel.com.br: could not connect to host -erikwalther.eu: did not receive HSTS header +erikwalther.eu: could not connect to host ernaehrungsberatung-zurich.ch: could not connect to host ernesto.at: could not connect to host eromixx.com: did not receive HSTS header @@ -2990,6 +3018,7 @@ ersindemirtas.com: did not receive HSTS header eru.me: did not receive HSTS header erwinvanlonden.net: did not receive HSTS header escalate.eu: could not connect to host +escolaengenharia.com.br: did not receive HSTS header escotour.com: could not connect to host esec.rs: did not receive HSTS header esko.bar: could not connect to host @@ -3013,6 +3042,7 @@ et180.com: could not connect to host etangs-magazine.com: could not connect to host etaoinwu.tk: could not connect to host etdonline.co.uk: could not connect to host +eternalabyss.int.eu.org: did not receive HSTS header eternitylove.us: could not connect to host eth9.net: could not connect to host etheria-software.tk: did not receive HSTS header @@ -3065,7 +3095,6 @@ exno.co: could not connect to host exousiakaidunamis.xyz: could not connect to host expertmile.com: did not receive HSTS header expo-designers.com: did not receive HSTS header -expoundite.net: could not connect to host express-vpn.com: did not receive HSTS header expressfinance.co.za: did not receive HSTS header expressvpn.com: did not receive HSTS header @@ -3153,6 +3182,7 @@ felisslovakia.sk: [Exception... "Component returned failure code: 0x80004005 (NS feliwyn.fr: did not receive HSTS header felixrr.pro: could not connect to host femaledom.xyz: could not connect to host +femdombbw.com: did not receive HSTS header feminists.co: could not connect to host fenno.net: could not connect to host fensdorf.de: did not receive HSTS header @@ -3308,7 +3338,6 @@ frasesytarjetas.com: did not receive HSTS header frasys.io: did not receive HSTS header frau-inge.de: could not connect to host fraudempire.com: could not connect to host -frederik-braun.com: did not receive HSTS header freeflow.tv: could not connect to host freelanced.co.za: could not connect to host freelo.cz: did not receive HSTS header @@ -3351,6 +3380,7 @@ fullytrained.co.uk: did not receive HSTS header fumiware.com: could not connect to host fundacionhijosdelsol.org: could not connect to host funkyweddingideas.com.au: could not connect to host +funny-joke-pictures.com: did not receive HSTS header funnyang.com: could not connect to host funrun.com: did not receive HSTS header fuorifuocogenova.it: could not connect to host @@ -3431,12 +3461,13 @@ garfieldairlines.net: did not receive HSTS header gatapro.net: could not connect to host gatorsa.es: did not receive HSTS header gaussorgues.me: could not connect to host +gay-sissies.com: did not receive HSTS header +gaysfisting.com: did not receive HSTS header +gayxsite.com: did not receive HSTS header gdegem.org: did not receive HSTS header gebn.co.uk: did not receive HSTS header gebn.uk: could not connect to host gedankenbude.info: could not connect to host -geek.com.tw: did not receive HSTS header -geek.tw: did not receive HSTS header geekcast.co.uk: did not receive HSTS header geekmind.org: max-age too low: 172800 geeks.lgbt: could not connect to host @@ -3465,7 +3496,6 @@ geri.be: did not receive HSTS header gesiwista.net: could not connect to host gesunde-smoothies.de: did not receive HSTS header get-cctv.com: could not connect to host -get-refer.com: did not receive HSTS header get.zenpayroll.com: did not receive HSTS header getable.com: did not receive HSTS header getblys.com.au: did not receive HSTS header @@ -3527,6 +3557,7 @@ gistfy.com: could not connect to host git-stuff.tk: could not connect to host github.party: did not receive HSTS header givemyanswer.com: could not connect to host +gizmo.ovh: did not receive HSTS header gizzo.sk: could not connect to host glass.google.com: did not receive HSTS header (error ignored - included regardless) glasslikes.com: did not receive HSTS header @@ -3737,7 +3768,7 @@ hackerpoints.com: did not receive HSTS header hackerspace-ntnu.no: did not receive HSTS header hackest.org: did not receive HSTS header hackit.im: could not connect to host -hackroyale.xyz: could not connect to host +hackroyale.xyz: did not receive HSTS header hacksnack.io: could not connect to host hadaf.pro: could not connect to host hadzic.co: could not connect to host @@ -3884,7 +3915,6 @@ hintergedanken.com: did not receive HSTS header hipercultura.com: did not receive HSTS header hiphopconvention.nl: could not connect to host hipnos.net: did not receive HSTS header -hiqhub.co.uk: could not connect to host hirefitness.co.uk: did not receive HSTS header hirevets.gov: could not connect to host hirokilog.com: could not connect to host @@ -3905,6 +3935,7 @@ hoerbuecher-und-hoerspiele.de: could not connect to host hofiprojekt.cz: did not receive HSTS header hogar123.es: could not connect to host hoiku-map.tokyo: could not connect to host +hoiku-navi.com: did not receive HSTS header holgerlehner.com: could not connect to host holifestival-freyung.de: could not connect to host holymoly.lu: could not connect to host @@ -3923,6 +3954,7 @@ honoo.com: could not connect to host hookandloom.com: did not receive HSTS header hoopsacademyusa.com: could not connect to host hoovism.com: did not receive HSTS header +horning.co: did not receive HSTS header horosho.in: could not connect to host horseboners.xxx: did not receive HSTS header hortifarm.ro: did not receive HSTS header @@ -4154,7 +4186,7 @@ inspiroinc.com: could not connect to host instacart.com: did not receive HSTS header instant-hack.com: did not receive HSTS header instantdev.io: could not connect to host -instantkhabar.com: did not receive HSTS header +instantsubs.de: did not receive HSTS header instinctiveads.com: did not receive HSTS header institutoflordelavida.com: could not connect to host instruktor.io: could not connect to host @@ -4289,6 +4321,7 @@ jackfahnestock.com: could not connect to host jacobparry.ca: did not receive HSTS header jagido.de: did not receive HSTS header jahliveradio.com: could not connect to host +jakecurtis.de: did not receive HSTS header jamanji.com.ng: could not connect to host james-parker.com: did not receive HSTS header james.je: could not connect to host @@ -4366,7 +4399,6 @@ jetlagphotography.com: could not connect to host jetsetcharge.com: could not connect to host jetsetpay.com: could not connect to host jettshome.org: could not connect to host -jeugdkans.nl: did not receive HSTS header jewellerydesignstore.com: could not connect to host jfmel.com: did not receive HSTS header jfx.space: did not receive HSTS header @@ -4385,7 +4417,7 @@ jimmehcai.com: could not connect to host jimmycai.org: could not connect to host jingyuesi.com: could not connect to host jinmaguoji.com: could not connect to host -jinshavip.com: did not receive HSTS header +jinshavip.com: could not connect to host jirav.io: could not connect to host jitsi.org: did not receive HSTS header jiyue.com: did not receive HSTS header @@ -4434,11 +4466,12 @@ joshstroup.me: could not connect to host jotpics.com: could not connect to host jottit.com: could not connect to host joyjohnston.ca: did not receive HSTS header -joyofcookingandbaking.com: did not receive HSTS header joyqi.com: did not receive HSTS header jpaglier.com: could not connect to host jpbike.cz: could not connect to host jpeaches.xyz: could not connect to host +jpgangbang.com: did not receive HSTS header +jphandjob.com: did not receive HSTS header jplesbian.com: did not receive HSTS header jptun.com: could not connect to host jrgold.me: could not connect to host @@ -4639,7 +4672,6 @@ kolozsvaricsuhe.hu: did not receive HSTS header komikito.com: could not connect to host kompetenzwerft.de: did not receive HSTS header konata.us: could not connect to host -konkurs.ba: did not receive HSTS header kontaxis.network: could not connect to host koopjesnel.nl: could not connect to host koordinate.net: could not connect to host @@ -4679,6 +4711,7 @@ krypteia.org: could not connect to host kryptomech.com: could not connect to host ksfh-mail.de: could not connect to host kstan.me: could not connect to host +ksukelife.com: did not receive HSTS header kswriter.com: could not connect to host kuba.guide: could not connect to host kucom.it: could not connect to host @@ -4751,6 +4784,7 @@ langhun.me: did not receive HSTS header laniakean.com: did not receive HSTS header lanzainc.xyz: did not receive HSTS header laobox.fr: could not connect to host +laospage.com: did not receive HSTS header laplaceduvillage.net: could not connect to host laplanetebleue.com: did not receive HSTS header laquack.com: could not connect to host @@ -4764,7 +4798,6 @@ latemodern.com: could not connect to host latinred.com: could not connect to host latus.xyz: could not connect to host launchkey.com: did not receive HSTS header -laurakashiwase.com: could not connect to host laurel4th.org: did not receive HSTS header laureltv.org: did not receive HSTS header lausitzer-widerstand.de: did not receive HSTS header @@ -4815,6 +4848,8 @@ lerasenglish.com: max-age too low: 0 lerner.moscow: did not receive HSTS header les-corsaires.net: could not connect to host les-voitures-electriques.com: did not receive HSTS header +lesbiansslaves.com: did not receive HSTS header +lesbofight.com: did not receive HSTS header lesecuadors.com: did not receive HSTS header lesliekearney.com: did not receive HSTS header lesperlesdunet.fr: could not connect to host @@ -4838,7 +4873,6 @@ lgts.se: could not connect to host liaillustr.at: did not receive HSTS header liam-w.com: did not receive HSTS header liamjack.fr: could not connect to host -liangji.com.tw: did not receive HSTS header lianye.in: did not receive HSTS header lianyexiuchang.in: could not connect to host liaoshuma.com: could not connect to host @@ -5073,6 +5107,7 @@ makeshiftco.de: did not receive HSTS header maldiverna.guide: could not connect to host malena.com.ua: did not receive HSTS header malerversand.de: did not receive HSTS header +malesbdsm.com: did not receive HSTS header malfait.nl: could not connect to host maljaars-media.nl: could not connect to host malmstroms-co.se: could not connect to host @@ -5170,7 +5205,7 @@ matchneedle.com: could not connect to host maternalsafety.org: did not receive HSTS header mateusmeyer.com.br: did not receive HSTS header mathers.ovh: did not receive HSTS header -matillat.ovh: did not receive HSTS header +matillat.ovh: could not connect to host matlabjo.ir: did not receive HSTS header matomeplus.co: could not connect to host matrict.com: could not connect to host @@ -5186,6 +5221,7 @@ matthewprenger.com: could not connect to host matthiassteen.be: max-age too low: 0 mattressinsider.com: max-age too low: 3153600 mattsvensson.com: max-age too low: 0 +mattwservices.co.uk: did not receive HSTS header matty.digital: did not receive HSTS header maultrom.ml: could not connect to host maupiknik.com: did not receive HSTS header @@ -5200,7 +5236,6 @@ maxserver.com: did not receive HSTS header maya.mg: could not connect to host mazyun.com: max-age too low: 3600 mazz-tech.com: could not connect to host -mazzotta.me: did not receive HSTS header mbconsultancy.nu: did not receive HSTS header mc81.com: could not connect to host mca2017.org: did not receive HSTS header @@ -5286,6 +5321,7 @@ metricaid.com: did not receive HSTS header metzgerei-birkenhof.de: could not connect to host meucosmetico.com.br: could not connect to host meuemail.pro: could not connect to host +mevo.xyz: did not receive HSTS header mexbt.com: could not connect to host mexicanbusinessweb.mx: did not receive HSTS header mexicansbook.ru: could not connect to host @@ -5582,7 +5618,6 @@ myiocc.org: could not connect to host myip.tech: max-age too low: 2592000 mykolab.com: did not receive HSTS header mykreuzfahrt.de: could not connect to host -mylighthost.com: did not receive HSTS header mymp3singer.site: did not receive HSTS header mynetblog.com: did not receive HSTS header myni.io: could not connect to host @@ -5676,7 +5711,6 @@ neko-life.com: did not receive HSTS header neko-system.com: did not receive HSTS header nemno.de: could not connect to host nemovement.org: could not connect to host -neo19.com: did not receive HSTS header neoani.me: could not connect to host neofelhz.space: could not connect to host neonisi.com: could not connect to host @@ -5861,6 +5895,7 @@ nwork.media: could not connect to host nyazeeland.guide: could not connect to host nycroth.com: could not connect to host nyesider.org: could not connect to host +nylonfeetporn.com: did not receive HSTS header nyored.com: did not receive HSTS header nyphox.net: could not connect to host nysepho.pw: could not connect to host @@ -5872,6 +5907,7 @@ nzquakes.maori.nz: could not connect to host o-rickroll-y.pw: could not connect to host o0o.one: could not connect to host oasis.mobi: could not connect to host +oben.pl: did not receive HSTS header oblast45.ru: did not receive HSTS header obscuredfiles.com: could not connect to host obsydian.org: could not connect to host @@ -5886,7 +5922,7 @@ odysseyandco.com: could not connect to host oe8.bet: could not connect to host ofcourselanguages.com: could not connect to host offenedialoge.de: max-age too low: 2592000 -officeclub.com.mx: did not receive HSTS header +officeclub.com.mx: could not connect to host offshore-firma.org: could not connect to host offshore-unternehmen.com: could not connect to host offshorefirma-gruenden.com: could not connect to host @@ -5903,7 +5939,6 @@ oiepoie.nl: could not connect to host oishioffice.com: did not receive HSTS header ojls.co: could not connect to host okane.love: could not connect to host -oke.com.tw: did not receive HSTS header okok-rent.com: could not connect to host okok.rent: could not connect to host okutama.in.th: could not connect to host @@ -6146,7 +6181,6 @@ payments-reference.org: could not connect to host payments.google.com: did not receive HSTS header (error ignored - included regardless) payroll.ch: could not connect to host paytwopay.com: could not connect to host -pback.se: did not receive HSTS header pbapp.net: did not receive HSTS header pbbr.com: did not receive HSTS header pbprint.ru: did not receive HSTS header @@ -6496,7 +6530,7 @@ pwd.ovh: could not connect to host pwm.jp: could not connect to host pwnsdx.pw: could not connect to host pyol.org: could not connect to host -pypi-mirrors.org: could not connect to host +pypi-mirrors.org: did not receive HSTS header pypi-status.org: could not connect to host pyplo.org: did not receive HSTS header pypt.lt: did not receive HSTS header @@ -6962,7 +6996,7 @@ scribbleserver.com: could not connect to host scribe.systems: could not connect to host scrion.com: could not connect to host script.google.com: did not receive HSTS header (error ignored - included regardless) -scriptenforcer.net: could not connect to host +scriptenforcer.net: did not receive HSTS header scriptict.nl: could not connect to host scrollstory.com: did not receive HSTS header sdhmanagementgroup.com: could not connect to host @@ -7044,7 +7078,7 @@ sendc.at: could not connect to host sendcat.com: could not connect to host sendmeback.de: did not receive HSTS header senedirect.com: could not connect to host -sens2lavie.com: did not receive HSTS header +sens2lavie.com: could not connect to host senseofnumber.co.uk: did not receive HSTS header sensiblemn.org: could not connect to host sensibus.com: did not receive HSTS header @@ -7150,6 +7184,7 @@ sianimacion.com: could not connect to host sichere-kartenakzeptanz.de: could not connect to host siciliadigitale.pro: could not connect to host siddhant.me: max-age too low: 0 +sidpod.ru: did not receive HSTS header siebens.net: could not connect to host sifls.com: could not connect to host sifreuret.com: could not connect to host @@ -7200,7 +7235,6 @@ sitesforward.com: did not receive HSTS header sitesten.com: did not receive HSTS header sixtwentyten.com: did not receive HSTS header sizingservers.be: did not receive HSTS header -skei.org: did not receive HSTS header ski-insurance.com.au: did not receive HSTS header skidstresser.com: did not receive HSTS header skillproxy.com: could not connect to host @@ -7312,6 +7346,7 @@ something-else.cf: could not connect to host somethingnew.xyz: could not connect to host sonic.network: did not receive HSTS header sonicrainboom.rocks: did not receive HSTS header +sonyforum.no: did not receive HSTS header soobi.org: did not receive HSTS header soply.com: did not receive HSTS header soporte.cc: could not connect to host @@ -7327,7 +7362,6 @@ soundtalks.com: max-age too low: 0 sourcelair.com: did not receive HSTS header southcoastswords.com: did not receive HSTS header southernjamusa.com: did not receive HSTS header -southernutahinfluencers.com: did not receive HSTS header southgale.condos: could not connect to host southside-crew.club: could not connect to host southworcestershiregpservices.co.uk: could not connect to host @@ -7374,7 +7408,7 @@ spittersberger.recipes: did not receive HSTS header spokonline.com: could not connect to host sponsortobias.com: could not connect to host sportchirp-internal.azurewebsites.net: did not receive HSTS header -sporthit.ru: could not connect to host +sporthit.ru: did not receive HSTS header sportifik.com: did not receive HSTS header sportingoods.com.br: could not connect to host sportscollection.com.br: did not receive HSTS header @@ -7391,6 +7425,7 @@ sprutech.de: did not receive HSTS header spyroszarzonis.com: did not receive HSTS header square.gs: could not connect to host squatldf.org: did not receive HSTS header +squirtlesbians.net: did not receive HSTS header srcc.fr: could not connect to host srevilak.net: did not receive HSTS header srmaximo.com: could not connect to host @@ -7504,7 +7539,7 @@ studydrive.net: did not receive HSTS header studyhub.cf: did not receive HSTS header stugb.de: did not receive HSTS header sturbock.me: did not receive HSTS header -sturdio.com.br: did not receive HSTS header +sturdio.com.br: could not connect to host stylenda.com: could not connect to host stytt.com: could not connect to host subbing.work: could not connect to host @@ -7525,7 +7560,6 @@ sumoatm.com: did not receive HSTS header sumoscout.de: could not connect to host suncountrymarine.com: did not receive HSTS header sundanceusa.com: did not receive HSTS header -sunflyer.cn: did not receive HSTS header sunlandsg.vn: did not receive HSTS header sunnyfruit.ru: could not connect to host sunshinepress.org: could not connect to host @@ -7571,7 +7605,6 @@ sweetair.com: did not receive HSTS header sweetstreats.ca: could not connect to host swfloshatraining.com: did not receive HSTS header swimming.ca: did not receive HSTS header -swiss-connection.net: did not receive HSTS header swisstranslate.ch: did not receive HSTS header swisstranslate.fr: did not receive HSTS header swite.com: did not receive HSTS header @@ -7658,7 +7691,6 @@ tauchkater.de: could not connect to host tavoittaja.fi: did not receive HSTS header tavopica.lt: did not receive HSTS header taxbench.com: could not connect to host -taxi-24std.de: did not receive HSTS header taxiindenbosch.nl: did not receive HSTS header taxsnaps.co.nz: did not receive HSTS header tazz.in: could not connect to host @@ -7746,7 +7778,6 @@ teru.com.br: could not connect to host testandroid.xyz: could not connect to host tetramax.eu: did not receive HSTS header teufelsystem.de: could not connect to host -teulon.eu: could not connect to host texte-zur-taufe.de: did not receive HSTS header textoplano.xyz: could not connect to host textracer.dk: could not connect to host @@ -7755,6 +7786,7 @@ tfcoms-sp-tracker-client.azurewebsites.net: could not connect to host tffans.com: could not connect to host tfl.lu: did not receive HSTS header tgr.re: could not connect to host +th-bl.de: did not receive HSTS header thaihostcool.com: did not receive HSTS header thailandpropertylisting.com: did not receive HSTS header thailandpropertylistings.com: did not receive HSTS header @@ -8036,6 +8068,7 @@ transformify.org: did not receive HSTS header transl8.eu: did not receive HSTS header translate.googleapis.com: did not receive HSTS header (error ignored - included regardless) transportal.sk: did not receive HSTS header +transsexualpantyhose.com: did not receive HSTS header travality.ru: could not connect to host travel-kuban.ru: did not receive HSTS header travelinsightswriter.com: could not connect to host @@ -8067,6 +8100,7 @@ trybind.com: could not connect to host tryoneday.co: did not receive HSTS header ts2.se: could not connect to host ts3.consulting: could not connect to host +tsdom.net: did not receive HSTS header tsecy.com: could not connect to host tsgoc.com: did not receive HSTS header tsrstore.gq: could not connect to host @@ -8088,6 +8122,7 @@ turnik-67.ru: could not connect to host turniker.ru: could not connect to host turnsticks.com: could not connect to host turtlementors.com: could not connect to host +tusb.ml: did not receive HSTS header tussengelegenwoningverkopen.nl: could not connect to host tuturulianda.com: did not receive HSTS header tuvalie.com: could not connect to host @@ -8237,7 +8272,6 @@ urandom.eu.org: did not receive HSTS header urban-garden.lt: could not connect to host urban-garden.lv: could not connect to host urbanfi.sh: did not receive HSTS header -urbanstylestaging.com: did not receive HSTS header urbpic.com: could not connect to host urlchomp.com: did not receive HSTS header urphp.com: could not connect to host @@ -8303,6 +8337,7 @@ vanacht.co.za: did not receive HSTS header vanajahosting.com: did not receive HSTS header vande-walle.eu: did not receive HSTS header vanderkley.it: could not connect to host +vanessabalibridal.com: did not receive HSTS header vanestack.com: could not connect to host vanetv.com: could not connect to host vanitas.xyz: could not connect to host @@ -8339,6 +8374,7 @@ verifikatorindonesia.com: could not connect to host veristor.com: did not receive HSTS header vermontcareergateway.org: could not connect to host veryhax.de: could not connect to host +veryyounglesbians.com: did not receive HSTS header vestacp.top: could not connect to host vetdnacenter.com: did not receive HSTS header veterinaire-cazeres-foucault.fr: could not connect to host @@ -8599,6 +8635,7 @@ wienholding.at: max-age too low: 0 wieninternational.at: did not receive HSTS header wificafehosting.com: did not receive HSTS header wifimapa.cz: could not connect to host +wiiforum.no: did not receive HSTS header wiire.me: could not connect to host wikiclash.info: could not connect to host wikipeter.nl: did not receive HSTS header @@ -8741,10 +8778,12 @@ wygluszanie.eu: did not receive HSTS header wyzphoto.nl: did not receive HSTS header x-power-detox.com: could not connect to host x-ripped-hd.com: could not connect to host +x23.eu: did not receive HSTS header x2w.io: could not connect to host x3led.com: could not connect to host x509.pub: could not connect to host x509.pw: could not connect to host +x69x.net: did not receive HSTS header xandocs.com: could not connect to host xat.re: could not connect to host xavierbarroso.com: could not connect to host @@ -8836,6 +8875,8 @@ xunn.io: did not receive HSTS header xuwei.de: did not receive HSTS header xuyh0120.win: did not receive HSTS header xxbase.com: could not connect to host +xxx3dbdsm.com: did not receive HSTS header +xxxladyboysporn.com: did not receive HSTS header xynex.us: could not connect to host y-o-w.com: did not receive HSTS header y-s.pw: could not connect to host @@ -8851,7 +8892,6 @@ yardbird.us: could not connect to host yarnhookup.com: did not receive HSTS header yasinaydin.net: could not connect to host yasutomonodokoiko.com: did not receive HSTS header -yatesun.com: did not receive HSTS header ycc.wtf: could not connect to host ycm2.wtf: could not connect to host ydy.jp: could not connect to host @@ -8862,8 +8902,6 @@ yenniferallulli.es: did not receive HSTS header yenniferallulli.moda: could not connect to host yenniferallulli.nl: could not connect to host yesdevnull.net: did not receive HSTS header -yesonline.asia: did not receive HSTS header -yesonline.me: did not receive HSTS header yestees.com: did not receive HSTS header yetcore.io: could not connect to host yhrd.org: did not receive HSTS header @@ -8919,7 +8957,6 @@ yutabon.com: could not connect to host yuushou.com: could not connect to host yux.io: did not receive HSTS header ywei.org: could not connect to host -ywyz.tech: did not receive HSTS header yzal.io: could not connect to host z3liff.com: could not connect to host z3liff.net: could not connect to host @@ -8933,6 +8970,7 @@ zao.fi: could not connect to host zaoshanghao-dajia.rhcloud.com: could not connect to host zap.yt: did not receive HSTS header zarooba.com: could not connect to host +zary.me: did not receive HSTS header zavca.com: did not receive HSTS header zbigniewgalucki.eu: did not receive HSTS header zcon.nl: could not connect to host diff --git a/security/manager/ssl/nsSTSPreloadList.inc b/security/manager/ssl/nsSTSPreloadList.inc index 82605ee6c723..4896df2a91c1 100644 --- a/security/manager/ssl/nsSTSPreloadList.inc +++ b/security/manager/ssl/nsSTSPreloadList.inc @@ -8,7 +8,7 @@ /*****************************************************************************/ #include -const PRTime gPreloadListExpirationTime = INT64_C(1520102102086000); +const PRTime gPreloadListExpirationTime = INT64_C(1520188250195000); %% 0.me.uk, 1 00001.am, 1 @@ -138,7 +138,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1520102102086000); 1750studios.com, 0 17hats.com, 1 1844329061.rsc.cdn77.org, 1 -188522.com, 0 18888msc.com, 1 1888zr.com, 1 188dv.com, 1 @@ -447,7 +446,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1520102102086000); 99599.net, 1 99buffets.com, 1 99rst.org, 1 -9iwan.net, 1 9jadirect.com, 1 9ss6.com, 1 9uelle.jp, 1 @@ -617,6 +615,7 @@ achenar.net, 1 achow101.com, 1 achromatisch.de, 1 achterhoekseveiligheidsbeurs.nl, 1 +achterstieg.dedyn.io, 1 achtzehn.eu, 1 achtzehnterachter.de, 1 acidbin.co, 1 @@ -762,7 +761,6 @@ adrenaline-gaming.ru, 1 adrianajewelry.my, 1 adrianbechtold.de, 1 adriancitu.com, 1 -adriancohea.ninja, 1 adriancostin.ro, 1 adrianmejias.com, 1 adrienkohlbecker.com, 1 @@ -1196,7 +1194,6 @@ allinagency.com, 1 allinone-ranking150.com, 1 allinonecyprus.com, 1 allis.studio, 1 -allladyboys.com, 1 allmebel.ru, 1 allmend-ru.de, 1 allns.fr, 1 @@ -1377,8 +1374,6 @@ anaiscoachpersonal.es, 1 anaisypirueta.es, 1 anakros.me, 0 analgesia.net, 1 -analpantyhose.org, 1 -analteengirls.net, 1 analyticsinmotion.com, 1 analyticum.at, 1 analyticum.com, 1 @@ -2161,7 +2156,6 @@ audialbuquerqueparts.com, 1 audiblox.co.za, 1 audiense.com, 1 audio-detector.com, 1 -audiolibri.org, 1 audiophile.ch, 1 audiorental.net, 1 audisto.com, 1 @@ -2471,7 +2465,6 @@ baliyano.com, 1 balkonien.org, 1 ball.holdings, 1 ballarin.cc, 1 -ballbusting-cbt.com, 1 ballejaune.com, 1 ballmerpeak.org, 1 ballonsportclub-erlangen.de, 1 @@ -2645,12 +2638,10 @@ bblove.me, 1 bblsa.ch, 1 bbnx.net, 1 bbuio.com, 1 -bbw-wrestling.com, 1 bbw.dating, 1 bbwcs.co.uk, 1 bbwf.de, 1 bbwfacesitting.us, 1 -bbwteens.org, 1 bc-bd.org, 1 bc-diffusion.com, 1 bcbulle.ch, 1 @@ -2670,7 +2661,6 @@ bda-boulevarddesairs.com, 1 bdd.fi, 1 bdenzer.xyz, 1 bdikaros-network.net, 1 -bdsmxxxpics.com, 1 bdvg.org, 1 be-ka-tec.de, 1 be-webdesign.com, 1 @@ -2914,6 +2904,7 @@ besthotsales.com, 1 bestlashesandbrows.com, 1 bestlashesandbrows.hu, 1 bestleftwild.com, 1 +bestmodels.su, 1 bestmotherfucking.website, 1 bestperfumebrands.com, 1 bestschools.top, 1 @@ -3489,7 +3480,6 @@ bodymusclejournal.com, 1 bodyworkbymichael.com, 1 boeddhashop.nl, 1 boekenlegger.nl, 1 -boel073.nl, 1 boernecancerfonden.dk, 1 bogdanepureanu.ro, 1 bogner.sh, 1 @@ -3897,7 +3887,6 @@ btserv.de, 1 btsoft.eu, 1 btsow.com, 1 btth.pl, 1 -btxiaobai.com, 1 bubba.cc, 1 bubblegumblog.com, 1 bubblespetspa.com, 1 @@ -4878,7 +4867,6 @@ chowii.com, 1 chris-edwards.net, 1 chrisb.me, 1 chrisb.xyz, 1 -chrisburnell.com, 1 chriscarey.com, 1 chriscowley.me.uk, 1 chrisdecairos.ca, 1 @@ -5060,7 +5048,6 @@ cjdpenterprises.com.au, 1 cjessett.com, 1 cjey.me, 1 cjr.host, 1 -cjtkfan.club, 1 ck.cx, 1 ckennelly.com, 1 ckleemann.de, 1 @@ -5151,7 +5138,6 @@ closeli.com, 0 closelinksecurity.co.uk, 1 closelinksecurity.com, 1 closetemail.com, 1 -closient.com, 1 closingholding.com, 1 cloud-crowd.com.au, 1 cloud-surfer.net, 1 @@ -6470,6 +6456,7 @@ davidnadaski.com, 1 davidpearce.com, 1 davidpearce.org, 1 davidschadlich.com, 1 +davidscherzer.at, 1 davidschlachter.com, 1 davidstuff.net, 1 davie3.com, 1 @@ -6959,6 +6946,7 @@ dicionarioetimologico.com.br, 1 dicionariopopular.com, 1 dick.red, 1 dickieslife.com, 1 +dicoding.com, 1 didacte.com, 1 didche.net, 1 diddens.de, 1 @@ -6992,8 +6980,8 @@ dieti.net, 1 dietrich.cx, 1 dieumfrage.com, 1 diff2html.xyz, 1 -different.cz, 1 -differenta.ro, 1 +different.cz, 0 +differenta.ro, 0 diffnow.com, 1 difoosion.com, 1 digcit.org, 1 @@ -8421,7 +8409,7 @@ epistas.de, 1 epizentrum.work, 1 epizentrum.works, 1 epmcentroitalia.it, 1 -epoch.com, 1 +epoch.com, 0 epolitiker.com, 1 epos-distributor.co.uk, 1 eposbirmingham.co.uk, 1 @@ -8549,7 +8537,6 @@ escapeplaza.de, 1 escargotbistro.com, 1 escavador.com, 1 esclear.de, 1 -escolaengenharia.com.br, 1 escontact.ch, 1 escortdisplay.com, 1 escortmantra.com, 1 @@ -8641,7 +8628,6 @@ eteapparel.com, 1 eteesheet.com, 1 etelej.com, 0 etenendrinken.nu, 1 -eternalabyss.int.eu.org, 1 eth-faucet.net, 1 eth0.nl, 1 etha.nz, 1 @@ -8876,6 +8862,7 @@ expo-europe.ru, 1 expokohler.com, 1 exponentialnews.net, 1 exporta.cz, 1 +expoundite.net, 1 expowerhps.com, 1 express-shina.ru, 1 expressemotion.net, 1 @@ -9216,7 +9203,6 @@ felixsanz.com, 1 felixseele.de, 1 felsing.net, 1 femanca.com, 1 -femdombbw.com, 1 feminina.pt, 1 femradio.es, 1 femtomind.com, 1 @@ -9629,7 +9615,7 @@ fol.tf, 1 foliekonsulenten.dk, 1 folioapp.io, 1 foljeton.dk, 1 -folkadelic.de, 0 +folkadelic.de, 1 folkfests.org, 1 follandviolins.com, 1 followback.net, 1 @@ -9841,6 +9827,7 @@ freaksites.dk, 1 frebi.org, 1 frebib.net, 1 freddythechick.uk, 1 +frederik-braun.com, 1 frederikschoell.de, 0 fredliang.cn, 1 fredloya.com, 1 @@ -10073,7 +10060,6 @@ funksteckdosen24.de, 0 funktionel.co, 1 funnelweb.xyz, 1 funniestclip.com, 1 -funny-joke-pictures.com, 1 funnybikini.com, 1 funoverip.net, 1 funspins.com, 1 @@ -10296,13 +10282,10 @@ gauthier.dk, 1 gautvedt.no, 1 gavick.com, 0 gavins.stream, 1 -gay-sissies.com, 1 gaycc.cc, 1 gayforgenji.com, 1 gaygeeks.de, 1 -gaysfisting.com, 1 gaytorrent.ru, 1 -gayxsite.com, 1 gazee.net, 1 gazellegames.net, 0 gazette.govt.nz, 1 @@ -10488,6 +10471,7 @@ get-asterisk.ru, 1 get-erp.ru, 1 get-link.info, 1 get-on.bid, 1 +get-refer.com, 1 get4x.com, 1 geta.pub, 1 getbox.me, 1 @@ -10656,7 +10640,6 @@ gixtools.co.uk, 1 gixtools.com, 1 gixtools.net, 1 gixtools.uk, 1 -gizmo.ovh, 1 gj-bochum.de, 1 gjcampbell.co.uk, 1 gjengset.com, 1 @@ -11810,6 +11793,7 @@ hips.com, 1 hipstercat.fr, 1 hiqfleet.co.uk, 1 hiqfranchise.co.uk, 1 +hiqhub.co.uk, 1 hiqonline.co.uk, 1 hirake55.com, 1 hiraku.me, 1 @@ -11889,7 +11873,6 @@ hoflerlawfirm.com, 1 hogl.dk, 1 hohm.in, 1 hohnet.com, 1 -hoiku-navi.com, 1 hoikuen-now.top, 1 hoken-wakaru.jp, 1 hokieprivacy.org, 1 @@ -11998,7 +11981,6 @@ horeizai.net, 1 horizonhomes-samui.com, 1 horizonshypnosis.ca, 1 horkel.cf, 1 -horning.co, 1 hornyforhanzo.com, 1 horodance.dk, 1 horrendous-servers.com, 1 @@ -12850,7 +12832,7 @@ instagramtweet.com, 1 installgentoo.net, 1 instant-hack.io, 1 instant.io, 1 -instantsubs.de, 1 +instantkhabar.com, 1 instasex.ch, 1 instava.cz, 1 instawi.com, 1 @@ -13374,7 +13356,6 @@ jakarta.dating, 1 jake.eu.org, 1 jake.ml, 1 jake.nom.za, 1 -jakecurtis.de, 1 jakeguild.com, 1 jakenbake.com, 1 jakereynolds.co, 1 @@ -13615,6 +13596,7 @@ jetsieswerda.nl, 1 jettlarue.com, 1 jetwhiz.com, 1 jetzt-elektromobil.de, 1 +jeugdkans.nl, 1 jeva.nl, 1 jevisite.ca, 1 jeweet.net, 1 @@ -13876,10 +13858,9 @@ joworld.net, 1 joyceclerkx.com, 1 joyful.house, 1 joyfulexpressions.gallery, 1 +joyofcookingandbaking.com, 1 jpdeharenne.be, 1 jpeg.io, 1 -jpgangbang.com, 1 -jphandjob.com, 1 jpmelos.com, 1 jpmelos.com.br, 1 jpod.cc, 1 @@ -14711,6 +14692,7 @@ konijntjes.nl, 1 konings.it, 1 koningskwartiertje.nl, 1 konklone.com, 1 +konkurs.ba, 1 konoe.studio, 1 konosuke.jp, 1 konsertoversikt.no, 1 @@ -14853,7 +14835,6 @@ ks-watch.de, 1 kschv-rdeck.de, 1 ksero.center, 1 kshlm.in, 1 -ksukelife.com, 1 kswcosmetics.com, 1 ktbnetbank.com, 1 kteen.info, 1 @@ -15104,7 +15085,6 @@ lanyang.tk, 1 lanzamientovirtual.es, 1 lanzarote-online.info, 1 laos.dating, 1 -laospage.com, 1 laozhu.me, 1 lapassiondutrading.com, 1 lapetition.be, 1 @@ -15185,6 +15165,7 @@ laughinggrapepublishing.com, 1 laukstein.com, 1 launchpad-app2.com, 1 lauraandwill.wedding, 1 +laurakashiwase.com, 1 laurasplacefamilysupport.org.au, 1 laurelblack.com, 1 laurelspaandlash.com, 1 @@ -15415,8 +15396,6 @@ les-ateliers-de-melineo.be, 1 les-pingouins.com, 1 lesancheslibres.fr, 1 lesberger.ch, 1 -lesbiansslaves.com, 1 -lesbofight.com, 1 lescomptoirsdepierrot.com, 1 lesdouceursdeliyana.com, 1 leseditionsbraquage.com, 1 @@ -16373,7 +16352,6 @@ malaysian.dating, 1 maldives.cx, 1 maleexcel.com, 1 malenyflorist.com.au, 1 -malesbdsm.com, 1 malgraph.net, 1 maliar.fr, 1 malibubeachrecoverycenter.com, 1 @@ -16736,7 +16714,6 @@ mattli.us, 1 mattmccutchen.net, 1 mattonline.me, 1 mattwb65.com, 1 -mattwservices.co.uk, 1 matviet.vn, 1 matze.co, 1 matze.org, 1 @@ -16797,6 +16774,7 @@ mazda626.net, 1 maze.fr, 1 mazternet.ru, 1 mazurlabs.tk, 1 +mazzotta.me, 1 mb-is.info, 1 mbaestlein.de, 1 mbardot.com, 1 @@ -17149,7 +17127,6 @@ meu-solutions.com, 1 meulike.us, 1 meupedido.online, 1 meusigno.com, 1 -mevo.xyz, 1 mevs.cz, 1 mexican.dating, 1 mexicom.org, 1 @@ -18151,6 +18128,7 @@ mylawyer.be, 1 myleanfactory.de, 1 mylene-chandelier.me, 1 mylifeabundant.com, 1 +mylighthost.com, 1 myliveupdates.com, 1 mylocalsearch.co.uk, 1 mylookout.com, 0 @@ -19246,7 +19224,6 @@ nyiad.edu, 1 nyip.co.uk, 1 nyip.edu, 1 nyloc.de, 1 -nylonfeetporn.com, 1 nymphetomania.net, 1 nynex.net, 1 nyphox.ovh, 1 @@ -19273,7 +19250,6 @@ oatberry.me, 0 oauth-dropins.appspot.com, 0 obamalibrary.gov, 1 obdolbacca.ru, 1 -oben.pl, 1 oberam.de, 1 oberhof.co, 1 oberhofdrinks.com, 1 @@ -19920,7 +19896,7 @@ paint-it.pink, 1 paio2-rec.com, 1 paio2.com, 1 paipuman.jp, 1 -paizinhovirgula.com, 0 +paizinhovirgula.com, 1 pajadam.me, 1 pajowu.de, 1 pajuvuo.fi, 1 @@ -20212,6 +20188,7 @@ paystack.com, 1 paytm.in, 1 payupay.ru, 1 payzang.com, 1 +pback.se, 1 pbcknd.ml, 1 pbosquet.com, 1 pbraunschdash.com, 1 @@ -23989,7 +23966,6 @@ sidium.de, 1 sidnicio.us, 1 sidonge.com, 1 sidongkim.com, 1 -sidpod.ru, 1 siebeve.be, 1 siegemund-frankfurt.de, 1 sieh.es, 1 @@ -24250,6 +24226,7 @@ skatn.de, 1 skazka.ru, 1 skday.com, 1 skeeley.com, 1 +skei.org, 1 skepticalsports.com, 1 sketchmyroom.com, 1 sketchywebsite.net, 1 @@ -24669,7 +24646,6 @@ sonic.sk, 0 sonja-daniels.com, 1 sonja-kowa.de, 1 sonoecoracao.com.br, 1 -sonyforum.no, 1 sonyunlock.nu, 1 soomee.be, 1 soomee1.be, 1 @@ -24736,6 +24712,7 @@ southamerican.dating, 1 southbankregister.com.au, 1 southcoastkitesurf.co.uk, 1 southernmost.us, 1 +southernutahinfluencers.com, 1 southlakenissanparts.com, 1 southmelbourne.apartments, 1 southmorangtownhouses.com.au, 1 @@ -24926,7 +24903,6 @@ squido.ch, 1 squidparty.com, 1 squids.space, 1 squirex2.com, 1 -squirtlesbians.net, 1 sqzryang.com, 1 sr-cs.net, 1 srandom.com, 1 @@ -25437,6 +25413,7 @@ sundaycooks.com, 1 sundayfundayjapan.com, 1 suneilpatel.com, 1 sunfireshop.com.br, 1 +sunflyer.cn, 0 sunfox.cz, 1 sunfulong.me, 1 sungo.wtf, 1 @@ -25486,7 +25463,7 @@ surao.cz, 1 surasak.io, 1 surasak.org, 1 surasak.xyz, 1 -surdam.casa, 1 +surdam.casa, 0 sure-it.de, 1 surgenet.nl, 1 surgeongeneral.gov, 1 @@ -25580,6 +25557,7 @@ swimturk.com.tr, 1 swineson.me, 1 swingmonkey.com, 1 swipetv.ie, 1 +swiss-connection.net, 1 swiss-cyber-experts.ch, 1 swisscannabis.club, 1 swissdojo.ch, 1 @@ -25834,6 +25812,7 @@ tattvaayoga.com, 1 tavolaquadrada.com.br, 1 tavsys.net, 1 taxaroo.com, 1 +taxi-24std.de, 1 taxi-chamonix.fr, 1 taxi-collectif.ch, 1 taxicollectif.ch, 1 @@ -26129,6 +26108,7 @@ tetrarch.co, 1 tetsai.com, 1 tetsugakunomichi.jp, 1 tetsumaki.net, 1 +teulon.eu, 1 teuniz.nl, 1 teunstuinposters.nl, 0 teva-li.com, 1 @@ -26171,7 +26151,6 @@ tgtv.tn, 1 tgui.eu, 1 tgui.net, 1 tgw.com, 1 -th-bl.de, 1 th.search.yahoo.com, 0 th3nd.com, 1 thackbarth.net, 1 @@ -27117,7 +27096,6 @@ transmithe.net, 1 transparentcorp.com, 1 transport.eu, 1 transporterlock.com, 1 -transsexualpantyhose.com, 1 transverify.com, 1 trashnothing.com, 1 trask.no, 1 @@ -27267,7 +27245,6 @@ ts-publishers.com, 1 tsa-sucks.com, 1 tsaro.io, 1 tschuermans.be, 1 -tsdom.net, 1 tsedryk.ca, 1 tsgbit.net, 1 tsicons.com, 1 @@ -27351,7 +27328,6 @@ tursiae.org, 1 turtle.ai, 1 turtleduckstudios.com, 1 turtlepwr.com, 1 -tusb.ml, 1 tutanota.com, 1 tutiendaroja.com, 1 tutiendarosa.com, 1 @@ -27742,6 +27718,7 @@ urbanietz-immobilien.de, 1 urbanmelbourne.info, 1 urbannewsservice.com, 1 urbansparrow.in, 1 +urbanstylestaging.com, 1 urbanwildlifealliance.org, 1 urbexdk.nl, 1 urcentral.com, 1 @@ -27911,7 +27888,6 @@ vandermeer.frl, 1 vanderrijt.nl, 1 vanderstraeten.dynv6.net, 1 vanderziel.org, 1 -vanessabalibridal.com, 1 vangeluwedeberlaere.be, 1 vanhoudt-usedcars.be, 1 vanhoutte.be, 0 @@ -28077,7 +28053,6 @@ verteilergetriebe.info, 1 vertner.net, 1 veryapt.com, 1 verymelon.de, 1 -veryyounglesbians.com, 1 verzick.com, 1 ves.vn.ua, 1 vescudero.net, 1 @@ -29001,7 +28976,6 @@ wifree.lv, 1 wigggle.it, 1 wigle.net, 1 wiiaam.com, 1 -wiiforum.no, 1 wiimotion.de, 1 wijnservices.nl, 0 wiki-play.ru, 1 @@ -29481,14 +29455,12 @@ x.st, 1 x0r.be, 1 x13.com, 1 x1616.tk, 1 -x23.eu, 1 x2c0.net, 1 x2d2.de, 1 x378.ch, 1 x509.io, 1 x64architecture.com, 1 x69.biz, 1 -x69x.net, 1 x7plus.com, 1 xa.search.yahoo.com, 0 xa1.uk, 1 @@ -29749,8 +29721,6 @@ xwaretech.info, 1 xx0r.eu, 1 xxffo.com, 1 xxiz.com, 1 -xxx3dbdsm.com, 1 -xxxladyboysporn.com, 1 xyfun.net, 1 xyndrac.net, 1 xyngular-health.com, 1 @@ -29796,6 +29766,7 @@ yarcom.ru, 0 yarogneva.ru, 1 yarravilletownhouses.com.au, 1 yaru.one, 1 +yatesun.com, 1 yatorie.net, 1 yatsuenpoon.com, 1 yaucy.win, 1 @@ -30064,6 +30035,7 @@ yveshield.com, 1 yveslegendre.fr, 1 yvesx.com, 1 yvonnehaeusser.de, 1 +ywyz.tech, 1 yyc.city, 1 yyyy.xyz, 1 z-konzept-nutrition.ru, 1 @@ -30111,7 +30083,6 @@ zappbuildapps.com, 1 zaratan.fr, 1 zarmarket.org, 1 zarpo.com.br, 1 -zary.me, 1 zaufanatrzeciastrona.pl, 1 zavec.com.ec, 1 zavetaji.lv, 1 From 8af3c26b616a9a70f636bf18610a2af0b22c55cf Mon Sep 17 00:00:00 2001 From: ffxbld Date: Sun, 29 Oct 2017 11:34:19 -0700 Subject: [PATCH 17/18] No bug, Automated HPKP preload list update from host bld-linux64-spot-033 - a=hpkp-update --- security/manager/ssl/StaticHPKPins.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/manager/ssl/StaticHPKPins.h b/security/manager/ssl/StaticHPKPins.h index 671be2c17a2a..a5ce4aeb50a0 100644 --- a/security/manager/ssl/StaticHPKPins.h +++ b/security/manager/ssl/StaticHPKPins.h @@ -1158,4 +1158,4 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = { static const int32_t kUnknownId = -1; -static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1517682914510000); +static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1517769063230000); From a6ee12714b4b2dee5b882647368d0cb806510624 Mon Sep 17 00:00:00 2001 From: Sebastian Hengst Date: Sun, 29 Oct 2017 22:56:44 +0100 Subject: [PATCH 18/18] Bug 1365425 - [bn-BD] Add search engine setup for Firefox Mobile for Bengali (Bengladesh): Replace 'ddg' with 'duckduckgo' to fix bn-BD Fennec L10n nightly. r=nightly-fix a=nightly-fix MozReview-Commit-ID: 8eJYHVajz3o --- mobile/locales/search/list.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/locales/search/list.json b/mobile/locales/search/list.json index b78ecf8b50a7..f4f4c18cbb4a 100644 --- a/mobile/locales/search/list.json +++ b/mobile/locales/search/list.json @@ -96,7 +96,7 @@ "bn-BD": { "default": { "visibleDefaultEngines": [ - "google", "yahoo", "bing", "ddg", "wikipedia-bn" + "google", "yahoo", "bing", "duckduckgo", "wikipedia-bn" ] } },