From: Aki Tuomi <cmouse@desteem.org>
Date: Sun, 1 Feb 2015 13:59:49 +0000 (+0200)
Subject: Remove OPTIONS from webWrapper
X-Git-Tag: rec-3.7.0-rc2~12^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F2155%2Fhead;p=thirdparty%2Fpdns.git

Remove OPTIONS from webWrapper
---

diff --git a/pdns/webserver.cc b/pdns/webserver.cc
index d4bfdedb3d..506c06af97 100644
--- a/pdns/webserver.cc
+++ b/pdns/webserver.cc
@@ -170,10 +170,6 @@ void WebServer::registerApiHandler(const string& url, HandlerFunction handler) {
 static void webWrapper(WebServer::HandlerFunction handler, HttpRequest* req, HttpResponse* resp) {
   const string& web_password = arg()["webserver-password"];
 
-  if (optionsHandler(req, resp)) return;
-
-  resp->headers["access-control-allow-origin"] = "*";
-
   if (!web_password.empty()) {
     bool auth_ok = req->compareAuthorization(web_password);
     if (!auth_ok) {