diff --git a/imageproxy.go b/imageproxy.go index 2f1d6f684..9a5826f6a 100644 --- a/imageproxy.go +++ b/imageproxy.go @@ -180,12 +180,11 @@ func (p *Proxy) serveImage(w http.ResponseWriter, r *http.Request) { req.Options.ScaleUp = p.ScaleUp actualReq, _ := http.NewRequest("GET", req.String(), nil) + actualReq.Header.Set("Accept", "*/*") + actualReq.Header.Set("Accept-Language", "*") if p.UserAgent != "" { actualReq.Header.Set("User-Agent", p.UserAgent) } - if len(p.ContentTypes) != 0 { - actualReq.Header.Set("Accept", strings.Join(p.ContentTypes, ", ")) - } if p.IncludeReferer { // pass along the referer header from the original request copyHeader(actualReq.Header, r.Header, "referer") @@ -240,7 +239,7 @@ func (p *Proxy) serveImage(w http.ResponseWriter, r *http.Request) { resp.Body = ioutil.NopCloser(b) contentType = peekContentType(b) } - if resp.ContentLength != 0 && !contentTypeMatches(p.ContentTypes, contentType) { + if (resp.ContentLength != 0 && !contentTypeMatches(p.ContentTypes, contentType)) || strings.Contains(contentType, "svg") { p.logf("content-type not allowed: %q", contentType) http.Error(w, msgNotAllowed, http.StatusForbidden) return