Revert "Remove content-length header from 101 Switching Protocols res…

…ponse (drogonframework#2164)"
tripleslash · Oct 1, 2024 · f808714 · f808714
1 parent 671692e
commit f808714
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 53 deletions.
diff --git a/lib/src/HttpResponseImpl.cc b/lib/src/HttpResponseImpl.cc
@@ -516,7 +516,6 @@ void HttpResponseImpl::makeHeaderString(trantor::MsgBuffer &buffer)
                            statusCode_);
         }
     }
-
     buffer.hasWritten(len);
 
     if (!statusMessage_.empty())
@@ -538,15 +537,15 @@ void HttpResponseImpl::makeHeaderString(trantor::MsgBuffer &buffer)
             }
             len = 0;
         }
-        else if (sendfileName_.empty() && contentLengthIsAllowed())
+        else if (sendfileName_.empty())
         {
             auto bodyLength = bodyPtr_ ? bodyPtr_->length() : 0;
             len = snprintf(buffer.beginWrite(),
                            buffer.writableBytes(),
                            contentLengthFormatString<decltype(bodyLength)>(),
                            bodyLength);
         }
-        else if (contentLengthIsAllowed())
+        else
         {
             auto bodyLength = sendfileRange_.second;
             len = snprintf(buffer.beginWrite(),

diff --git a/lib/src/HttpResponseImpl.h b/lib/src/HttpResponseImpl.h
@@ -537,16 +537,6 @@ class DROGON_EXPORT HttpResponseImpl : public HttpResponse
     {
         statusMessage_ = message;
     }
-
-    bool contentLengthIsAllowed()
-    {
-        int statusCode =
-            customStatusCode_ >= 0 ? customStatusCode_ : statusCode_;
-
-        // return false if status code is 1xx or 204
-        return (statusCode >= k200OK || statusCode < k100Continue) &&
-               statusCode != k204NoContent;
-    }
 };
 
 using HttpResponseImplPtr = std::shared_ptr<HttpResponseImpl>;

diff --git a/lib/tests/unittests/WebsocketResponseTest.cc b/lib/tests/unittests/WebsocketResponseTest.cc