diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-03-04 08:08:55 -0500 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-03-04 08:08:55 -0500 |
| commit | d1b1148ea8a0290a66ef7c75d1910c2558fa6186 (patch) | |
| tree | 50a696f00700fca4f82459a1a7475d7bba6fcc4c /utils | |
| parent | 763a477c3f5de5180d5302186e06d740f8834446 (diff) | |
| parent | 6b1abb404fc823be1bd0e2eeb21faaec25d03c99 (diff) | |
| download | chat-d1b1148ea8a0290a66ef7c75d1910c2558fa6186.tar.gz chat-d1b1148ea8a0290a66ef7c75d1910c2558fa6186.tar.bz2 chat-d1b1148ea8a0290a66ef7c75d1910c2558fa6186.zip | |
Merge pull request #2307 from ZBoxApp/PLT-2112
PLT-2112: Allow CORS
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/config.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/utils/config.go b/utils/config.go index 3e4ba5c5b..63906c345 100644 --- a/utils/config.go +++ b/utils/config.go @@ -236,5 +236,7 @@ func getClientConfig(c *model.Config) map[string]string { props["WebsocketPort"] = fmt.Sprintf("%v", *c.ServiceSettings.WebsocketPort) props["WebsocketSecurePort"] = fmt.Sprintf("%v", *c.ServiceSettings.WebsocketSecurePort) + props["AllowCorsFrom"] = *c.ServiceSettings.AllowCorsFrom + return props } |