diff options
author | David Fifield <david@bamsoftware.com> | 2019-02-22 23:54:17 -0700 |
---|---|---|
committer | Alexander Færøy <ahf@torproject.org> | 2019-03-05 15:24:31 +0100 |
commit | 4578c3eb219e93da9b1aaa37c4f3c5f61c7106f5 (patch) | |
tree | e59dfb0901fc4743498f042f99bd87a81423ac53 /src/feature/client | |
parent | c5da1f1cd52dfbf6dc68fba70df42ec4976a589c (diff) | |
download | tor-4578c3eb219e93da9b1aaa37c4f3c5f61c7106f5.tar.gz tor-4578c3eb219e93da9b1aaa37c4f3c5f61c7106f5.zip |
Set TOR_PT_EXIT_ON_STDIN_CLOSE=1 for client transports too.
Closes #25614.
Diffstat (limited to 'src/feature/client')
-rw-r--r-- | src/feature/client/transports.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/feature/client/transports.c b/src/feature/client/transports.c index e7ff3bf34a..6fb357b466 100644 --- a/src/feature/client/transports.c +++ b/src/feature/client/transports.c @@ -1424,11 +1424,6 @@ create_managed_proxy_environment(const managed_proxy_t *mp) } else { smartlist_add_asprintf(envs, "TOR_PT_EXTENDED_SERVER_PORT="); } - - /* All new versions of tor will keep stdin open, so PTs can use it - * as a reliable termination detection mechanism. - */ - smartlist_add_asprintf(envs, "TOR_PT_EXIT_ON_STDIN_CLOSE=1"); } else { /* If ClientTransportPlugin has a HTTPS/SOCKS proxy configured, set the * TOR_PT_PROXY line. @@ -1439,6 +1434,11 @@ create_managed_proxy_environment(const managed_proxy_t *mp) } } + /* All new versions of tor will keep stdin open, so PTs can use it + * as a reliable termination detection mechanism. + */ + smartlist_add_asprintf(envs, "TOR_PT_EXIT_ON_STDIN_CLOSE=1"); + SMARTLIST_FOREACH_BEGIN(envs, const char *, env_var) { set_environment_variable_in_smartlist(merged_env_vars, env_var, tor_free_, 1); |