From de5c65eb3854776840690a80cf8b3cf8aaf2c7b9 Mon Sep 17 00:00:00 2001
From: Alexander <4nonym0us@xakep.ru>
Date: Thu, 25 Feb 2016 13:16:43 +0200
Subject: #1751 Bugfix in old API

---
 src/org/traccar/web/BaseServlet.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/traccar/web/BaseServlet.java b/src/org/traccar/web/BaseServlet.java
index 8b022d556..17f4f19cd 100644
--- a/src/org/traccar/web/BaseServlet.java
+++ b/src/org/traccar/web/BaseServlet.java
@@ -53,7 +53,7 @@ public abstract class BaseServlet extends HttpServlet {
 
             String origin = req.getHeader(HttpHeaders.Names.ORIGIN);
             String allowed = Context.getConfig().getString("web.origin");
-            if (allowed == null) {
+            if (allowed == null || origin == null) {
                 resp.setHeader(HttpHeaders.Names.ACCESS_CONTROL_ALLOW_ORIGIN, ALLOW_ORIGIN_VALUE);
             } else if (allowed.contains(origin)) {
                 String originSafe = URLEncoder.encode(origin, StandardCharsets.UTF_8.name());
-- 
cgit v1.2.3