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

Static content caching header fix #2571

Merged

Conversation

@rhyskeepence
Copy link
Contributor

@rhyskeepence rhyskeepence commented May 15, 2019

Fixes #2529

Copy link
Member

@rossabaker rossabaker left a comment

Needs a test:scalafmt and one import reverted to make the build pass.

It's too late in the day for me to thoughtfully consider the logic, but I'll review it tomorrow unless the night shift beats me to it.

Also, if this is binary compatible, please retarget series/0.20, and we can get it into a patch release. It will probably miss 0.20.1, but I'm not opposed to 0.20.2 this week if it fixes a bug.

Loading

core/src/main/scala/org/http4s/StaticFile.scala Outdated Show resolved Hide resolved
Loading
@rhyskeepence rhyskeepence changed the base branch from master to series/0.20 May 16, 2019
@rossabaker
Copy link
Member

@rossabaker rossabaker commented May 16, 2019

I don't immediately recognize that lingering Scala 2.11 failure. The other build failure is a blaze flake and not your fault.

Loading

Copy link
Member

@rossabaker rossabaker left a comment

This mostly looks good. Just a couple comments.

Loading

Loading
tests/src/test/scala/org/http4s/StaticFileSpec.scala Outdated Show resolved Hide resolved
Loading
@rossabaker
Copy link
Member

@rossabaker rossabaker commented May 16, 2019

We're going to have to rebase to get the two commits that aren't @rhyskeepence's off this PR, but it looks good to me after that.

Loading

@rhyskeepence rhyskeepence force-pushed the static-content-caching-header-fix branch from ba55461 to 71f5c11 May 16, 2019
Copy link
Member

@rossabaker rossabaker left a comment

👍 on green

Loading

@rossabaker rossabaker mentioned this pull request May 16, 2019
rossabaker added a commit to rossabaker/http4s that referenced this issue May 16, 2019
@rossabaker rossabaker merged commit 9cafcaa into http4s:series/0.20 May 16, 2019
1 check passed
Loading
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants