From: Amos Jeffries <yadij@users.noreply.github.com>
Date: Mon, 9 May 2022 19:58:26 +0000 (+0000)
Subject: Update status code 413 compliance (#1040)
X-Git-Tag: SQUID_6_0_1~189
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5a3b42b18349bf78175811cb0a64dd5c4aeae32d;p=thirdparty%2Fsquid.git

Update status code 413 compliance (#1040)

The latest HTTP specification requires the data
transmitted in HTTP messages be called 'content'.

The official reason text for status code 413 has
been altered to comply.
---

diff --git a/src/client_side.cc b/src/client_side.cc
index 16dc4b449d..a1c683e6d0 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1713,7 +1713,7 @@ clientProcessRequest(ConnStateData *conn, const Http1::RequestParserPointer &hp,
             assert (repContext);
             conn->quitAfterError(request.getRaw());
             repContext->setReplyToError(ERR_TOO_BIG,
-                                        Http::scPayloadTooLarge, nullptr,
+                                        Http::scContentTooLarge, nullptr,
                                         conn, http->request, nullptr, nullptr);
             assert(context->http->out.offset == 0);
             context->pullData();
@@ -2098,7 +2098,7 @@ ConnStateData::abortChunkedRequestBody(const err_type error)
         clientReplyContext *repContext = dynamic_cast<clientReplyContext*>(node->data.getRaw());
         assert(repContext);
         const Http::StatusCode scode = (error == ERR_TOO_BIG) ?
-                                       Http::scPayloadTooLarge : HTTP_BAD_REQUEST;
+                                       Http::scContentTooLarge : HTTP_BAD_REQUEST;
         repContext->setReplyToError(error, scode,
                                     repContext->http->uri,
                                     CachePeer,
diff --git a/src/http.cc b/src/http.cc
index b8a5072fea..a7a70ffc50 100644
--- a/src/http.cc
+++ b/src/http.cc
@@ -523,7 +523,7 @@ HttpStateData::reusableReply(HttpStateData::ReuseDecision &decision)
     case Http::scConflict: // TODO: is this shareable?
     case Http::scLengthRequired:
     case Http::scPreconditionFailed:
-    case Http::scPayloadTooLarge:
+    case Http::scContentTooLarge:
     case Http::scUnsupportedMediaType:
     case Http::scUnprocessableEntity:
     case Http::scLocked: // TODO: is this shareable?
diff --git a/src/http/StatusCode.cc b/src/http/StatusCode.cc
index 71bde0343b..a4aac20ba9 100644
--- a/src/http/StatusCode.cc
+++ b/src/http/StatusCode.cc
@@ -164,8 +164,8 @@ Http::StatusCodeString(const Http::StatusCode status)
         return "Precondition Failed";
         break;
 
-    case Http::scPayloadTooLarge:
-        return "Payload Too Large";
+    case Http::scContentTooLarge:
+        return "Content Too Large";
         break;
 
     case Http::scUriTooLong:
diff --git a/src/http/StatusCode.h b/src/http/StatusCode.h
index d9f3620a75..b12a01eee6 100644
--- a/src/http/StatusCode.h
+++ b/src/http/StatusCode.h
@@ -54,7 +54,7 @@ typedef enum {
     scGone = 410,
     scLengthRequired = 411,
     scPreconditionFailed = 412,
-    scPayloadTooLarge = 413,
+    scContentTooLarge = 413,
     scUriTooLong = 414,
     scUnsupportedMediaType = 415,
     scRequestedRangeNotSatisfied = 416,