Skip to content
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.

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

Use ETag from headers when parsing If-Range in FileResponse #2761

Merged
merged 2 commits into from
Dec 3, 2024

Conversation

viccie30
Copy link
Contributor

Summary

FileResponse.set_stat_headers() takes care not to overwrite any headers set on the response, but FileResponse._should_use_range() ignores any set headers and unconditionally uses its own ETag and Last-Modified calculation. This commit rectifies that.

I have chosen to code self.headers[HEADER] instead of self.headers.get(HEADER), because FileResponse.__call__() always calls set_stat_headers() and therefore the headers should always be set.

Checklist

  • I understand that this PR may be closed in case there was no previous discussion. (This doesn't apply to typos!)
  • I've added a test for each change that was introduced, and I tried as much as possible to make a single atomic change.
  • I've updated the documentation accordingly.

Copy link
Member

@Kludex Kludex left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense. :)

Good clean-up as well. Thanks!

@Kludex Kludex merged commit ca1f45d into encode:master Dec 3, 2024
6 checks passed
@viccie30 viccie30 deleted the use-etag-from-headers-for-if-range branch December 3, 2024 07:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants