hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source
This commit is contained in:
Thulinma 2015-05-12 11:23:08 +02:00
commit e0c9173f9a
5 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/controller/controller_api.cpp
View file

@ -558,10 +558,7 @@ int Controller::handleAPIConnection(Socket::Connection & conn){
}
H.Clean();
H.SetHeader("Content-Type", "text/javascript");
H.SetHeader("Access-Control-Allow-Origin", "*");
H.SetHeader("Access-Control-Allow-Methods", "GET, POST");
H.SetHeader("Access-Control-Allow-Headers", "Content-Type, X-Requested-With");
H.SetHeader("Access-Control-Allow-Credentials", "true");
H.setCORSHeaders();
if (jsonp == ""){
H.SetBody(Response.toString() + "\n\n");
}else{