Resolves conflict

Resolves conflict.
Optimizes _getEtag to use less memory.

Author: JosePineiro

src/AsyncWebServerRequest.cpp

@@ -69,25 +69,20 @@ void AsyncWebServerRequest::send(FS &fs, const String &path, const char *content
 bool AsyncWebServerRequest::_getEtag(File gzFile, char *etag) {
   static constexpr char hexChars[] = "0123456789ABCDEF";
 
-  // Compressed file not found or invalid
-  if (!gzFile.seek(gzFile.size() - 8)) {
+  if (!gzFile.seek(gzFile.size() - 8))
     return false;
-  }
-
-  uint8_t crcInTrailer[4];
-  gzFile.read(crcInTrailer, 4);
 
-  uint32_t data;
-  memcpy(&data, crcInTrailer, 4);
+  uint32_t crc;
+  gzFile.read(reinterpret_cast<uint8_t*>(&crc), sizeof(crc));
 
-  etag[0] = hexChars[(data >> 4) & 0x0F];
-  etag[1] = hexChars[data & 0x0F];
-  etag[2] = hexChars[(data >> 12) & 0x0F];
-  etag[3] = hexChars[(data >> 8) & 0x0F];
-  etag[4] = hexChars[(data >> 20) & 0x0F];
-  etag[5] = hexChars[(data >> 16) & 0x0F];
-  etag[6] = hexChars[(data >> 28)];
-  etag[7] = hexChars[(data >> 24) & 0x0F];
+  etag[0] = hexChars[(crc >> 4) & 0x0F];
+  etag[1] = hexChars[crc & 0x0F];
+  etag[2] = hexChars[(crc >> 12) & 0x0F];
+  etag[3] = hexChars[(crc >> 8) & 0x0F];
+  etag[4] = hexChars[(crc >> 20) & 0x0F];
+  etag[5] = hexChars[(crc >> 16) & 0x0F];
+  etag[6] = hexChars[(crc >> 28)];
+  etag[7] = hexChars[(crc >> 24) & 0x0F];
   etag[8] = '\0';
 
   return true;

src/WebResponses.cpp

@@ -6,17 +6,6 @@
 
 using namespace asyncsrv;
 
-// Since ESP8266 does not link memchr by default, here's its implementation.
-void *memchr(void *ptr, int ch, size_t count) {
-  unsigned char *p = static_cast<unsigned char *>(ptr);
-  while (count--) {
-    if (*p++ == static_cast<unsigned char>(ch)) {
-      return --p;
-    }
-  }
-  return nullptr;
-}
-
 /*
  * Abstract Response
  *
@@ -642,7 +631,7 @@ void AsyncFileResponse::_setContentTypeFromPath(const String &path) {
   const char *dot = strrchr(cpath, '.');
 
   if (!dot) {
-    _contentType = T_text_plain;
+    _contentType = T_application_octet_stream;
     return;
   }
 
@@ -674,20 +663,20 @@ void AsyncFileResponse::_setContentTypeFromPath(const String &path) {
     _contentType = T_font_woff;
   } else if (strcmp(dot, T__ttf) == 0) {
     _contentType = T_font_ttf;
-  } else if (strcmp(dot, T__eot) == 0) {
-    _contentType = T_font_eot;
   } else if (strcmp(dot, T__xml) == 0) {
     _contentType = T_text_xml;
   } else if (strcmp(dot, T__pdf) == 0) {
     _contentType = T_application_pdf;
   } else if (strcmp(dot, T__mp4) == 0) {
     _contentType = T_video_mp4;
-  } else if (strcmp(dot, T__zip) == 0) {
-    _contentType = T_application_zip;
-  } else if (strcmp(dot, T__gz) == 0) {
-    _contentType = T_application_x_gzip;
-  } else {
+  } else if (strcmp(dot, T__opus) == 0) {
+    _contentType = T_audio_opus;
+  } else if (strcmp(dot, T__webm) == 0) {
+    _contentType = T_video_webm;
+  } else if (strcmp(dot, T__txt) == 0) {
     _contentType = T_text_plain;
+  } else {
+    _contentType = T_application_octet_stream;
   }
 #endif
 }
@@ -707,14 +696,17 @@ void AsyncFileResponse::_setContentTypeFromPath(const String &path) {
  */
 AsyncFileResponse::AsyncFileResponse(FS &fs, const String &path, const char *contentType, bool download, AwsTemplateProcessor callback)
   : AsyncAbstractResponse(callback) {
+
   // Try to open the uncompressed version first
   _content = fs.open(path, fs::FileOpenMode::read);
-  if (_content.available()) {
-    _path = path;
-  } else {
-    // Try to open the compressed version (.gz)
-    _path = path + asyncsrv::T__gz;
-    _content = fs.open(_path, fs::FileOpenMode::read);
+  if (!_content.available()) {
+    // If not available try to open the compressed version (.gz)
+    String gzPath;
+    uint16_t pathLen = path.length();
+    gzPath.reserve(pathLen + 3);
+    gzPath.concat(path);
+    gzPath.concat(asyncsrv::T__gz);
+    _content = fs.open(gzPath, fs::FileOpenMode::read);
 
     char serverETag[9];
     if (AsyncWebServerRequest::_getEtag(_content, serverETag)) {
@@ -761,9 +753,8 @@ AsyncFileResponse::AsyncFileResponse(FS &fs, const String &path, const char *con
 AsyncFileResponse::AsyncFileResponse(File content, const String &path, const char *contentType, bool download, AwsTemplateProcessor callback)
   : AsyncAbstractResponse(callback) {
   _code = 200;
-  _path = path;
 
-  if (!download && String(content.name()).endsWith(T__gz) && !path.endsWith(T__gz)) {
+  if (String(content.name()).endsWith(T__gz) && !path.endsWith(T__gz)) {
     addHeader(T_Content_Encoding, T_gzip, false);
     _callback = nullptr;  // Unable to process gzipped templates
     _sendContentLength = true;