aboutsummaryrefslogtreecommitdiff
path: root/src/net/http/export_test.go
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@golang.org>2015-10-19 14:45:50 +0000
committerBrad Fitzpatrick <bradfitz@golang.org>2015-10-19 15:26:35 +0000
commita8645e283b1961133dea205a62d472094f839c05 (patch)
tree24071b1681dbb824d765bc5402520f8f749cf5f0 /src/net/http/export_test.go
parent5d88323fa6c2c39891bf59d8674c338b0ed3902e (diff)
downloadgo-a8645e283b1961133dea205a62d472094f839c05.tar.xz
net/http: use the correct error variable in serveFile
It was generating the wrong error message, always defaulting to "500 Internal Server Error", since the err variable used was always nil. Fixes #12991 Change-Id: I94b0e516409c131ff3b878bcb91e65f0259ff077 Reviewed-on: https://go-review.googlesource.com/16060 Reviewed-by: David Crawshaw <crawshaw@golang.org> Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'src/net/http/export_test.go')
-rw-r--r--src/net/http/export_test.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/net/http/export_test.go b/src/net/http/export_test.go
index 0457be50da..68fbd43826 100644
--- a/src/net/http/export_test.go
+++ b/src/net/http/export_test.go
@@ -130,3 +130,5 @@ var ExportServerNewConn = (*Server).newConn
var ExportCloseWriteAndWait = (*conn).closeWriteAndWait
var ExportErrRequestCanceled = errRequestCanceled
+
+var ExportServeFile = serveFile