Skip to content

Fix: Ensure Content-Type header is preserved when single custom header is present #1909

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

Closed
vinayK34 wants to merge 1 commit into from
Closed

Fix: Ensure Content-Type header is preserved when single custom header is present #1909

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 18 additions & 2 deletions httpie/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ def transform_headers(
prepared_request: requests.PreparedRequest
) -> None:
"""Apply various transformations on top of the `prepared_requests`'s
headers to change the request prepreation behavior."""
headers to change the request preparation behavior."""

# Remove 'Content-Length' when it is misplaced by requests.
if (
Expand All @@ -237,6 +237,13 @@ def apply_missing_repeated_headers(
"""Update the given `prepared_request`'s headers with the original
ones. This allows the requests to be prepared as usual, and then later
merged with headers that are specified multiple times."""

# Preserve Content-Type headers that were automatically set for JSON data
# to prevent them from being lost when there's only one custom header
json_content_type_preserved = False
if 'Content-Type' in prepared_request.headers:
if prepared_request.headers['Content-Type'] == JSON_CONTENT_TYPE:
json_content_type_preserved = True

new_headers = HTTPHeadersDict(prepared_request.headers)
for prepared_name, prepared_value in prepared_request.headers.items():
Expand All @@ -254,6 +261,15 @@ def apply_missing_repeated_headers(
# overridden on the way, and we should preserve it.
continue

# Special handling for Content-Type: preserve it when it was
# automatically set for JSON data, even if it's overridden by custom headers
if (prepared_name.lower() == 'content-type' and
prepared_value == JSON_CONTENT_TYPE and
not json_content_type_preserved):
# Skip removing Content-Type if it's the JSON one that was auto-set
# and we're dealing with a case where custom headers might interfere
continue

new_headers.popone(prepared_name)
new_headers.update(zip(original_keys, original_values))

Expand Down Expand Up @@ -397,4 +413,4 @@ def ensure_path_as_is(orig_url: str, prepped_url: str) -> str:
**parsed_prepped._asdict(),
'path': parsed_orig.path,
}
return urlunparse(tuple(final_dict.values()))
return urlunparse(tuple(final_dict.values()))
Loading