From 002443ba33bbf9883d54505119c5361897d30f66 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sat, 27 Feb 2016 10:31:22 +1300
Subject: Merge changes from RS-CORS-Origin

---
 src/org/traccar/api/SecurityRequestFilter.java | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/org/traccar/api/SecurityRequestFilter.java')

diff --git a/src/org/traccar/api/SecurityRequestFilter.java b/src/org/traccar/api/SecurityRequestFilter.java
index 20186b0cb..d4fb15059 100644
--- a/src/org/traccar/api/SecurityRequestFilter.java
+++ b/src/org/traccar/api/SecurityRequestFilter.java
@@ -55,6 +55,11 @@ public class SecurityRequestFilter implements ContainerRequestFilter {
 
     @Override
     public void filter(ContainerRequestContext requestContext) {
+
+        if (requestContext.getMethod() == "OPTIONS") {
+            throw new WebApplicationException(Response.status(Response.Status.OK).entity("").build());
+        }
+
         SecurityContext securityContext = null;
 
         String authHeader = requestContext.getHeaderString(AUTHORIZATION_HEADER);
-- 
cgit v1.2.3