components/desktop/firefox/patches/firefox-32-solaris_jemalloc_linkage.patch
branchs11u3-sru
changeset 7364 1ac24a377555
parent 7035 4c2f26e9d5ab
--- a/components/desktop/firefox/patches/firefox-32-solaris_jemalloc_linkage.patch	Fri Nov 18 19:13:03 2016 -0800
+++ b/components/desktop/firefox/patches/firefox-32-solaris_jemalloc_linkage.patch	Mon Nov 14 04:25:50 2016 -0800
@@ -28,7 +28,7 @@
 diff --git a/storage/mozStorageService.cpp b/storage/mozStorageService.cpp
 --- a/storage/mozStorageService.cpp
 +++ b/storage/mozStorageService.cpp
-@@ -514,9 +514,14 @@
+@@ -528,9 +528,14 @@
    int rc;
  
  #ifdef MOZ_STORAGE_MEMORY
@@ -45,7 +45,7 @@
 +  free(test_jemalloc);
  #endif
  
-   // Explicitly initialize sqlite3.  Although this is implicitly called by
+   // TODO (bug 1191405): do not preallocate the connections caches until we
 diff --git a/memory/jemalloc/src/include/jemalloc/internal/jemalloc_internal.h.in b/memory/jemalloc/src/include/jemalloc/internal/jemalloc_internal.h.in
 --- a/memory/jemalloc/src/include/jemalloc/internal/jemalloc_internal.h.in
 +++ b/memory/jemalloc/src/include/jemalloc/internal/jemalloc_internal.h.in