From 657e6b660aff0b1dfee81b2ed19dc31f8a0cc965 Mon Sep 17 00:00:00 2001 From: stephb9959 Date: Mon, 2 May 2022 11:27:28 -0700 Subject: [PATCH] Framework update. --- src/framework/MicroService.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/framework/MicroService.h b/src/framework/MicroService.h index 46c43d3..ddb0b50 100644 --- a/src/framework/MicroService.h +++ b/src/framework/MicroService.h @@ -2011,7 +2011,7 @@ namespace OpenWifi { return false; } - inline void AddCORS() { + inline void AddCORS(bool AddMethods=true) { auto Origin = Request->find("Origin"); if (Origin != Request->end()) { Response->set("Access-Control-Allow-Origin", Origin->second); @@ -2020,7 +2020,8 @@ namespace OpenWifi { Response->set("Access-Control-Allow-Origin", "*"); } Response->set("Access-Control-Allow-Headers", "*"); - Response->set("Access-Control-Allow-Methods", MakeList(Methods_)); + if(AddMethods) + Response->set("Access-Control-Allow-Methods", MakeList(Methods_)); Response->set("Access-Control-Max-Age", "86400"); } @@ -2034,13 +2035,14 @@ namespace OpenWifi { } else { Response->setKeepAlive(true); Response->set("Connection", "Keep-Alive"); - Response->set("Keep-Alive", "timeout=5, max=1000"); + Response->set("Keep-Alive", "timeout=30, max=1000"); } } inline void ProcessOptions() { - AddCORS(); + AddCORS(false); SetCommonHeaders(); + Response->set("Allow", MakeList(Methods_)); Response->set("Access-Control-Allow-Credentials", "true"); Response->setStatus(Poco::Net::HTTPResponse::HTTP_NO_CONTENT); Response->set("Vary", "Origin, Access-Control-Request-Headers, Access-Control-Request-Method");