Commit 3a1e7964 authored by Kathleen Brade's avatar Kathleen Brade Committed by Matthew Finkel
Browse files

Bug 11641: change TBB directory structure to be more like Firefox's

Unless the -osint command line flag is used, the browser now defaults
to the equivalent of -no-remote.  There is a new -allow-remote flag that
may be used to restore the original (Firefox-like) default behavior.
parent 8f98f962
...@@ -1805,8 +1805,10 @@ static void DumpHelp() { ...@@ -1805,8 +1805,10 @@ static void DumpHelp() {
" --migration Start with migration wizard.\n" " --migration Start with migration wizard.\n"
" --ProfileManager Start with ProfileManager.\n" " --ProfileManager Start with ProfileManager.\n"
#ifdef MOZ_HAS_REMOTE #ifdef MOZ_HAS_REMOTE
" --no-remote Do not accept or send remote commands; implies\n" " --no-remote (default) Do not accept or send remote commands; "
"implies\n"
" --new-instance.\n" " --new-instance.\n"
" --allow-remote Accept and send remote commands.\n"
" --new-instance Open new instance, not a new window in running " " --new-instance Open new instance, not a new window in running "
"instance.\n" "instance.\n"
#endif #endif
...@@ -3979,16 +3981,25 @@ int XREMain::XRE_mainInit(bool* aExitFlag) { ...@@ -3979,16 +3981,25 @@ int XREMain::XRE_mainInit(bool* aExitFlag) {
gSafeMode); gSafeMode);
#if defined(MOZ_HAS_REMOTE) #if defined(MOZ_HAS_REMOTE)
// In Tor Browser, remoting is disabled by default unless -osint is used.
bool allowRemote = (CheckArg("allow-remote") == ARG_FOUND);
bool isOsint = (CheckArg("osint", nullptr, CheckArgFlag::None) == ARG_FOUND);
if (!allowRemote && !isOsint) {
SaveToEnv("MOZ_NO_REMOTE=1");
}
// Handle --no-remote and --new-instance command line arguments. Setup // Handle --no-remote and --new-instance command line arguments. Setup
// the environment to better accommodate other components and various // the environment to better accommodate other components and various
// restart scenarios. // restart scenarios.
ar = CheckArg("no-remote"); ar = CheckArg("no-remote");
if (ar == ARG_FOUND || EnvHasValue("MOZ_NO_REMOTE")) { if ((ar == ARG_FOUND) && allowRemote) {
PR_fprintf(PR_STDERR,
"Error: argument --no-remote is invalid when argument "
"--allow-remote is specified\n");
return 1;
}
if (EnvHasValue("MOZ_NO_REMOTE")) {
mDisableRemoteClient = true; mDisableRemoteClient = true;
mDisableRemoteServer = true; mDisableRemoteServer = true;
if (!EnvHasValue("MOZ_NO_REMOTE")) {
SaveToEnv("MOZ_NO_REMOTE=1");
}
} }
ar = CheckArg("new-instance"); ar = CheckArg("new-instance");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment