From 1c4474c96fea2de75d464b158d7d73c9707daef8 Mon Sep 17 00:00:00 2001
From: Aliaksandr Valialkin <valyala@gmail.com>
Date: Wed, 25 Nov 2015 17:33:57 +0200
Subject: [PATCH] Made fakeListener.Accept() safe for concurrent use

---
 server_timing_test.go | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/server_timing_test.go b/server_timing_test.go
index 739be01..08c916a 100644
--- a/server_timing_test.go
+++ b/server_timing_test.go
@@ -8,6 +8,7 @@ import (
 	"net"
 	"net/http"
 	"runtime"
+	"sync"
 	"sync/atomic"
 	"testing"
 	"time"
@@ -240,19 +241,28 @@ func (c *fakeServerConn) SetWriteDeadline(t time.Time) error {
 }
 
 type fakeListener struct {
+	lock            sync.Mutex
 	requestsCount   int
 	requestsPerConn int
 	request         []byte
 	ch              chan *fakeServerConn
 	done            chan struct{}
+	closed bool
 }
 
 func (ln *fakeListener) Accept() (net.Conn, error) {
+	ln.lock.Lock()
 	if ln.requestsCount == 0 {
+		ln.lock.Unlock()
 		for len(ln.ch) < cap(ln.ch) {
 			time.Sleep(10 * time.Millisecond)
 		}
-		close(ln.done)
+		ln.lock.Lock()
+		if !ln.closed {
+			close(ln.done)
+			ln.closed = true
+		}
+		ln.lock.Unlock()
 		return nil, io.EOF
 	}
 	requestsCount := ln.requestsPerConn
@@ -260,6 +270,7 @@ func (ln *fakeListener) Accept() (net.Conn, error) {
 		requestsCount = ln.requestsCount
 	}
 	ln.requestsCount -= requestsCount
+	ln.lock.Unlock()
 
 	c := <-ln.ch
 	c.requestsCount = requestsCount