Skip to content

Commit 072a498

Browse files
committed
correction
1 parent abbfa35 commit 072a498

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

module.go

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,29 +40,27 @@ func (m Middleware) ServeHTTP(w http.ResponseWriter, r *http.Request, next caddy
4040
return err
4141
}
4242

43+
if responseRecorder.Status() != 200 || responseRecorder.Size() == 0 {
44+
return responseRecorder.WriteResponse()
45+
}
46+
4347
options, err := getOptions(r)
4448
if err != nil {
4549
return err
4650
}
4751

48-
recordedResponse := responseRecorder.Buffer()
49-
if recordedResponse.Len() == 0 {
50-
return next.ServeHTTP(w, r)
52+
newImage, err := bimg.NewImage(responseRecorder.Buffer().Bytes()).Process(options)
53+
if err != nil {
54+
return responseRecorder.WriteResponse()
5155
}
5256

53-
newImage, err := bimg.NewImage(recordedResponse.Bytes()).Process(options)
54-
if err != nil {
55-
// @TODO return base response on error if parameter set in caddy file
57+
if _, err = w.Write(newImage); err != nil {
5658
return err
5759
}
5860

5961
w.Header().Set("Content-Length", strconv.Itoa(len(newImage)))
6062
w.Header().Set("Content-Type", "image/"+bimg.NewImage(newImage).Type())
6163

62-
if _, err = w.Write(newImage); err != nil {
63-
return err
64-
}
65-
6664
return nil
6765
}
6866

0 commit comments

Comments
 (0)