allow http.MethodOptions in s3.Headers call

kawais · Jun 9, 2021 · dac788c · dac788c
1 parent fa18e36
commit dac788c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/server/media/fs/filesys.go b/server/media/fs/filesys.go
@@ -77,9 +77,9 @@ func (fh *fshandler) Headers(req *http.Request, serve bool) (map[string]string,
 	}
 	var allowMethods string
 	if serve {
-		allowMethods = "GET, HEAD, OPTIONS"
+		allowMethods = "GET,HEAD,OPTIONS"
 	} else {
-		allowMethods = "POST, PUT, HEAD, OPTIONS"
+		allowMethods = "POST,PUT,HEAD,OPTIONS"
 	}
 	return map[string]string{
 		"Access-Control-Allow-Origin":  allowedOrigin,

diff --git a/server/media/s3/s3.go b/server/media/s3/s3.go
@@ -146,8 +146,7 @@ func (ah *awshandler) Init(jsconf string) error {
 
 // Headers redirects GET, HEAD requests to the AWS server.
 func (ah *awshandler) Headers(req *http.Request, serve bool) (map[string]string, int, error) {
-
-	if req.Method == http.MethodPut || req.Method == http.MethodPost {
+	if req.Method == http.MethodPut || req.Method == http.MethodPost || req.Method == http.MethodOptions {
 		return nil, 0, nil
 	}