diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-04-23 11:10:47 +1200 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2016-04-23 11:10:47 +1200 |
commit | 32f5c3ce86ed63ec880c31f337821285be52a94f (patch) | |
tree | 44854a63420dd9c8758a51cff748251cbe0b36d9 /src/org/traccar/api/CorsResponseFilter.java | |
parent | 3e8cde2edeac00c07ded5298e313d63c4c8c5b6c (diff) | |
download | trackermap-server-32f5c3ce86ed63ec880c31f337821285be52a94f.tar.gz trackermap-server-32f5c3ce86ed63ec880c31f337821285be52a94f.tar.bz2 trackermap-server-32f5c3ce86ed63ec880c31f337821285be52a94f.zip |
Fix issues with CORS requests
Diffstat (limited to 'src/org/traccar/api/CorsResponseFilter.java')
-rw-r--r-- | src/org/traccar/api/CorsResponseFilter.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/api/CorsResponseFilter.java b/src/org/traccar/api/CorsResponseFilter.java index 349580e2f..67d312504 100644 --- a/src/org/traccar/api/CorsResponseFilter.java +++ b/src/org/traccar/api/CorsResponseFilter.java @@ -47,9 +47,9 @@ public class CorsResponseFilter implements ContainerResponseFilter { String origin = request.getHeaderString(HttpHeaders.Names.ORIGIN); String allowed = Context.getConfig().getString("web.origin"); - if (allowed == null || origin == null) { + if (origin == null) { response.getHeaders().add(HttpHeaders.Names.ACCESS_CONTROL_ALLOW_ORIGIN, ORIGIN_ALL); - } else if (allowed.equals(ORIGIN_ALL) || allowed.contains(origin)) { + } else if (allowed == null || allowed.equals(ORIGIN_ALL) || allowed.contains(origin)) { response.getHeaders().add(HttpHeaders.Names.ACCESS_CONTROL_ALLOW_ORIGIN, origin); } } |