content_encoding: fix limit failure message

The message triggered earlier than intended and did not take the
transfer/content type into account.

Ref #21603
Reported-by: Joshua Rogers
Closes #21756

diff --git a/lib/content_encoding.c b/lib/content_encoding.c
index 0224a8bfe9e8d4f013b398c1dfafda4c677de223..aaef92a7d950da1a2a2269cc8abb77cc4520e0a8 100644 (file)
--- a/lib/content_encoding.c
+++ b/lib/content_encoding.c
@@ -750,9 +750,10 @@ CURLcode Curl_build_unencoding_stack(struct Curl_easy *data,
         return CURLE_OK;
       }
 
-      if(Curl_cwriter_count(data, phase) + 1 >= MAX_ENCODE_STACK) {
-        failf(data, "Reject response due to more than %d content encodings",
-              MAX_ENCODE_STACK);
+      if(Curl_cwriter_count(data, phase) >= MAX_ENCODE_STACK) {
+        failf(data, "Reject response exceeding limit of %d %s encodings",
+              MAX_ENCODE_STACK,
+              is_transfer ? "transfer" : "content");
         return CURLE_BAD_CONTENT_ENCODING;
       }
 

diff --git a/tests/data/test387 b/tests/data/test387
index ebdd4b5d116f6f5fe839c18e3f1f3620819a8889..5872cd692e11b860b59715577e6fae0aa8b94444 100644 (file)
--- a/tests/data/test387
+++ b/tests/data/test387
@@ -51,7 +51,7 @@ Connection: TE
 61
 </errorcode>
 <stderr mode="text">
-curl: (61) Reject response due to more than 5 content encodings
+curl: (61) Reject response exceeding limit of 5 transfer encodings
 </stderr>
 </verify>
 </testcase>

diff --git a/tests/data/test418 b/tests/data/test418
index ccda8912298dbeedaffcee780877bfac1a39f784..cdd25f4ba9bc540c1368a15fa9a9e5676f04ee01 100644 (file)
--- a/tests/data/test418
+++ b/tests/data/test418
@@ -59,7 +59,7 @@ Connection: TE
 61
 </errorcode>
 <stderr mode="text">
-curl: (61) Reject response due to more than 5 content encodings
+curl: (61) Reject response exceeding limit of 5 transfer encodings
 </stderr>
 </verify>
 </testcase>