Skip to content

Removing dead code for RequestedConnectionType #471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mathieucarbou merged 2 commits into from
Aug 2, 2026
+25 −46
Merged

Removing dead code for RequestedConnectionType #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c1a543
Removing dead code for RequestedConnectionType
mathieucarbou Jul 31, 2026
edd16e7
cleanup macros around deprecations for 8266
mathieucarbou Aug 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 19 additions & 31 deletions src/ESPAsyncWebServer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,9 +361,7 @@ class AsyncWebHeader {
AsyncWebHeader(const char *name, const char *value) : _name(name), _value(value) {}
AsyncWebHeader(const String &name, const String &value) : _name(name), _value(value) {}

#ifndef ESP8266
[[deprecated("Use AsyncWebHeader::parse(data) instead")]]
#endif
AsyncWebHeader(const String &data)
: AsyncWebHeader(parse(data)){};

Expand Down Expand Up @@ -395,12 +393,9 @@ class AsyncWebHeader {
* */

typedef enum {
RCT_NOT_USED = -1,
RCT_DEFAULT = 0,
RCT_HTTP,
RCT_WS,
RCT_EVENT,
RCT_MAX
RCT_HTTP = 1,
RCT_WS = 2,
RCT_EVENT = 3
} RequestedConnectionType;
Comment on lines 395 to 399

@mathieucarbou mathieucarbou Aug 2, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes this is intentional. They should not be used by the user code anyway.


// this enum is similar to Arduino WebServer's AsyncAuthType and PsychicHttp
Expand Down Expand Up @@ -578,17 +573,28 @@ class AsyncWebServerRequest {
RequestedConnectionType requestedConnType() const {
return _reqconntype;
}
bool isExpectedRequestedConnType(RequestedConnectionType erct1, RequestedConnectionType erct2 = RCT_NOT_USED, RequestedConnectionType erct3 = RCT_NOT_USED)
const;
[[deprecated("Use isExpectedRequestedConnType(RequestedConnectionType) instead")]]
bool isExpectedRequestedConnType(RequestedConnectionType erct1, RequestedConnectionType erct2, RequestedConnectionType erct3) const {
return isExpectedRequestedConnType(erct1) || isExpectedRequestedConnType(erct2) || isExpectedRequestedConnType(erct3);
}
[[deprecated("Use isExpectedRequestedConnType(RequestedConnectionType) instead")]]
bool isExpectedRequestedConnType(RequestedConnectionType erct1, RequestedConnectionType erct2) const {
return isExpectedRequestedConnType(erct1) || isExpectedRequestedConnType(erct2);
}
bool isExpectedRequestedConnType(RequestedConnectionType type) const {
return _reqconntype == type;
}

bool isWebSocketUpgrade() const {
return _method == AsyncWebRequestMethod::HTTP_GET && isExpectedRequestedConnType(RCT_WS);
}
bool isSSE() const {
return _method == AsyncWebRequestMethod::HTTP_GET && isExpectedRequestedConnType(RCT_EVENT);
}
bool isHTTP() const {
return isExpectedRequestedConnType(RCT_DEFAULT, RCT_HTTP);
return isExpectedRequestedConnType(RCT_HTTP);
}

void onDisconnect(ArDisconnectHandler fn);

// hash is the string representation of:
Expand Down Expand Up @@ -619,16 +625,10 @@ class AsyncWebServerRequest {
_handler = handler;
}

#ifndef ESP8266
[[deprecated("All headers are now collected. Use removeHeader(name) or AsyncHeaderFreeMiddleware if you really need to free some headers.")]]
#endif
void addInterestingHeader(__asyncws_unused const char *name) {
}
#ifndef ESP8266
void addInterestingHeader(__asyncws_unused const char *name) {}
[[deprecated("All headers are now collected. Use removeHeader(name) or AsyncHeaderFreeMiddleware if you really need to free some headers.")]]
#endif
void addInterestingHeader(__asyncws_unused const String &name) {
}
void addInterestingHeader(__asyncws_unused const String &name) {}

/**
* @brief issue HTTP redirect response with Location header
Expand Down Expand Up @@ -700,9 +700,7 @@ class AsyncWebServerRequest {
send(beginChunkedResponse(contentType, callback, templateCallback));
}

#ifndef ESP8266
[[deprecated("Replaced by send(int code, const String& contentType, const uint8_t* content, size_t len, AwsTemplateProcessor callback = nullptr)")]]
#endif
void send_P(int code, const String &contentType, const uint8_t *content, size_t len, AwsTemplateProcessor callback = nullptr) {
send(code, contentType, content, len, callback);
}
Expand Down Expand Up @@ -767,16 +765,12 @@ class AsyncWebServerRequest {
return beginResponseStream(contentType.c_str(), bufferSize);
}

#ifndef ESP8266
[[deprecated("Replaced by beginResponse(int code, const String& contentType, const uint8_t* content, size_t len, AwsTemplateProcessor callback = nullptr)")]]
#endif
AsyncWebServerResponse *beginResponse_P(int code, const String &contentType, const uint8_t *content, size_t len, AwsTemplateProcessor callback = nullptr) {
return beginResponse(code, contentType.c_str(), content, len, callback);
}
#ifndef ESP8266
[[deprecated("Replaced by beginResponse(int code, const String& contentType, const char* content = asyncsrv::empty, AwsTemplateProcessor callback = nullptr)"
)]]
#endif
AsyncWebServerResponse *beginResponse_P(int code, const String &contentType, PGM_P content, AwsTemplateProcessor callback = nullptr);

/**
Expand Down Expand Up @@ -1436,9 +1430,7 @@ class AsyncCorsMiddleware : public AsyncMiddleware {
_maxAge = seconds;
}

#ifndef ESP8266
[[deprecated("Use instead: addCORSHeaders(AsyncWebServerRequest *request, AsyncWebServerResponse *response)")]]
#endif
void addCORSHeaders(AsyncWebServerResponse *response) {
addCORSHeaders(nullptr, response);
}
Expand Down Expand Up @@ -1632,9 +1624,7 @@ class AsyncWebServerResponse {
return _headers;
}

#ifndef ESP8266
[[deprecated("Use instead: _assembleHead(String& buffer, uint8_t version)")]]
#endif
String _assembleHead(uint8_t version) {
String buffer;
_assembleHead(buffer, version);
Expand Down Expand Up @@ -1678,9 +1668,7 @@ class AsyncCallbackJsonWebHandler;
typedef std::function<void(AsyncWebServerRequest *request, JsonVariant &json)> ArJsonRequestHandlerFunction;

#if ASYNC_MSG_PACK_SUPPORT == 1
#ifndef ESP8266
[[deprecated("Replaced by AsyncCallbackJsonWebHandler")]]
#endif
typedef AsyncCallbackJsonWebHandler AsyncCallbackMessagePackWebHandler;
#endif // ASYNC_MSG_PACK_SUPPORT

Expand Down
19 changes: 6 additions & 13 deletions src/WebRequest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,7 @@ bool AsyncWebServerRequest::_parseReqHeader() {
// connection is still a plain HTTP connection so a previously detected
// SSE request (or any other classified type) cannot be clobbered by
// header ordering.
if (_method == AsyncWebRequestMethod::HTTP_GET && (_reqconntype == RCT_DEFAULT || _reqconntype == RCT_HTTP)) {
if (_method == AsyncWebRequestMethod::HTTP_GET && _reqconntype == RCT_HTTP) {
_reqconntype = RCT_WS;
}
} else if (name.equalsIgnoreCase(T_ACCEPT)) {
Expand All @@ -678,7 +678,7 @@ bool AsyncWebServerRequest::_parseReqHeader() {
// Accept: text/event-stream. Only classify when the connection is still
// a plain HTTP connection so a previously detected WebSocket upgrade
// cannot be clobbered by header ordering.
if (substr != NULL && _method == AsyncWebRequestMethod::HTTP_GET && (_reqconntype == RCT_DEFAULT || _reqconntype == RCT_HTTP)) {
if (substr != NULL && _method == AsyncWebRequestMethod::HTTP_GET && _reqconntype == RCT_HTTP) {
// WebEvent request can be uniquely identified by header: [Accept: text/event-stream]
_reqconntype = RCT_EVENT;
}
Expand Down Expand Up @@ -1469,20 +1469,13 @@ String AsyncWebServerRequest::urlDecode(const String &text) const {

const char *AsyncWebServerRequest::requestedConnTypeToString() const {
switch (_reqconntype) {
case RCT_NOT_USED: return T_RCT_NOT_USED;
case RCT_DEFAULT: return T_RCT_DEFAULT;
case RCT_HTTP: return T_RCT_HTTP;
case RCT_WS: return T_RCT_WS;
case RCT_EVENT: return T_RCT_EVENT;
default: return T_ERROR;
case RCT_HTTP: return T_RCT_HTTP;
case RCT_WS: return T_RCT_WS;
case RCT_EVENT: return T_RCT_EVENT;
default: return T_ERROR;
}
}

bool AsyncWebServerRequest::isExpectedRequestedConnType(RequestedConnectionType erct1, RequestedConnectionType erct2, RequestedConnectionType erct3) const {
return ((erct1 != RCT_NOT_USED) && (erct1 == _reqconntype)) || ((erct2 != RCT_NOT_USED) && (erct2 == _reqconntype))
|| ((erct3 != RCT_NOT_USED) && (erct3 == _reqconntype));
}

AsyncClient *AsyncWebServerRequest::clientRelease() {
AsyncClient *c = _client;
_client = nullptr;
Expand Down
2 changes: 0 additions & 2 deletions src/literals.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,6 @@ static constexpr const char T_LINK[] = "LINK";
static constexpr const char T_UNLINK[] = "UNLINK";

// Req content types
static constexpr const char T_RCT_NOT_USED[] = "RCT_NOT_USED";
static constexpr const char T_RCT_DEFAULT[] = "RCT_DEFAULT";
static constexpr const char T_RCT_HTTP[] = "RCT_HTTP";
static constexpr const char T_RCT_WS[] = "RCT_WS";
static constexpr const char T_RCT_EVENT[] = "RCT_EVENT";
Expand Down
Loading