aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
authorKevin Decherf <kevin@kdecherf.com>2019-02-13 15:05:57 +0100
committerGitHub <noreply@github.com>2019-02-13 15:05:57 +0100
commitb1992b340e21b6846a1ec2ae6ddd7217f3b24fb5 (patch)
treec8c5ab6b1354782c82139a12372c3532001124fd /app
parent47e47841105a34c852744e207b4a0ea9e879ec49 (diff)
parent44560c77677d1d2a0eda0bf63f56c9dff033744f (diff)
downloadwallabag-b1992b340e21b6846a1ec2ae6ddd7217f3b24fb5.tar.gz
wallabag-b1992b340e21b6846a1ec2ae6ddd7217f3b24fb5.tar.zst
wallabag-b1992b340e21b6846a1ec2ae6ddd7217f3b24fb5.zip
Merge pull request #3882 from wallabag/fix/cors
Fix CORS for API
Diffstat (limited to 'app')
-rw-r--r--app/config/config.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/config/config.yml b/app/config/config.yml
index 0c2b6a1d..8bef8312 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -147,18 +147,18 @@ nelmio_cors:
147 paths: 147 paths:
148 '^/api/': 148 '^/api/':
149 allow_origin: ['*'] 149 allow_origin: ['*']
150 allow_headers: ['X-Custom-Auth'] 150 allow_headers: ['Authorization','content-type']
151 allow_methods: ['POST', 'PUT', 'PATCH','GET', 'DELETE'] 151 allow_methods: ['POST', 'PUT', 'PATCH','GET', 'DELETE']
152 max_age: 3600 152 max_age: 3600
153 '^/oauth/': 153 '^/oauth/':
154 allow_origin: ['*'] 154 allow_origin: ['*']
155 allow_headers: ['X-Custom-Auth'] 155 allow_headers: ['Authorization','content-type']
156 allow_methods: ['POST', 'PUT', 'GET', 'DELETE'] 156 allow_methods: ['POST', 'PUT', 'GET', 'DELETE']
157 max_age: 3600 157 max_age: 3600
158 '^/': 158 '^/':
159 #origin_regex: true 159 #origin_regex: true
160 allow_origin: ['^http://localhost:[0-9]+'] 160 allow_origin: ['*']
161 allow_headers: ['X-Custom-Auth'] 161 allow_headers: ['Authorization','content-type']
162 allow_methods: ['POST', 'PUT', 'GET', 'DELETE'] 162 allow_methods: ['POST', 'PUT', 'GET', 'DELETE']
163 max_age: 3600 163 max_age: 3600
164 hosts: ['^api\.'] 164 hosts: ['^api\.']