Browse Source

s3: handle response-content-encoding

fix https://github.com/chrislusf/seaweedfs/issues/1487
pull/1502/head
Chris Lu 4 years ago
parent
commit
dbf5327b98
  1. 23
      weed/s3api/s3api_object_handlers.go

23
weed/s3api/s3api_object_handlers.go

@ -210,6 +210,15 @@ func (s3a *S3ApiServer) DeleteMultipleObjectsHandler(w http.ResponseWriter, r *h
} }
var passThroughHeaders = []string{
"response-cache-control",
"response-content-disposition",
"response-content-encoding",
"response-content-language",
"response-content-type",
"response-expires",
}
func (s3a *S3ApiServer) proxyToFiler(w http.ResponseWriter, r *http.Request, destUrl string, responseFn func(proxyResponse *http.Response, w http.ResponseWriter)) { func (s3a *S3ApiServer) proxyToFiler(w http.ResponseWriter, r *http.Request, destUrl string, responseFn func(proxyResponse *http.Response, w http.ResponseWriter)) {
glog.V(2).Infof("s3 proxying %s to %s", r.Method, destUrl) glog.V(2).Infof("s3 proxying %s to %s", r.Method, destUrl)
@ -226,6 +235,19 @@ func (s3a *S3ApiServer) proxyToFiler(w http.ResponseWriter, r *http.Request, des
proxyReq.Header.Set("X-Forwarded-For", r.RemoteAddr) proxyReq.Header.Set("X-Forwarded-For", r.RemoteAddr)
for header, values := range r.Header { for header, values := range r.Header {
// handle s3 related headers
passed := false
for _, h := range passThroughHeaders {
if strings.ToLower(header) == h && len(values) > 0 {
proxyReq.Header.Add(header[len("response-"):], values[0])
passed = true
break
}
}
if passed {
continue
}
// handle other headers
for _, value := range values { for _, value := range values {
proxyReq.Header.Add(header, value) proxyReq.Header.Add(header, value)
} }
@ -248,6 +270,7 @@ func (s3a *S3ApiServer) proxyToFiler(w http.ResponseWriter, r *http.Request, des
responseFn(resp, w) responseFn(resp, w)
} }
func passThroughResponse(proxyResponse *http.Response, w http.ResponseWriter) { func passThroughResponse(proxyResponse *http.Response, w http.ResponseWriter) {
for k, v := range proxyResponse.Header { for k, v := range proxyResponse.Header {
w.Header()[k] = v w.Header()[k] = v

Loading…
Cancel
Save