tor

commit d24acc008dcdc0b9515ac754ac54e00753b0f8b5
parent f8e38d21c27f25af8bfacfda2dbd0160214361b3
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue,  5 Mar 2019 12:01:28 -0500

Merge remote-tracking branch 'tor-github/pr/759'

Diffstat:
A
changes/ticket25614
 | 
3
+++
M
src/feature/client/transports.c
 | 
10
+++++-----

2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/changes/ticket25614 b/changes/ticket25614
@@ -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. Fixes bug 25614; bugfix on 0.2.7.1-alpha.
diff --git 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);