From 05ea5c32bed2b9d67a8fdba48b33b1c094e30177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=96stanb=C3=A4ck?= <cez81@users.noreply.github.com> Date: Wed, 17 May 2017 17:57:11 +0200 Subject: [PATCH] Fix lint warning by renaming MaxBytesExceededErr -> ErrMaxBytesExceeded (#1676) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jonas Östanbäck <jonas.ostanback@gmail.com> --- caddyhttp/httpserver/replacer.go | 2 +- caddyhttp/httpserver/server.go | 4 ++-- caddyhttp/limits/handler.go | 4 ++-- caddyhttp/limits/handler_test.go | 4 ++-- caddyhttp/proxy/proxy.go | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/caddyhttp/httpserver/replacer.go b/caddyhttp/httpserver/replacer.go index ad5b12c12..62b01515d 100644 --- a/caddyhttp/httpserver/replacer.go +++ b/caddyhttp/httpserver/replacer.go @@ -302,7 +302,7 @@ func (r *replacer) getSubstitution(key string) string { } _, err := ioutil.ReadAll(r.request.Body) if err != nil { - if err == MaxBytesExceededErr { + if err == ErrMaxBytesExceeded { return r.emptyValue } } diff --git a/caddyhttp/httpserver/server.go b/caddyhttp/httpserver/server.go index e7e29ace5..4498f38e0 100644 --- a/caddyhttp/httpserver/server.go +++ b/caddyhttp/httpserver/server.go @@ -478,9 +478,9 @@ func (ln tcpKeepAliveListener) File() (*os.File, error) { return ln.TCPListener.File() } -// MaxBytesExceeded is the error returned by MaxBytesReader +// ErrMaxBytesExceeded is the error returned by MaxBytesReader // when the request body exceeds the limit imposed -var MaxBytesExceededErr = errors.New("http: request body too large") +var ErrMaxBytesExceeded = errors.New("http: request body too large") // DefaultErrorFunc responds to an HTTP request with a simple description // of the specified HTTP status code. diff --git a/caddyhttp/limits/handler.go b/caddyhttp/limits/handler.go index 52fe60ab1..6bcd12c5c 100644 --- a/caddyhttp/limits/handler.go +++ b/caddyhttp/limits/handler.go @@ -31,7 +31,7 @@ func (l Limit) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error) { // MaxBytesReader and its associated methods are borrowed from the // Go Standard library (comments intact). The only difference is that -// it returns a MaxBytesExceeded error instead of a generic error message +// it returns a ErrMaxBytesExceeded error instead of a generic error message // when the request body has exceeded the requested limit func MaxBytesReader(w http.ResponseWriter, r io.ReadCloser, n int64) io.ReadCloser { return &maxBytesReader{w: w, r: r, n: n} @@ -81,7 +81,7 @@ func (l *maxBytesReader) Read(p []byte) (n int, err error) { if res, ok := l.w.(requestTooLarger); ok { res.requestTooLarge() } - l.err = httpserver.MaxBytesExceededErr + l.err = httpserver.ErrMaxBytesExceeded return n, l.err } diff --git a/caddyhttp/limits/handler_test.go b/caddyhttp/limits/handler_test.go index be5144ede..aae20ba7b 100644 --- a/caddyhttp/limits/handler_test.go +++ b/caddyhttp/limits/handler_test.go @@ -29,7 +29,7 @@ func TestBodySizeLimit(t *testing.T) { if got := string(gotContent); got != expectContent { t.Errorf("expected content[%s], got[%s]", expectContent, got) } - if gotError != httpserver.MaxBytesExceededErr { - t.Errorf("expect error %v, got %v", httpserver.MaxBytesExceededErr, gotError) + if gotError != httpserver.ErrMaxBytesExceeded { + t.Errorf("expect error %v, got %v", httpserver.ErrMaxBytesExceeded, gotError) } } diff --git a/caddyhttp/proxy/proxy.go b/caddyhttp/proxy/proxy.go index 27293deb1..56159f9fb 100644 --- a/caddyhttp/proxy/proxy.go +++ b/caddyhttp/proxy/proxy.go @@ -228,7 +228,7 @@ func (p Proxy) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error) { return 0, nil } - if backendErr == httpserver.MaxBytesExceededErr { + if backendErr == httpserver.ErrMaxBytesExceeded { return http.StatusRequestEntityTooLarge, backendErr }