synced/tinode-chat
1
0
Fork 0
mirror of https://github.com/tinode/chat.git synced 2025-03-14 10:05:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/cors-for-upload-api' of https://github.com/markeloff86/tinode-chat into bugfix/cors-for-upload-api

Browse Source 
# Conflicts:
#	server/media/media.go
This commit is contained in:
Dmitry Markelov
2024-04-11 20:22:06 +07:00
parent 01a3c8ad9a e8137d41b7
commit 446c52574c
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/media/media.go
View File

@ -97,7 +97,7 @@ func matchCORSMethod(allowMethods []string, method string) bool {
return false
}
// CORSHandler is the default CORS processor for use by media handlers.
// CORSHandler is the default preflight OPTIONS processor for use by media handlers.
func CORSHandler(req *http.Request, allowedOrigins []string, serve bool) (http.Header, int) {
headers := map[string][]string{
// Always add Vary because of possible intermediate caches.

6
server/media/s3/s3.go
View File

@ -151,12 +151,8 @@ func (ah *awshandler) Init(jsconf string) error {
return err
}
// Headers redirects GET, HEAD requests to the AWS server.
// Headers redirects to the AWS server.
func (ah *awshandler) Headers(req *http.Request, serve bool) (http.Header, int, error) {
if req.Method == http.MethodPut || req.Method == http.MethodPost {
return nil, 0, nil
}
if headers, status := media.CORSHandler(req, ah.conf.CorsOrigins, serve); status != 0 {
return headers, status, nil
}