commit fecc8672b045889a4a0560ff4e69fe5fc0fcefd7 Author: Kathy Brade brade@pearlcrescent.com Date: Thu Nov 17 15:23:10 2016 -0500

fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.

During staged updates, ignore Unix domain sockets when copying the contents of the existing installation directory. Fixes bug 20691. --- toolkit/mozapps/update/updater/updater.cpp | 7 +++++++ 1 file changed, 7 insertions(+)

diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp index d6d0f09..ae3b2aa 100644 --- a/toolkit/mozapps/update/updater/updater.cpp +++ b/toolkit/mozapps/update/updater/updater.cpp @@ -825,6 +825,13 @@ static int ensure_copy_recursive(const NS_tchar *path, const NS_tchar *dest, } #endif

+#ifdef XP_UNIX + // Ignore Unix domain sockets. See #20691. + if (S_ISSOCK(sInfo.st_mode)) { + return 0; + } +#endif + if (!S_ISDIR(sInfo.st_mode)) { return ensure_copy(path, dest); }