[tor-commits] [meek/master] Increase the meek-server readWriteTimeout from 10 s to 20 s.

[dcf at torproject.org]

commit f5d2a2e9c433e7af84de03abfc14385ac9092603
Author: David Fifield <david at bamsoftware.com>
Date:   Wed May 7 13:54:50 2014 -0700

    Increase the meek-server readWriteTimeout from 10 s to 20 s.
    
    I want to see if this helps the user who reports timeouts during
    bootstrapping.
    https://trac.torproject.org/projects/tor/ticket/11612
    
    I do in fact currently see a handful (few dozen in the last two weeks)
    meek-server log messages like:
    2014/04/26 05:08:28 writing to response: write tcp 8.35.201.53:60920: i/o timeout
    2014/04/26 06:10:53 writing to response: write tcp 8.35.201.53:56008: i/o timeout
    2014/04/26 10:32:07 copying body to ORPort: read tcp 8.35.201.54:62350: i/o timeout
---
 meek-server/meek-server.go |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meek-server/meek-server.go b/meek-server/meek-server.go
index b77b765..c24b8cc 100644
--- a/meek-server/meek-server.go
+++ b/meek-server/meek-server.go
@@ -27,7 +27,7 @@ const (
 	// response.
 	turnaroundTimeout = 10 * time.Millisecond
 	// Passed as ReadTimeout and WriteTimeout when constructing the http.Server.
-	readWriteTimeout    = 10 * time.Second
+	readWriteTimeout    = 20 * time.Second
 	maxSessionStaleness = 120 * time.Second
 )