summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-03-16 04:20:52 +0000
committerGerrit Code Review <review@openstack.org>2021-03-16 04:20:52 +0000
commit310298a9484c1fb304e77c5d8e3214002a637c3d (patch)
tree2f1f69f3e7f1ee76e96651eb55ee68423c01157d /etc
parent2db4667759cef7104032a74c8da328b483211645 (diff)
parent27a734c78aabdbf04977a01039004e471feae30c (diff)
downloadswift-310298a9484c1fb304e77c5d8e3214002a637c3d.tar.gz
Merge "s3api: Allow CORS preflight requests"
Diffstat (limited to 'etc')
-rw-r--r--etc/proxy-server.conf-sample6
1 files changed, 6 insertions, 0 deletions
diff --git a/etc/proxy-server.conf-sample b/etc/proxy-server.conf-sample
index b474b27a3..434ed9c62 100644
--- a/etc/proxy-server.conf-sample
+++ b/etc/proxy-server.conf-sample
@@ -629,6 +629,12 @@ use = egg:swift#s3api
# AWS allows clock skew up to 15 mins; note that older versions of swift/swift3
# allowed at most 5 mins.
# allowable_clock_skew = 900
+#
+# CORS preflight requests don't contain enough information for us to
+# identify the account that should be used for the real request, so
+# the allowed origins must be set cluster-wide. (default: blank; all
+# preflight requests will be denied)
+# cors_preflight_allow_origin =
# You can override the default log routing for this filter here:
# log_name = s3api