summaryrefslogtreecommitdiff
path: root/spartan
diff options
context:
space:
mode:
Diffstat (limited to 'spartan')
-rw-r--r--spartan/client.go2
-rw-r--r--spartan/request.go12
-rw-r--r--spartan/response.go14
-rw-r--r--spartan/serve.go4
4 files changed, 16 insertions, 16 deletions
diff --git a/spartan/client.go b/spartan/client.go
index aff9276..37cb45d 100644
--- a/spartan/client.go
+++ b/spartan/client.go
@@ -134,6 +134,6 @@ func (c Client) IsRedirect(response *types.Response) bool {
type devnull struct{}
-func (_ devnull) Read(p []byte) (int, error) {
+func (devnull) Read(p []byte) (int, error) {
return 0, nil
}
diff --git a/spartan/request.go b/spartan/request.go
index aa696fa..b35fd77 100644
--- a/spartan/request.go
+++ b/spartan/request.go
@@ -12,11 +12,11 @@ import (
)
var (
- // InvalidRequestLine indicates a malformed first-line of a spartan request.
- InvalidRequestLine = errors.New("invalid request line")
+ // ErrInvalidRequestLine indicates a malformed first-line of a spartan request.
+ ErrInvalidRequestLine = errors.New("invalid request line")
- // InvalidRequestLineEnding says that a spartan request's first line wasn't terminated with CRLF.
- InvalidRequestLineEnding = errors.New("invalid request line ending")
+ // ErrInvalidRequestLineEnding says that a spartan request's first line wasn't terminated with CRLF.
+ ErrInvalidRequestLineEnding = errors.New("invalid request line ending")
)
// ParseRequest parses a single spartan request and the indicated content-length from a reader.
@@ -37,11 +37,11 @@ func ParseRequest(rdr io.Reader) (*types.Request, int, error) {
host, rest, ok := strings.Cut(line, " ")
if !ok {
- return nil, 0, InvalidRequestLine
+ return nil, 0, ErrInvalidRequestLine
}
path, rest, ok := strings.Cut(rest, " ")
if !ok || len(rest) == 0 {
- return nil, 0, InvalidRequestLine
+ return nil, 0, ErrInvalidRequestLine
}
u, err := url.Parse(path)
diff --git a/spartan/response.go b/spartan/response.go
index df565f9..a71c598 100644
--- a/spartan/response.go
+++ b/spartan/response.go
@@ -52,26 +52,26 @@ func ServerError(err error) *types.Response {
}
}
-// InvalidResponseHeaderLine indicates a malformed spartan response line.
-var InvalidResponseHeaderLine = errors.New("Invalid response header line.")
+// ErrInvalidResponseHeaderLine indicates a malformed spartan response line.
+var ErrInvalidResponseHeaderLine = errors.New("invalid response header line")
-// InvalidResponseLineEnding indicates that a spartan response header didn't end with "\r\n".
-var InvalidResponseLineEnding = errors.New("Invalid response line ending.")
+// ErrInvalidResponseLineEnding indicates that a spartan response header didn't end with "\r\n".
+var ErrInvalidResponseLineEnding = errors.New("invalid response line ending")
func ParseResponse(rdr io.Reader) (*types.Response, error) {
bufrdr := bufio.NewReader(rdr)
hdrLine, err := bufrdr.ReadString('\n')
if err != nil {
- return nil, InvalidResponseLineEnding
+ return nil, ErrInvalidResponseLineEnding
}
if len(hdrLine) < 2 {
- return nil, InvalidResponseHeaderLine
+ return nil, ErrInvalidResponseHeaderLine
}
status, err := strconv.Atoi(string(hdrLine[0]))
if err != nil || hdrLine[1] != ' ' || hdrLine[len(hdrLine)-2:] != "\r\n" {
- return nil, InvalidResponseHeaderLine
+ return nil, ErrInvalidResponseHeaderLine
}
return &types.Response{
diff --git a/spartan/serve.go b/spartan/serve.go
index 9403a15..354c1e1 100644
--- a/spartan/serve.go
+++ b/spartan/serve.go
@@ -58,13 +58,13 @@ func (ss *spartanServer) handleConn(conn net.Conn) {
if r := recover(); r != nil {
err := fmt.Errorf("%s", r)
_ = ss.LogError("msg", "panic in handler", "err", err)
- rdr := NewResponseReader(ServerError(errors.New("Server error")))
+ rdr := NewResponseReader(ServerError(errors.New("server error")))
_, _ = io.Copy(conn, rdr)
}
}()
response = ss.handler.Handle(ss.Ctx, request)
if response == nil {
- response = ClientError(errors.New("Resource does not exist."))
+ response = ClientError(errors.New("resource does not exist"))
}
}