mirror of
https://github.com/gnh1201/welsonjs.git
synced 2025-10-27 11:01:16 +00:00
Merge branch 'dev' of https://github.com/gnh1201/welsonjs into dev
This commit is contained in:
commit
cd3e18a4c1
|
|
@ -514,15 +514,16 @@ namespace WelsonJS.Launcher
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
var respHeaders = context.Response.Headers;
|
var respHeaders = context.Response.Headers;
|
||||||
respHeaders["Vary"] = "Origin";
|
|
||||||
|
|
||||||
if (allowed.Any(a => a == "*"))
|
if (allowed.Any(a => a == "*"))
|
||||||
{
|
{
|
||||||
respHeaders["Access-Control-Allow-Origin"] = "*";
|
respHeaders["Access-Control-Allow-Origin"] = "*";
|
||||||
|
respHeaders["Vary"] = "Origin";
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (allowed.Contains(origin, StringComparer.OrdinalIgnoreCase))
|
if (allowed.Contains(origin, StringComparer.OrdinalIgnoreCase))
|
||||||
|
if (allowed.Contains(origin, StringComparer.Ordinal))
|
||||||
{
|
{
|
||||||
respHeaders["Access-Control-Allow-Origin"] = origin;
|
respHeaders["Access-Control-Allow-Origin"] = origin;
|
||||||
respHeaders["Access-Control-Allow-Credentials"] = "true";
|
respHeaders["Access-Control-Allow-Credentials"] = "true";
|
||||||
|
|
@ -547,12 +548,8 @@ namespace WelsonJS.Launcher
|
||||||
var requestMethod = context.Request.Headers["Access-Control-Request-Method"];
|
var requestMethod = context.Request.Headers["Access-Control-Request-Method"];
|
||||||
|
|
||||||
var h = context.Response.Headers;
|
var h = context.Response.Headers;
|
||||||
h["Access-Control-Allow-Methods"] = string.IsNullOrEmpty(requestMethod)
|
h["Access-Control-Allow-Methods"] = "GET, POST, PUT, DELETE, OPTIONS";
|
||||||
? "GET, POST, PUT, DELETE, OPTIONS"
|
h["Access-Control-Allow-Headers"] = "Content-Type, Authorization, X-Requested-With";
|
||||||
: requestMethod;
|
|
||||||
h["Access-Control-Allow-Headers"] = string.IsNullOrEmpty(requestHeaders)
|
|
||||||
? "Content-Type, Authorization, X-Requested-With"
|
|
||||||
: requestHeaders;
|
|
||||||
h["Access-Control-Max-Age"] = "600";
|
h["Access-Control-Max-Age"] = "600";
|
||||||
|
|
||||||
context.Response.StatusCode = 204;
|
context.Response.StatusCode = 204;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user