Quellcode durchsuchen

Set TOR_PT_EXIT_ON_STDIN_CLOSE=1 for client transports too.

Closes #25614.
David Fifield vor 5 Jahren
Ursprung
Commit
4578c3eb21
2 geänderte Dateien mit 8 neuen und 5 gelöschten Zeilen
  1. 3 0
      changes/ticket25614
  2. 5 5
      src/feature/client/transports.c

+ 3 - 0
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. Closes ticket 25614.

+ 5 - 5
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);