Fix: Correctly handle Content-Length for compressed downloads (--download)

Author: bryceyung

httpie/cli/argtypes.py

@@ -95,16 +95,17 @@ def __call__(self, s: str) -> KeyValueArg:
                 key_part, value_part = token.split(sep, 1)
 
                 # The key is composed of:
-                # 1. Any preceding tokens (unescaped by str(t) in join)
-                # 2. The key part of the current token (re-tokenize to
-                #    handle internal escapes correctly)
-                key_tokens = tokens[:i] + self.tokenize(key_part)
+                # 1. Any preceding tokens (already Escaped or regular strings)
+                # 2. The key part of the current token (re-tokenize to catch internal escapes)
+                key_tokens = tokens[:i]
+                key_tokens.extend(self.tokenize(key_part))
                 key = ''.join(str(t) for t in key_tokens)
 
                 # The value is composed of:
-                # 1. The value part of the current token (re-tokenize)
-                # 2. Any succeeding tokens (unescaped by str(t) in join)
-                value_tokens = self.tokenize(value_part) + tokens[i + 1:]
+                # 1. The value part of the current token (re-tokenize to catch internal escapes)
+                # 2. Any succeeding tokens
+                value_tokens = self.tokenize(value_part)
+                value_tokens.extend(tokens[i + 1:])
                 value = ''.join(str(t) for t in value_tokens)
 
                 break
@@ -279,4 +280,4 @@ def response_mime_type(mime_type: str) -> str:
     if mime_type.count('/') != 1:
         raise argparse.ArgumentTypeError(
             f'{mime_type!r} doesn’t look like a mime type; use type/subtype')
-    return mime_type
+    return mime_type

httpie/core.py

@@ -227,6 +227,20 @@ def request_body_read_callback(chunk: bytes):
                     force_separator = is_streamed_upload and env.stdout_isatty
             else:
                 final_response = message
+                
+                # --- BUG FIX: Correctly handle Content-Length for encoded downloads ---
+                if downloader and 'Content-Encoding' in final_response.headers:
+                    # When in download mode, we assume the user intends to download 
+                    # the raw, encoded content (e.g., a .gz file). We must delete 
+                    # the 'Content-Encoding' header from the response to prevent 
+                    # the 'requests' library from auto-decompressing the stream.
+                    # This ensures the raw compressed data is streamed and the 
+                    # 'Content-Length' (which refers to the compressed size per spec)
+                    # is correctly verified against the streamed bytes, resolving 
+                    # the "Incomplete download" error.
+                    del final_response.headers['Content-Encoding']
+                # --- END BUG FIX ---
+                
                 if args.check_status or downloader:
                     exit_status = http_status_to_exit_status(http_status=message.status_code, follow=args.follow)
                     if exit_status != ExitStatus.SUCCESS and (not env.stdout_isatty or args.quiet == 1):