nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Set TOR_PT_EXIT_ON_STDIN_CLOSE=1 for client transports too.

Browse Source 
Closes #25614.
This commit is contained in:
David Fifield 2019-02-22 23:54:17 -07:00 committed by Alexander Færøy
parent c5da1f1cd5
commit 4578c3eb21
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/ticket25614 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (pluggable transports):
- Tor now sets TOR_PT_EXIT_ON_STDIN_CLOSE=1 for client transports as
well as servers. Closes ticket 25614.

10
src/feature/client/transports.c
View File

@ -1424,11 +1424,6 @@ create_managed_proxy_environment(const managed_proxy_t *mp)
} else { } else {
smartlist_add_asprintf(envs, "TOR_PT_EXTENDED_SERVER_PORT="); 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 { } else {
/* If ClientTransportPlugin has a HTTPS/SOCKS proxy configured, set the /* If ClientTransportPlugin has a HTTPS/SOCKS proxy configured, set the
* TOR_PT_PROXY line. * 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) { SMARTLIST_FOREACH_BEGIN(envs, const char *, env_var) {
set_environment_variable_in_smartlist(merged_env_vars, env_var, set_environment_variable_in_smartlist(merged_env_vars, env_var,
tor_free_, 1); tor_free_, 1);