- tor-commits - lists.torproject.org

[tor/maint-0.2.2] Fix a compilation issue on older FreeBSDs
by nickm＠torproject.org 09 Sep '11

09 Sep '11

commit 03760f6c6f0c580542c8bfc519062b65afdc8d5f Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Aug 30 20:45:49 2011 -0400 Fix a compilation issue on older FreeBSDs --- src/common/torgzip.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/common/torgzip.c b/src/common/torgzip.c index 2937c67..a26e5b2 100644 --- a/src/common/torgzip.c +++ b/src/common/torgzip.c @@ -14,11 +14,12 @@ #include <stdio.h> #include <assert.h> #include <string.h> +#include "torint.h" + #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif -#include "torint.h" #include "util.h" #include "torlog.h" #include "torgzip.h"

1 0

[tor/maint-0.2.2] Check for lround with autoconf; fall back to rint.
by nickm＠torproject.org 09 Sep '11

09 Sep '11

commit 0ac4b0f99d12a76f07f24d747a77f2bc07e481e3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 30 22:22:15 2011 -0400 Check for lround with autoconf; fall back to rint. --- configure.in | 2 +- src/common/util.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in index 4e84298..df1b709 100644 --- a/configure.in +++ b/configure.in @@ -223,7 +223,7 @@ dnl ------------------------------------------------------------------- dnl Check for functions before libevent, since libevent-1.2 apparently dnl exports strlcpy without defining it in a header. -AC_CHECK_FUNCS(gettimeofday ftime socketpair uname inet_aton strptime getrlimit strlcat strlcpy strtoull getaddrinfo localtime_r gmtime_r memmem strtok_r writev readv flock prctl vasprintf) +AC_CHECK_FUNCS(gettimeofday ftime socketpair uname inet_aton strptime getrlimit strlcat strlcpy strtoull getaddrinfo localtime_r gmtime_r memmem strtok_r writev readv flock prctl vasprintf lround rint) using_custom_malloc=no if test x$enable_openbsd_malloc = xyes ; then diff --git a/src/common/util.c b/src/common/util.c index ee0acbb..de1ca36 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -334,10 +334,12 @@ tor_mathlog(double d) long tor_lround(double d) { -#ifdef _MSC_VER - return (long)(d > 0 ? d + 0.5 : ceil(d - 0.5)); -#else +#if defined(HAVE_LROUND) return lround(d); +#elif defined(HAVE_RINT) + return (long)rint(d); +#else + return (long)(d > 0 ? d + 0.5 : ceil(d - 0.5)); #endif }

1 0

[torbrowser/maint-2.2] [2312 Linux] Allow libevent.so to point to libevent-2.0.so.5.1.2
by erinn＠torproject.org 09 Sep '11

09 Sep '11

commit 0822effa54d55d9df80f7ca032f079c40b46d0ef Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Sep 2 01:52:16 2011 -0400 [2312 Linux] Allow libevent.so to point to libevent-2.0.so.5.1.2 --- build-scripts/remove-shared-lib-symlinks | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/build-scripts/remove-shared-lib-symlinks b/build-scripts/remove-shared-lib-symlinks index 39d5060..779b707 100755 --- a/build-scripts/remove-shared-lib-symlinks +++ b/build-scripts/remove-shared-lib-symlinks @@ -69,9 +69,9 @@ foreach {x} $shared_lib_filenames { } } -# Check that every shared library symlink points to a file or symlink -# whose name starts with the symlink's name followed by a ".", and is -# longer. +# Check that every shared library symlink not of the form lib*.so +# points to a file or symlink whose name starts with the symlink's +# name followed by a ".", and is longer. # # FIXME This currently allows 'libfoozer.so.3' to point to # 'libfoozer.so.3.17.so.so.so.42.7'. That should be fixed, as a @@ -79,6 +79,13 @@ foreach {x} $shared_lib_filenames { foreach {x} $shared_lib_filenames { if {[file type $x] eq "file"} {continue} + if {[string match lib*.so $x]} { + # This is a shared library symlink of the form lib*.so ; it is + # only used at build time, and it may point to a shared + # library with a different name. + continue + } + set link_target [file readlink $x] if {![file exists $link_target]} { set link_target_type {}

