mirror of
https://github.com/discourse/discourse.git
synced 2024-11-22 10:57:04 +08:00
FEATURE: Add setting to controle the Expect header on S3 calls
Some providers don't implement the Expect: 100-continue support, which results in a mismatch in the object signature. With this settings, users can disable the header and use such providers.
This commit is contained in:
parent
45f704906d
commit
08e4af6636
|
@ -196,6 +196,7 @@ s3_secret_access_key =
|
|||
s3_use_iam_profile =
|
||||
s3_cdn_url =
|
||||
s3_endpoint =
|
||||
s3_http_continue_timeout =
|
||||
|
||||
### rate limits apply to all sites
|
||||
max_user_api_reqs_per_minute = 20
|
||||
|
|
|
@ -1202,6 +1202,9 @@ files:
|
|||
s3_endpoint:
|
||||
default: ""
|
||||
regex: '^https?:\/\/.+[^\/]$'
|
||||
s3_http_continue_timeout:
|
||||
default: 1
|
||||
hidden: true
|
||||
s3_cdn_url:
|
||||
default: ""
|
||||
regex: '^https?:\/\/.+[^\/]$'
|
||||
|
|
|
@ -204,6 +204,7 @@ class S3Helper
|
|||
}
|
||||
|
||||
opts[:endpoint] = SiteSetting.s3_endpoint if SiteSetting.s3_endpoint.present?
|
||||
opts[:http_continue_timeout] = SiteSetting.s3_http_continue_timeout
|
||||
|
||||
unless obj.s3_use_iam_profile
|
||||
opts[:access_key_id] = obj.s3_access_key_id
|
||||
|
|
Loading…
Reference in New Issue
Block a user