Skip to content

Commit d2eadcd

Browse files
committed
fix race
1 parent abf36a0 commit d2eadcd

1 file changed

Lines changed: 1 addition & 3 deletions

File tree

caddy/module.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,6 @@ func needReplacement(s string) bool {
151151
return strings.ContainsAny(s, "{}")
152152
}
153153

154-
var errRejected = &frankenphp.ErrRejected{}
155-
156154
// ServeHTTP implements caddyhttp.MiddlewareHandler.
157155
func (f *FrankenPHPModule) ServeHTTP(w http.ResponseWriter, r *http.Request, _ caddyhttp.Handler) error {
158156
origReq := r.Context().Value(caddyhttp.OriginalRequestCtxKey).(http.Request)
@@ -199,7 +197,7 @@ func (f *FrankenPHPModule) ServeHTTP(w http.ResponseWriter, r *http.Request, _ c
199197
return caddyhttp.Error(http.StatusInternalServerError, err)
200198
}
201199

202-
if err = frankenphp.ServeHTTP(w, fr); err != nil && !errors.As(err, errRejected) {
200+
if err = frankenphp.ServeHTTP(w, fr); err != nil && !errors.As(err, &frankenphp.ErrRejected{}) {
203201
return caddyhttp.Error(http.StatusInternalServerError, err)
204202
}
205203

0 commit comments

Comments
 (0)