1 0

[torbrowser/maint-2.2] [2312 Linux] Remove shared-library symlinks from Lib/ and Lib/libz
by erinn＠torproject.org 09 Sep '11

09 Sep '11

commit 77989a6a3f8ffb1e2acbbe7e79205fb964b8c8fb Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Sep 1 11:06:14 2011 -0400 [2312 Linux] Remove shared-library symlinks from Lib/ and Lib/libz --- build-scripts/linux.mk | 7 +- build-scripts/remove-shared-lib-symlinks | 216 ++++++++++++++++++++++++++++++ 2 files changed, 222 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 507f27c..4b83c8f 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -256,7 +256,8 @@ generic-bundle: directory-structure \ install-pidgin \ configure-apps \ launcher \ - strip-it-stripper + strip-it-stripper \ + remove-bundle-shared-lib-symlinks touch generic-bundle.stamp APPDIR=$(DEST)/App @@ -363,6 +364,10 @@ strip-it-stripper: strip $(LIBSDIR)/*.so* strip $(LIBSDIR)/libz/*.so* +remove-bundle-shared-lib-symlinks: + ./remove-shared-lib-symlinks $(LIBSDIR) + ./remove-shared-lib-symlinks $(LIBSDIR)/libz + ## ## How to create required extensions ## diff --git a/build-scripts/remove-shared-lib-symlinks b/build-scripts/remove-shared-lib-symlinks new file mode 100755 index 0000000..39d5060 --- /dev/null +++ b/build-scripts/remove-shared-lib-symlinks @@ -0,0 +1,216 @@ +#!/usr/bin/tclsh8.5 + +set usage [string trimleft { +usage: remove-shared-lib-symlinks $LIBSDIR + +Remove all shared library symlinks from the libraries in $LIBSDIR, +renaming the libraries themselves so that the Linux dynamic loader +will still load executables linked to those libraries properly. + +This program assumes that the contents of $LIBSDIR do not change while +it is running. +}] + +#* Return $x. (The command [return $x] returns $x <em>from the +# containing function</em>.) +proc result {x} { + return $x +} + +# Check that we have exactly one command-line argument. If our +# command line isn't what we expect, print a usage message to stderr +# and die. +# +# As a special case, if our one command-line argument is "--help" or +# "-help", print the usage message to stdout and exit. +if {$argc != 1 || + [lindex $argv 0] eq "--help" || + [lindex $argv 0] eq "-help" || + ![file exists [lindex $argv 0]]} { + + set usage_chan [switch -regexp -- [lindex $argv 0] \ + -?-help {result stdout} \ + .* {result stderr}] + + puts -nonewline $usage_chan $usage + + if {$usage_chan eq stderr} { + exit 2 + } else { + exit 0 + } +} + +set libdir [lindex $argv 0] +cd $libdir + +# Make a list of shared library filenames in the specified directory. +# We assume filesystem objects whose names start with "lib" and end in +# ".so" or contain ".so." are shared libraries or symlinks to them. +set possible_shared_lib_filenames [glob -types {f l} lib*.so*] +set shared_lib_filenames [list] +foreach {x} $possible_shared_lib_filenames { + if {[string match lib*.so $x] || + [string match lib*.so.* $x]} { + + lappend shared_lib_filenames $x + } +} +unset possible_shared_lib_filenames + +# Check that every shared library symlink points to a file in this +# directory. +foreach {x} $shared_lib_filenames { + if {[file type $x] eq "file"} {continue} + + set link_target [file readlink $x] + if {[string first / $link_target] != -1} { + error "symlink [list $x] -> [list $link_target] may lead to another directory" + } +} + +# Check that every shared library symlink points to a file or symlink +# whose name starts with the symlink's name followed by a ".", and is +# longer. +# +# FIXME This currently allows 'libfoozer.so.3' to point to +# 'libfoozer.so.3.17.so.so.so.42.7'. That should be fixed, as a +# matter of principle. +foreach {x} $shared_lib_filenames { + if {[file type $x] eq "file"} {continue} + + set link_target [file readlink $x] + if {![file exists $link_target]} { + set link_target_type {} + } else { + set link_target_type [file type $link_target] + } + + if {[string length $link_target] <= [string length $x.] || + ![string equal -length [string length $x.] $x. $link_target] || + ($link_target_type ne "file" && $link_target_type ne "link")} { + + error "symlink [list $x] -> [list $link_target] is not a valid symlink to a shared library version" + } +} + +# Check that all shared library symlinks' and files' names are of the +# form of a lib*.so name followed by zero or more (".", non-negative +# decimal number with no unnecessary leading zeroes) pairs. +foreach {x} $shared_lib_filenames { + if {![regexp -all -- {^lib.*\.so(\.(0|[1-9][0-9]*))*$} $x]} { + error "file or symlink [list $x] has invalid name" + } +} + +# Now decide what to do with each shared library symlink or file. +# +# We want to rename each shared library file to the name of the +# shortest symlink which points to that file and which is not of the +# form lib*.so . +# +# We can do this by first sorting the list ASCIIbetically, then +# FIXME DESCRIBE INTENDED ALGORITHM +set shared_lib_filenames [lsort -ascii $shared_lib_filenames] +set shared_lib_name_actions {} +set shared_libs_renamed {} +foreach {x} $shared_lib_filenames { + if {[file type $x] eq "link"} { + # This is a shared library symlink. If its target (after + # following the whole chain of symlinks) is not in + # $shared_libs_renamed yet, then this must also be the symlink + # to its target with the shortest name (partly due to the + # constraints above on what we allow a symlink to point to, + # and partly because of how we sorted the list above). + + if {[regexp -all -- {^lib.*\.so$} $x]} { + # This is a shared library symlink of the form lib*.so . + # Symlinks of this form are only used by the linker at build + # time. Delete this name. + + lappend shared_lib_name_actions [list rm $x] + continue + } + + set link_target [file readlink $x] + while {[file type $link_target] eq "link"} { + # We don't have to worry about symlink loops here. + set link_target [file readlink $x] + } + + if {[lsearch -exact $shared_libs_renamed $link_target] != -1} { + # The target has been renamed already -- just delete this link. + lappend shared_lib_name_actions [list rm $x] + continue + } + + # The target has not been renamed yet. This must be the + # symlink to the target with the shortest name not of the form + # lib*.so , and thus it is the name by which the dynamic + # loader will attempt to load the library. Rename it. + lappend shared_lib_name_actions [list rm $x] + lappend shared_lib_name_actions [list mv $link_target $x] + continue + } + + if {[file type $x] eq "file"} { + # This is a file. If it is listed in $shared_libs_renamed, we + # can now remove it from that list -- no name later in the + # list can be a symlink to this file. + set i [lsearch -exact $shared_libs_renamed $x] + if {i != -1} { + set shared_libs_renamed [lreplace $shared_libs_renamed $i $i] + } + continue + } + + # This isn't a file, and it isn't a symlink -- so WTF is this + # thing, anyway? A fish? + error "[list $x] foozer?" +} + +# Write the current list of shared library names and the list of +# rename/delete actions to disk. +# +# FIXME Currently, we write these out as single Tcl lists, most likely +# on a single line, because that is the only format that we can easily +# emit which can also be parsed easily and unambiguously by another +# program. Someday that should be improved; until then, it should be +# easy enough to write a tiny Tcl program that reads the list and +# writes out one list element per line or a tiny Tk program that reads +# the list and sticks it in a listbox widget. +set library_list {} +foreach {x} $shared_lib_filenames { + set x_type [file type $x] + if {$x_type eq "link"} { + set extra_info [file readlink $x] + } elseif {$x_type eq "file"} { + set extra_info {} ;# FIXME This should be a hash of some sort. + } else { + # can't happen + error "[list $x] foozer!" + } + lappend library_list [list $x $x_type $extra_info] +} +set library_list_chan [open ".shared-library-name-list" {WRONLY CREAT EXCL}] +puts -nonewline $library_list_chan $library_list +close $library_list_chan + +set action_list_chan [open ".shared-library-rename-action-list" {WRONLY CREAT EXCL}] +puts -nonewline $action_list_chan $shared_lib_name_actions +close $action_list_chan + +# Perform the rename/delete actions. +# +# FIXME There should be a -n or --dry-run command-line option to skip this. +foreach {action} $shared_lib_actions { + lassign $action cmd from to + switch -exact -- $cmd \ + rm { + file delete -- $from + } \ + mv { + file rename -- $from $to + } +} +

1 0

[torbrowser/maint-2.2] [2312 Linux] Fix code typos in remove-shared-lib-symlinks
by erinn＠torproject.org 09 Sep '11

09 Sep '11

commit d75dfa652d87bfd826ad5fffdc944036c1683cb9 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Sep 2 01:57:22 2011 -0400 [2312 Linux] Fix code typos in remove-shared-lib-symlinks --- build-scripts/remove-shared-lib-symlinks | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/remove-shared-lib-symlinks b/build-scripts/remove-shared-lib-symlinks index 779b707..bba37d8 100755 --- a/build-scripts/remove-shared-lib-symlinks +++ b/build-scripts/remove-shared-lib-symlinks @@ -165,7 +165,7 @@ foreach {x} $shared_lib_filenames { # can now remove it from that list -- no name later in the # list can be a symlink to this file. set i [lsearch -exact $shared_libs_renamed $x] - if {i != -1} { + if {$i != -1} { set shared_libs_renamed [lreplace $shared_libs_renamed $i $i] } continue @@ -210,7 +210,7 @@ close $action_list_chan # Perform the rename/delete actions. # # FIXME There should be a -n or --dry-run command-line option to skip this. -foreach {action} $shared_lib_actions { +foreach {action} $shared_lib_name_actions { lassign $action cmd from to switch -exact -- $cmd \ rm {

1 0

[torbrowser/maint-2.2] [2312 Linux] Don't try to rename libQtCore.so.4.6.2 to both .4 and .4.6
by erinn＠torproject.org 09 Sep '11

09 Sep '11

commit dc4aac95dbc417bc975fcb6ad61f7df565ac785c Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Sep 2 01:59:57 2011 -0400 [2312 Linux] Don't try to rename libQtCore.so.4.6.2 to both .4 and .4.6 --- build-scripts/remove-shared-lib-symlinks | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/build-scripts/remove-shared-lib-symlinks b/build-scripts/remove-shared-lib-symlinks index bba37d8..4692625 100755 --- a/build-scripts/remove-shared-lib-symlinks +++ b/build-scripts/remove-shared-lib-symlinks @@ -154,9 +154,12 @@ foreach {x} $shared_lib_filenames { # The target has not been renamed yet. This must be the # symlink to the target with the shortest name not of the form # lib*.so , and thus it is the name by which the dynamic - # loader will attempt to load the library. Rename it. + # loader will attempt to load the library. Rename the target, + # and record that we have renamed it so that we won't try to + # rename it again. lappend shared_lib_name_actions [list rm $x] lappend shared_lib_name_actions [list mv $link_target $x] + lappend shared_libs_renamed $link_target continue }

1 0

[torbrowser/maint-2.2] [Linux] Stop shipping libQt*.so.4.6.2.debug
by erinn＠torproject.org 09 Sep '11

09 Sep '11

commit fe08391a92867d623dbf374565433870c829e908 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Sep 2 02:09:27 2011 -0400 [Linux] Stop shipping libQt*.so.4.6.2.debug Those files are too small to possibly contain useful debug information, and they make remove-shared-lib-symlinks's sanity checks fail. --- build-scripts/linux.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 4b83c8f..47fd74b 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -286,6 +286,7 @@ install-binaries: cp -d $(QT)/libQtGui.so* $(LIBSDIR) cp -d $(QT)/libQtNetwork.so* $(LIBSDIR) cp -d $(QT)/libQtXml.so* $(LIBSDIR) + rm $(LIBSDIR)/libQt*.so*.debug # zlib cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.5 $(LIBSDIR)/libz # Libevent

1 0

[torbrowser/maint-2.2] Merge branch 'bug2312-v4' into maint-2.2
by erinn＠torproject.org 09 Sep '11

09 Sep '11

commit 9a13d32c69de5b9a2152614ac035689b2d663ef1 Merge: 4321ed0 fe08391 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Sep 9 17:49:36 2011 +0100 Merge branch 'bug2312-v4' into maint-2.2 build-scripts/linux.mk | 15 ++- build-scripts/remove-shared-lib-symlinks | 226 ++++++++++++++++++++++++++++++ 2 files changed, 240 insertions(+), 1 deletions(-)

1 0

[torbrowser/maint-2.2] [Linux] Break a long line in linux.mk
by erinn＠torproject.org 09 Sep '11

09 Sep '11

commit 6706274f7e2b0431fb4b725c71efb93cd2a4d07a Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Aug 24 05:26:14 2011 -0400 [Linux] Break a long line in linux.mk --- build-scripts/linux.mk | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index c46b5c0..507f27c 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -249,7 +249,14 @@ clean: ## Install binaries, documentation, FirefoxPortable, PidginPortable, and launcher into $(DEST) generic-bundle.stamp: make -f linux.mk generic-bundle -generic-bundle: directory-structure install-binaries install-docs install-firefox install-pidgin configure-apps launcher strip-it-stripper +generic-bundle: directory-structure \ + install-binaries \ + install-docs \ + install-firefox \ + install-pidgin \ + configure-apps \ + launcher \ + strip-it-stripper touch generic-bundle.stamp APPDIR=$(DEST)/App

1 0

[torbrowser/maint-2.2] Two more Firefox patches.
by erinn＠torproject.org 09 Sep '11

09 Sep '11

commit 0efc1760fda3acaef28f5d66c62d374614d1a299 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Sep 8 10:16:19 2011 -0700 Two more Firefox patches. First one disables all plugins except flash from loading, second one makes the content-prefs service not write to disk. --- .../0007-Block-all-plugins-except-flash.patch | 85 ++++++++++++++++++++ ...ontent-pref-service-memory-only-clearable.patch | 37 +++++++++ 2 files changed, 122 insertions(+), 0 deletions(-) diff --git a/src/current-patches/0007-Block-all-plugins-except-flash.patch b/src/current-patches/0007-Block-all-plugins-except-flash.patch new file mode 100644 index 0000000..d2c54dc --- /dev/null +++ b/src/current-patches/0007-Block-all-plugins-except-flash.patch @@ -0,0 +1,85 @@ +From dfabac8eddc37d794e23d25de3f1ef602ad4ad86 Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)fscked.org> +Date: Thu, 8 Sep 2011 08:40:05 -0700 +Subject: [PATCH 7/8] Block all plugins except flash. + +We cannot use the @mozilla.org/extensions/blocklist;1 service, because we +actually want to stop plugins from ever entering the browser's process space +and/or executing code (for example, AV plugins that collect statistics/analyse +urls, magical toolbars that phone home or "help" the user, skype buttons that +ruin our day, and censorship filters). Hence we rolled our own. + +See https://trac.torproject.org/projects/tor/ticket/3547#comment:6 for musings +on a better way. Until then, it is delta-darwinism for us. +--- + dom/plugins/base/nsPluginHost.cpp | 33 +++++++++++++++++++++++++++++++++ + dom/plugins/base/nsPluginHost.h | 2 ++ + 2 files changed, 35 insertions(+), 0 deletions(-) + +diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp +index 93c2413..1dc4ee0 100644 +--- a/dom/plugins/base/nsPluginHost.cpp ++++ b/dom/plugins/base/nsPluginHost.cpp +@@ -2062,6 +2062,35 @@ class nsDefaultComparator<pluginFileinDirectory, pluginFileinDirectory> + + typedef NS_NPAPIPLUGIN_CALLBACK(char *, NP_GETMIMEDESCRIPTION)(void); + ++PRBool nsPluginHost::GhettoBlacklist(nsIFile *pluginFile) ++{ ++ nsCString leaf; ++ const char *leafStr; ++ nsresult rv; ++ ++ rv = pluginFile->GetNativeLeafName(leaf); ++ if (NS_FAILED(rv)) { ++ return PR_TRUE; // fuck 'em. blacklist. ++ } ++ ++ leafStr = leaf.get(); ++ ++ if (!leafStr) { ++ return PR_TRUE; // fuck 'em. blacklist. ++ } ++ ++ // libgnashplugin.so, libflashplayer.so, Flash Player-10.4-10.5.plugin, ++ // NPSWF32.dll, NPSWF64.dll ++ if (strstr(leafStr, "libgnashplugin") == leafStr || ++ strstr(leafStr, "libflashplayer") == leafStr || ++ strstr(leafStr, "Flash Player") == leafStr || ++ strstr(leafStr, "NPSWF") == leafStr) { ++ return PR_FALSE; ++ } ++ ++ return PR_TRUE; // fuck 'em. blacklist. ++} ++ + nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir, + PRBool aCreatePluginList, + PRBool *aPluginsChanged) +@@ -2197,6 +2226,10 @@ nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir, + continue; + } + ++ if (GhettoBlacklist(file)) { ++ continue; ++ } ++ + // if it is not found in cache info list or has been changed, create a new one + if (!pluginTag) { + nsPluginFile pluginFile(file); +diff --git a/dom/plugins/base/nsPluginHost.h b/dom/plugins/base/nsPluginHost.h +index b1b8759..d6e237f 100644 +--- a/dom/plugins/base/nsPluginHost.h ++++ b/dom/plugins/base/nsPluginHost.h +@@ -283,6 +283,8 @@ private: + // Loads all cached plugins info into mCachedPlugins + nsresult ReadPluginInfo(); + ++ PRBool GhettoBlacklist(nsIFile *pluginFile); ++ + // Given a file path, returns the plugins info from our cache + // and removes it from the cache. + void RemoveCachedPluginsInfo(const char *filePath, +-- +1.7.3.4 + diff --git a/src/current-patches/0008-Make-content-pref-service-memory-only-clearable.patch b/src/current-patches/0008-Make-content-pref-service-memory-only-clearable.patch new file mode 100644 index 0000000..75f0c0c --- /dev/null +++ b/src/current-patches/0008-Make-content-pref-service-memory-only-clearable.patch @@ -0,0 +1,37 @@ +From 3964288545a78c28ca4585ac51bd7d9b8ccb3503 Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)fscked.org> +Date: Thu, 8 Sep 2011 08:40:17 -0700 +Subject: [PATCH 8/8] Make content pref service memory-only + clearable + +This prevents random urls from being inserted into content-prefs.sqllite in +the profile directory as content prefs change (includes site-zoom and perhaps +other site prefs?). +--- + .../contentprefs/nsContentPrefService.js | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/toolkit/components/contentprefs/nsContentPrefService.js b/toolkit/components/contentprefs/nsContentPrefService.js +index a5f417f..601f7a3 100644 +--- a/toolkit/components/contentprefs/nsContentPrefService.js ++++ b/toolkit/components/contentprefs/nsContentPrefService.js +@@ -1036,7 +1036,7 @@ ContentPrefService.prototype = { + + var dbConnection; + +- if (!dbFile.exists()) ++ if (true || !dbFile.exists()) + dbConnection = this._dbCreate(dbService, dbFile); + else { + try { +@@ -1084,7 +1084,7 @@ ContentPrefService.prototype = { + }, + + _dbCreate: function ContentPrefService__dbCreate(aDBService, aDBFile) { +- var dbConnection = aDBService.openDatabase(aDBFile); ++ var dbConnection = aDBService.openSpecialDatabase("memory"); + + try { + this._dbCreateSchema(dbConnection); +-- +1.7.3.4 +

1 0