From 5bbc7320284e543209991cecf099602bc4415bf8 Mon Sep 17 00:00:00 2001
From: Me No Dev <me-no-dev@vdnsbg.com>
Date: Fri, 17 Jun 2016 17:41:06 +0300
Subject: [PATCH] remove Access-Control-Allow-Origin

---
 src/WebResponses.cpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/WebResponses.cpp b/src/WebResponses.cpp
index 3cdfbb8..b1de8a6 100644
--- a/src/WebResponses.cpp
+++ b/src/WebResponses.cpp
@@ -158,7 +158,6 @@ AsyncBasicResponse::AsyncBasicResponse(int code, String contentType, String cont
       _contentType = "text/plain";
   }
   addHeader("Connection","close");
-  addHeader("Access-Control-Allow-Origin","*");
 }
 
 void AsyncBasicResponse::_respond(AsyncWebServerRequest *request){
@@ -228,7 +227,6 @@ size_t AsyncBasicResponse::_ack(AsyncWebServerRequest *request, size_t len, uint
 
 void AsyncAbstractResponse::_respond(AsyncWebServerRequest *request){
   addHeader("Connection","close");
-  addHeader("Access-Control-Allow-Origin","*");
   _head = _assembleHead(request->version());
   _state = RESPONSE_HEADERS;
   _ack(request, 0, 0);
@@ -349,19 +347,22 @@ void AsyncFileResponse::_setContentType(String path){
 AsyncFileResponse::AsyncFileResponse(FS &fs, String path, String contentType, bool download){
   _code = 200;
   _path = path;
-  int filenameStart = path.lastIndexOf('/') + 1;
-  char buf[26+path.length()-filenameStart];
-  char* filename = (char*)path.c_str() + filenameStart;
-
+  _content = fs.open(_path, "r");
+  _contentLength = _content.size();
+  
   if(!download && !fs.exists(_path) && fs.exists(_path+".gz")){
     _path = _path+".gz";
     addHeader("Content-Encoding", "gzip");
   }
-
+  
   if(contentType == "")
     _setContentType(path);
   else
     _contentType = contentType;
+  
+  int filenameStart = path.lastIndexOf('/') + 1;
+  char buf[26+path.length()-filenameStart];
+  char* filename = (char*)path.c_str() + filenameStart;
 
   if(download) {
     // set filename and force download
@@ -372,26 +373,25 @@ AsyncFileResponse::AsyncFileResponse(FS &fs, String path, String contentType, bo
   }
   addHeader("Content-Disposition", buf);
 
-  _content = fs.open(_path, "r");
-  _contentLength = _content.size();
 }
 
 AsyncFileResponse::AsyncFileResponse(File content, String path, String contentType, bool download){
   _code = 200;
-  _content = content;
   _path = path;
+  _content = content;
   _contentLength = _content.size();
-  int filenameStart = _path.lastIndexOf('/') + 1;
-  char buf[26+_path.length()-filenameStart];
-  char* filename = (char*)_path.c_str() + filenameStart;
-
+  
   if(!download && String(_content.name()).endsWith(".gz"))
     addHeader("Content-Encoding", "gzip");
-
+  
   if(contentType == "")
-    _setContentType(_path);
+    _setContentType(path);
   else
     _contentType = contentType;
+  
+  int filenameStart = path.lastIndexOf('/') + 1;
+  char buf[26+path.length()-filenameStart];
+  char* filename = (char*)path.c_str() + filenameStart;
 
   if(download) {
     snprintf(buf, sizeof (buf), "attachment; filename=\"%s\"", filename);