diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000..0a5f914
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,129 @@
+
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+https://sidweb.nl/cms3/en/contact.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.
diff --git a/README.md b/README.md
index 6ca1d1e..6618c74 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,12 @@
 
 [![License: LGPL 3.0](https://img.shields.io/badge/License-LGPL%203.0-yellow.svg)](https://opensource.org/license/lgpl-3-0/)
 [![Continuous Integration](https://github.com/mathieucarbou/ESPAsyncWebServer/actions/workflows/ci.yml/badge.svg)](https://github.com/mathieucarbou/ESPAsyncWebServer/actions/workflows/ci.yml)
+
+[![Latest Release](https://img.shields.io/github/release/mathieucarbou/ESPAsyncWebServer.svg)](https://GitHub.com/mathieucarbou/ESPAsyncWebServer/releases/)
 [![PlatformIO Registry](https://badges.registry.platformio.org/packages/mathieucarbou/library/ESPAsyncWebServer.svg)](https://registry.platformio.org/libraries/mathieucarbou/ESPAsyncWebServer)
 
+[![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/mathieucarbou/ESPAsyncWebServer)
+
 Asynchronous HTTP and WebSocket Server Library for ESP32, ESP8266 and RP2040
 Supports: WebSocket, SSE, Authentication, Arduino Json 7, File Upload, Static File serving, URL Rewrite, URL Redirect, etc.
 
@@ -14,7 +18,7 @@ This fork is based on [yubox-node-org/ESPAsyncWebServer](https://github.com/yubo
 **WARNING** The library name was changed from `ESP Async WebServer` to `ESPAsyncWebServer` as per the Arduino Lint recommendations.
 
 ```
-mathieucarbou/ESPAsyncWebServer @ 3.1.5
+mathieucarbou/ESPAsyncWebServer @ 3.2.0
 ```
 
 Dependency:
diff --git a/docs/index.md b/docs/index.md
index 6ca1d1e..6618c74 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -2,8 +2,12 @@
 
 [![License: LGPL 3.0](https://img.shields.io/badge/License-LGPL%203.0-yellow.svg)](https://opensource.org/license/lgpl-3-0/)
 [![Continuous Integration](https://github.com/mathieucarbou/ESPAsyncWebServer/actions/workflows/ci.yml/badge.svg)](https://github.com/mathieucarbou/ESPAsyncWebServer/actions/workflows/ci.yml)
+
+[![Latest Release](https://img.shields.io/github/release/mathieucarbou/ESPAsyncWebServer.svg)](https://GitHub.com/mathieucarbou/ESPAsyncWebServer/releases/)
 [![PlatformIO Registry](https://badges.registry.platformio.org/packages/mathieucarbou/library/ESPAsyncWebServer.svg)](https://registry.platformio.org/libraries/mathieucarbou/ESPAsyncWebServer)
 
+[![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/mathieucarbou/ESPAsyncWebServer)
+
 Asynchronous HTTP and WebSocket Server Library for ESP32, ESP8266 and RP2040
 Supports: WebSocket, SSE, Authentication, Arduino Json 7, File Upload, Static File serving, URL Rewrite, URL Redirect, etc.
 
@@ -14,7 +18,7 @@ This fork is based on [yubox-node-org/ESPAsyncWebServer](https://github.com/yubo
 **WARNING** The library name was changed from `ESP Async WebServer` to `ESPAsyncWebServer` as per the Arduino Lint recommendations.
 
 ```
-mathieucarbou/ESPAsyncWebServer @ 3.1.5
+mathieucarbou/ESPAsyncWebServer @ 3.2.0
 ```
 
 Dependency:
diff --git a/examples/CaptivePortal/CaptivePortal.ino b/examples/CaptivePortal/CaptivePortal.ino
index 2d0de89..2cc5851 100644
--- a/examples/CaptivePortal/CaptivePortal.ino
+++ b/examples/CaptivePortal/CaptivePortal.ino
@@ -29,7 +29,9 @@ class CaptiveRequestHandler : public AsyncWebHandler {
       response->print("<!DOCTYPE html><html><head><title>Captive Portal</title></head><body>");
       response->print("<p>This is out captive portal front page.</p>");
       response->printf("<p>You were trying to reach: http://%s%s</p>", request->host().c_str(), request->url().c_str());
+#ifndef CONFIG_IDF_TARGET_ESP32H2
       response->printf("<p>Try opening <a href='http://%s'>this link</a> instead</p>", WiFi.softAPIP().toString().c_str());
+#endif
       response->print("</body></html>");
       request->send(response);
     }
@@ -40,6 +42,7 @@ void setup() {
   Serial.println();
   Serial.println("Configuring access point...");
 
+#ifndef CONFIG_IDF_TARGET_ESP32H2
   if (!WiFi.softAP("esp-captive")) {
     Serial.println("Soft AP creation failed.");
     while (1)
@@ -47,6 +50,8 @@ void setup() {
   }
 
   dnsServer.start(53, "*", WiFi.softAPIP());
+#endif
+
   server.addHandler(new CaptiveRequestHandler()).setFilter(ON_AP_FILTER); // only when requested from AP
   // more handlers...
   server.begin();
diff --git a/examples/Filters/Filters.ino b/examples/Filters/Filters.ino
index f031a1f..b7bbcff 100644
--- a/examples/Filters/Filters.ino
+++ b/examples/Filters/Filters.ino
@@ -31,7 +31,9 @@ class CaptiveRequestHandler : public AsyncWebHandler {
       response->print("<!DOCTYPE html><html><head><title>Captive Portal</title></head><body>");
       response->print("<p>This is out captive portal front page.</p>");
       response->printf("<p>You were trying to reach: http://%s%s</p>", request->host().c_str(), request->url().c_str());
+#ifndef CONFIG_IDF_TARGET_ESP32H2
       response->printf("<p>Try opening <a href='http://%s'>this link</a> instead</p>", WiFi.softAPIP().toString().c_str());
+#endif
       response->print("</body></html>");
       request->send(response);
     }
@@ -46,15 +48,21 @@ void setup() {
   server
     .on("/", HTTP_GET, [](AsyncWebServerRequest* request) {
       Serial.println("Captive portal request...");
+#ifndef CONFIG_IDF_TARGET_ESP32H2
       Serial.println("WiFi.localIP(): " + WiFi.localIP().toString());
+#endif
       Serial.println("request->client()->localIP(): " + request->client()->localIP().toString());
 #if ESP_IDF_VERSION_MAJOR >= 5
+  #ifndef CONFIG_IDF_TARGET_ESP32H2
       Serial.println("WiFi.type(): " + String((int)WiFi.localIP().type()));
+  #endif
       Serial.println("request->client()->type(): " + String((int)request->client()->localIP().type()));
 #endif
+#ifndef CONFIG_IDF_TARGET_ESP32H2
       Serial.println(WiFi.localIP() == request->client()->localIP() ? "should be: ON_STA_FILTER" : "should be: ON_AP_FILTER");
       Serial.println(WiFi.localIP() == request->client()->localIP());
       Serial.println(WiFi.localIP().toString() == request->client()->localIP().toString());
+#endif
       request->send(200, "text/plain", "This is the captive portal");
       hit1 = true;
     })
@@ -63,15 +71,21 @@ void setup() {
   server
     .on("/", HTTP_GET, [](AsyncWebServerRequest* request) {
       Serial.println("Website request...");
+#ifndef CONFIG_IDF_TARGET_ESP32H2
       Serial.println("WiFi.localIP(): " + WiFi.localIP().toString());
+#endif
       Serial.println("request->client()->localIP(): " + request->client()->localIP().toString());
 #if ESP_IDF_VERSION_MAJOR >= 5
+  #ifndef CONFIG_IDF_TARGET_ESP32H2
       Serial.println("WiFi.type(): " + String((int)WiFi.localIP().type()));
+  #endif
       Serial.println("request->client()->type(): " + String((int)request->client()->localIP().type()));
 #endif
+#ifndef CONFIG_IDF_TARGET_ESP32H2
       Serial.println(WiFi.localIP() == request->client()->localIP() ? "should be: ON_STA_FILTER" : "should be: ON_AP_FILTER");
       Serial.println(WiFi.localIP() == request->client()->localIP());
       Serial.println(WiFi.localIP().toString() == request->client()->localIP().toString());
+#endif
       request->send(200, "text/plain", "This is the website");
       hit2 = true;
     })
@@ -92,12 +106,15 @@ void setup() {
   // dnsServer.stop();
   // WiFi.softAPdisconnect();
 
+#ifndef CONFIG_IDF_TARGET_ESP32H2
   WiFi.persistent(false);
   WiFi.begin("IoT");
   while (WiFi.status() != WL_CONNECTED) {
     delay(500);
   }
   Serial.println("Connected to WiFi with IP address: " + WiFi.localIP().toString());
+#endif
+
   server.begin();
 
   // while (!hit2) {
diff --git a/examples/SimpleServer/SimpleServer.ino b/examples/SimpleServer/SimpleServer.ino
index f3a1605..2119242 100644
--- a/examples/SimpleServer/SimpleServer.ino
+++ b/examples/SimpleServer/SimpleServer.ino
@@ -22,6 +22,7 @@
 #include <ArduinoJson.h>
 #include <AsyncJson.h>
 #include <AsyncMessagePack.h>
+#include <LittleFS.h>
 
 AsyncWebServer server(80);
 
@@ -38,6 +39,7 @@ void setup() {
 
   Serial.begin(115200);
 
+#ifndef CONFIG_IDF_TARGET_ESP32H2
   // WiFi.mode(WIFI_STA);
   // WiFi.begin("YOUR_SSID", "YOUR_PASSWORD");
   // if (WiFi.waitForConnectResult() != WL_CONNECTED) {
@@ -49,11 +51,37 @@ void setup() {
 
   WiFi.mode(WIFI_AP);
   WiFi.softAP("esp-captive");
+#endif
 
   server.on("/", HTTP_GET, [](AsyncWebServerRequest* request) {
     request->send(200, "text/plain", "Hello, world");
   });
 
+  server.on("/file", HTTP_GET, [](AsyncWebServerRequest* request) {
+    request->send(LittleFS, "/index.html");
+  });
+
+  /*
+    ❯ curl -I -X HEAD http://192.168.4.1/download
+    HTTP/1.1 200 OK
+    Content-Length: 1024
+    Content-Type: application/octet-stream
+    Connection: close
+    Accept-Ranges: bytes
+  */
+ // Ref: https://github.com/mathieucarbou/ESPAsyncWebServer/pull/80
+  server.on("/download", HTTP_HEAD | HTTP_GET, [](AsyncWebServerRequest* request) {
+    if (request->method() == HTTP_HEAD) {
+      AsyncWebServerResponse* response = request->beginResponse(200, "application/octet-stream");
+      response->setContentLength(1024); // myFile.getSize()
+      response->addHeader("Accept-Ranges", "bytes");
+      // ...
+      request->send(response);
+    } else {
+      // ...
+    }
+  });
+
   // Send a GET request to <IP>/get?message=<message>
   server.on("/get", HTTP_GET, [](AsyncWebServerRequest* request) {
     String message;
diff --git a/examples/StreamFiles/StreamFiles.ino b/examples/StreamFiles/StreamFiles.ino
index 2a2c1b6..508298d 100644
--- a/examples/StreamFiles/StreamFiles.ino
+++ b/examples/StreamFiles/StreamFiles.ino
@@ -23,9 +23,12 @@ void setup() {
 
   LittleFS.begin();
 
+#ifndef CONFIG_IDF_TARGET_ESP32H2
   WiFi.mode(WIFI_AP);
   WiFi.softAP("esp-captive");
+
   dnsServer.start(53, "*", WiFi.softAPIP());
+#endif
 
   File file1 = LittleFS.open("/header.html", "w");
   file1.print("<html><head><title>ESP Captive Portal</title><meta http-equiv=\"refresh\" content=\"1\"></head><body>");
diff --git a/library.json_ b/library.json_
index eb946c6..f2a6ed0 100644
--- a/library.json_
+++ b/library.json_
@@ -1,6 +1,6 @@
 {
   "name": "ESPAsyncWebServer",
-  "version": "3.1.5",
+  "version": "3.2.0",
   "description": "Asynchronous HTTP and WebSocket Server Library for ESP32, ESP8266 and RP2040. Supports: WebSocket, SSE, Authentication, Arduino Json 7, File Upload, Static File serving, URL Rewrite, URL Redirect, etc.",
   "keywords": "http,async,websocket,webserver",
   "homepage": "https://github.com/mathieucarbou/ESPAsyncWebServer",
diff --git a/library.properties b/library.properties
index 3036044..46dac86 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=ESPAsyncWebServer
-version=3.1.5
+version=3.2.0
 author=Me-No-Dev
 maintainer=Mathieu Carbou <mathieu.carbou@gmail.com>
 sentence=Asynchronous HTTP and WebSocket Server Library for ESP32, ESP8266 and RP2040
diff --git a/platformio.ini b/platformio.ini
index 6f68d0d..6ac85dd 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -78,3 +78,10 @@ board = esp32-c6-devkitc-1
 lib_deps = 
   bblanchon/ArduinoJson @ 7.1.0
   mathieucarbou/AsyncTCP @ 3.2.4
+
+[env:pioarduino-h2]
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/51.03.04/platform-espressif32.zip
+board = esp32-h2-devkitm-1
+lib_deps = 
+  bblanchon/ArduinoJson @ 7.1.0
+  mathieucarbou/AsyncTCP @ 3.2.4
diff --git a/src/ESPAsyncWebServer.h b/src/ESPAsyncWebServer.h
index de08bc0..d0790d5 100644
--- a/src/ESPAsyncWebServer.h
+++ b/src/ESPAsyncWebServer.h
@@ -45,10 +45,10 @@
 
 #include "literals.h"
 
-#define ASYNCWEBSERVER_VERSION          "3.1.5"
+#define ASYNCWEBSERVER_VERSION          "3.2.0"
 #define ASYNCWEBSERVER_VERSION_MAJOR    3
-#define ASYNCWEBSERVER_VERSION_MINOR    1
-#define ASYNCWEBSERVER_VERSION_REVISION 5
+#define ASYNCWEBSERVER_VERSION_MINOR    2
+#define ASYNCWEBSERVER_VERSION_REVISION 0
 #define ASYNCWEBSERVER_FORK_mathieucarbou
 
 #ifdef ASYNCWEBSERVER_REGEX
@@ -314,7 +314,7 @@ class AsyncWebServerRequest {
       } else
         send(404);
     }
-    void send(FS& fs, const String& path, const String& contentType = emptyString, bool download = false, AwsTemplateProcessor callback = nullptr) { send(fs, path, contentType.c_str(), download, callback); }
+    void send(FS& fs, const String& path, const String& contentType, bool download = false, AwsTemplateProcessor callback = nullptr) { send(fs, path, contentType.c_str(), download, callback); }
 
     void send(File content, const String& path, const char* contentType = asyncsrv::empty, bool download = false, AwsTemplateProcessor callback = nullptr) {
       if (content) {
@@ -322,7 +322,7 @@ class AsyncWebServerRequest {
       } else
         send(404);
     }
-    void send(File content, const String& path, const String& contentType = emptyString, bool download = false, AwsTemplateProcessor callback = nullptr) { send(content, path, contentType.c_str(), download, callback); }
+    void send(File content, const String& path, const String& contentType, bool download = false, AwsTemplateProcessor callback = nullptr) { send(content, path, contentType.c_str(), download, callback); }
 
     void send(Stream& stream, const char* contentType, size_t len, AwsTemplateProcessor callback = nullptr) { send(beginResponse(stream, contentType, len, callback)); }
     void send(Stream& stream, const String& contentType, size_t len, AwsTemplateProcessor callback = nullptr) { send(beginResponse(stream, contentType, len, callback)); }
@@ -581,8 +581,9 @@ class AsyncWebServerResponse {
     virtual void setContentLength(size_t len);
     void setContentType(const String& type) { setContentType(type.c_str()); }
     virtual void setContentType(const char* type);
-    virtual void addHeader(const char* name, const char* value);
-    void addHeader(const String& name, const String& value) { addHeader(name.c_str(), value.c_str()); }
+    virtual bool addHeader(const char* name, const char* value, bool replaceExisting = true);
+    bool addHeader(const String& name, const String& value, bool replaceExisting = true) { return addHeader(name.c_str(), value.c_str(), replaceExisting); }
+    virtual bool removeHeader(const char* name);
     virtual String _assembleHead(uint8_t version);
     virtual bool _started() const;
     virtual bool _finished() const;
diff --git a/src/WebResponses.cpp b/src/WebResponses.cpp
index f1994b1..af9c349 100644
--- a/src/WebResponses.cpp
+++ b/src/WebResponses.cpp
@@ -239,18 +239,43 @@ void AsyncWebServerResponse::setContentType(const char* type) {
     _contentType = type;
 }
 
-void AsyncWebServerResponse::addHeader(const char* name, const char* value) {
+bool AsyncWebServerResponse::removeHeader(const char* name) {
+  for (auto i = _headers.begin(); i != _headers.end(); ++i) {
+    if (i->name().equalsIgnoreCase(name)) {
+      _headers.erase(i);
+      return true;
+    }
+  }
+  return false;
+}
+
+bool AsyncWebServerResponse::addHeader(const char* name, const char* value, bool replaceExisting) {
+  for (auto i = _headers.begin(); i != _headers.end(); ++i) {
+    if (i->name().equalsIgnoreCase(name)) {
+      // header already set
+      if (replaceExisting) {
+        // remove, break and add the new one
+        _headers.erase(i);
+        break;
+      } else {
+        // do not update
+        return false;
+      }
+    }
+  }
+  // header was not found found, or existing one was removed
   _headers.emplace_back(name, value);
+  return true;
 }
 
 String AsyncWebServerResponse::_assembleHead(uint8_t version) {
   if (version) {
-    addHeader(T_Accept_Ranges, T_none);
+    addHeader(T_Accept_Ranges, T_none, false);
     if (_chunked)
-      addHeader(Transfer_Encoding, T_chunked);
+      addHeader(T_Transfer_Encoding, T_chunked, false);
   }
   String out;
-  int bufSize = 300;
+  constexpr size_t bufSize = 300;
   char buf[bufSize];
 
 #ifndef ESP8266
@@ -307,7 +332,7 @@ AsyncBasicResponse::AsyncBasicResponse(int code, const char* contentType, const
     if (!_contentType.length())
       _contentType = T_text_plain;
   }
-  addHeader(T_Connection, T_close);
+  addHeader(T_Connection, T_close, false);
 }
 
 void AsyncBasicResponse::_respond(AsyncWebServerRequest* request) {
@@ -385,7 +410,7 @@ AsyncAbstractResponse::AsyncAbstractResponse(AwsTemplateProcessor callback) : _c
 }
 
 void AsyncAbstractResponse::_respond(AsyncWebServerRequest* request) {
-  addHeader(T_Connection, T_close);
+  addHeader(T_Connection, T_close, false);
   _head = _assembleHead(request->version());
   _state = RESPONSE_HEADERS;
   _ack(request, 0, 0);
@@ -663,7 +688,7 @@ AsyncFileResponse::AsyncFileResponse(FS& fs, const String& path, const char* con
 
   if (!download && !fs.exists(_path) && fs.exists(_path + T__gz)) {
     _path = _path + T__gz;
-    addHeader(T_Content_Encoding, T_gzip);
+    addHeader(T_Content_Encoding, T_gzip, false);
     _callback = nullptr; // Unable to process zipped templates
     _sendContentLength = true;
     _chunked = false;
@@ -688,7 +713,7 @@ AsyncFileResponse::AsyncFileResponse(FS& fs, const String& path, const char* con
     // set filename and force rendering
     snprintf_P(buf, sizeof(buf), PSTR("inline"));
   }
-  addHeader(T_Content_Disposition, buf);
+  addHeader(T_Content_Disposition, buf, false);
 }
 
 AsyncFileResponse::AsyncFileResponse(File content, const String& path, const char* contentType, bool download, AwsTemplateProcessor callback) : AsyncAbstractResponse(callback) {
@@ -696,7 +721,7 @@ AsyncFileResponse::AsyncFileResponse(File content, const String& path, const cha
   _path = path;
 
   if (!download && String(content.name()).endsWith(T__gz) && !path.endsWith(T__gz)) {
-    addHeader(T_Content_Encoding, T_gzip);
+    addHeader(T_Content_Encoding, T_gzip, false);
     _callback = nullptr; // Unable to process gzipped templates
     _sendContentLength = true;
     _chunked = false;
@@ -719,7 +744,7 @@ AsyncFileResponse::AsyncFileResponse(File content, const String& path, const cha
   } else {
     snprintf_P(buf, sizeof(buf), PSTR("inline"));
   }
-  addHeader(T_Content_Disposition, buf);
+  addHeader(T_Content_Disposition, buf, false);
 }
 
 size_t AsyncFileResponse::_fillBuffer(uint8_t* data, size_t len) {
diff --git a/src/literals.h b/src/literals.h
index 8a7293b..40b596a 100644
--- a/src/literals.h
+++ b/src/literals.h
@@ -41,7 +41,7 @@ static constexpr const char* T_none             = "none";
 static constexpr const char* T_UPGRADE          = "Upgrade";
 static constexpr const char* T_WS               = "websocket";
 static constexpr const char* T_WWW_AUTH         = "WWW-Authenticate";
-static constexpr const char* Transfer_Encoding  = "Transfer-Encoding";
+static constexpr const char* T_Transfer_Encoding = "Transfer-Encoding";
 
 // HTTP Methods
 static constexpr const char* T_ANY      = "ANY";
@@ -210,7 +210,7 @@ static const char T_none[] PROGMEM = "none";
 static const char T_UPGRADE[] PROGMEM = "Upgrade";
 static const char T_WS[] PROGMEM = "websocket";
 static const char T_WWW_AUTH[] PROGMEM = "WWW-Authenticate";
-static const char Transfer_Encoding[] PROGMEM = "Transfer-Encoding";
+static const char T_Transfer_Encoding[] PROGMEM = "Transfer-Encoding";
 
 // HTTP Methods
 static const char T_ANY[] PROGMEM = "ANY";