[tor-commits] [meek/master] Don't close subprocess stdin in terminateprocess-buffer.

dcf at torproject.org dcf at torproject.org
Fri May 1 22:06:40 UTC 2015


commit 098ac93e1158ce87de209ba317b171a78a248d61
Author: David Fifield <david at bamsoftware.com>
Date:   Thu Apr 30 20:54:31 2015 -0700

    Don't close subprocess stdin in terminateprocess-buffer.
    
    It started being closed in 1fa2da7c6c03500ee899061a773fb7cfb0c1bf5f,
    which added compliance with the TOR_PT_EXIT_ON_STDIN_CLOSE environment
    variable. Closing stdin of the subprocess doesn't make sense, because
    the purpose of terminateprocess-buffer is to keep the chile stdin open
    after its own stdin has closed.
    
    This fixes a regression in Tor Browser 4.5 on Windows 7:
    https://trac.torproject.org/projects/tor/ticket/15872#comment:5
    However, the same code, even when it closes stdin, works on Windows 8,
    and I don't know why.
---
 terminateprocess-buffer/terminateprocess-buffer.go |    1 -
 1 file changed, 1 deletion(-)

diff --git a/terminateprocess-buffer/terminateprocess-buffer.go b/terminateprocess-buffer/terminateprocess-buffer.go
index ef6f353..6f77e98 100644
--- a/terminateprocess-buffer/terminateprocess-buffer.go
+++ b/terminateprocess-buffer/terminateprocess-buffer.go
@@ -43,7 +43,6 @@ func main() {
 		log.Fatal(err)
 	}
 	io.Copy(stdin, os.Stdin)
-	stdin.Close()
 	err = cmd.Wait()
 	if err != nil {
 		log.Fatal(err)



More information about the tor-commits mailing list