Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 14 additions & 5 deletions src/requests/sessions.py
Original file line number Diff line number Diff line change
Expand Up @@ -471,10 +471,20 @@ def prepare_request(self, request):
cookies = cookiejar_from_dict(cookies)

# Merge with session cookies
merged_cookies = merge_cookies(
merge_cookies(RequestsCookieJar(), self.cookies), cookies
)

# Preserve the cookie policy from the session's cookie jar
# Fixes issue where custom policies were lost during request preparation
if isinstance(self.cookies, RequestsCookieJar):
# Create a new jar with the same policy as the session's jar
jar = RequestsCookieJar()
jar.set_policy(self.cookies.get_policy())
merged_cookies = merge_cookies(
merge_cookies(jar, self.cookies), cookies
)
else:
# Fall back to original behavior for non-RequestsCookieJar instances
merged_cookies = merge_cookies(
merge_cookies(RequestsCookieJar(), self.cookies), cookies
)
# Set environment's basic authentication if not explicitly set.
auth = request.auth
if self.trust_env and not auth and not self.auth:
Expand All @@ -496,7 +506,6 @@ def prepare_request(self, request):
hooks=merge_hooks(request.hooks, self.hooks),
)
return p

def request(
self,
method,
Expand Down
1 change: 1 addition & 0 deletions tests/test_requests.py
Original file line number Diff line number Diff line change
Expand Up @@ -3038,3 +3038,4 @@ def test_json_decode_errors_are_serializable_deserializable():
)
deserialized_error = pickle.loads(pickle.dumps(json_decode_error))
assert repr(json_decode_error) == repr(deserialized_error)

Loading