Skip to content

Commit

Permalink
chore: fixes short write error. (#107)
Browse files Browse the repository at this point in the history
* chore: fixes short write error.

* fix: removes the content length header on phase 3 interruption so caddy does not fail as per caddyserver/caddy#5952.
  • Loading branch information
jcchavezs authored Nov 27, 2023
1 parent e6cbb66 commit 8e628a0
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
1 change: 1 addition & 0 deletions .github/workflows/nightly-caddy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:

jobs:
nightly-caddy:
name: "Nightly Caddy (caddy version: ${{ github.event.inputs.caddyversion || 'master' }})"
strategy:
matrix:
go-version: [1.20.x]
Expand Down
13 changes: 11 additions & 2 deletions interceptor.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ func (i *rwInterceptor) WriteHeader(statusCode int) {
i.statusCode = statusCode

if it := i.tx.ProcessResponseHeaders(statusCode, i.proto); it != nil {
i.w.Header().Del("Content-Length")
i.statusCode = obtainStatusCodeFromInterruptionOrDefault(it, i.statusCode)
i.flushWriteHeader()
return
Expand Down Expand Up @@ -73,7 +74,11 @@ func (i *rwInterceptor) Write(b []byte) (int, error) {
// if there is an interruption it must be from at least phase 4 and hence
// WriteHeader or Write should have been called and hence the status code
// has been flushed to the delegated response writer.
return 0, nil
//
// We return the number of bytes as according to the interface io.Writer
// if we don't return an error, the number of bytes written is len(p).
// See https://pkg.go.dev/io#Writer
return len(b), nil
}

if !i.wroteHeader {
Expand All @@ -89,7 +94,11 @@ func (i *rwInterceptor) Write(b []byte) (int, error) {
i.overrideWriteHeader(it.Status)
// We only flush the status code after an interruption.
i.flushWriteHeader()
return 0, nil

// We return the number of bytes as according to the interface io.Writer
// if we don't return an error, the number of bytes written is len(p).
// See https://pkg.go.dev/io#Writer
return len(b), nil
}
return n, err
}
Expand Down

0 comments on commit 8e628a0

Please sign in to comment.