http: allow Content-Length header for 304 responses #34835
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Review requested:
|
mscdex
reviewed
Aug 18, 2020
mscdex
reviewed
Aug 18, 2020
|
This could use some more reviews (and any thoughts on semver-ness). @nodejs/net @nodejs/http |
jasnell
approved these changes
Aug 21, 2020
github-actions
bot
removed
the
request-ci
rickyes
approved these changes
Aug 24, 2020
rickyes
added
the
author ready
rickyes
added
the
commit-queue
github-actions
bot
added
commit-queue-failed
Commit Queue failed- Loading data for nodejs/node/pull/34835 ✔ Done loading data for nodejs/node/pull/34835 ----------------------------------- PR info ------------------------------------ Title http: allow Content-Length header for 304 responses (#34835) Author Arnaud Lefebvre (@BlackYoup) Branch BlackYoup:issue-31037 -> nodejs:master Labels author ready, http, review wanted Commits 2 - http: allow Content-Length header for 304 responses - Update test/parallel/test-http-allow-content-length-304.js Committers 2 - Arnaud Lefebvre - GitHub PR-URL: https://github.com/nodejs/node/pull/34835 Reviewed-By: James M Snell Reviewed-By: Ricky Zhou <0x19951125@gmail.com> ------------------------------ Generated metadata ------------------------------ PR-URL: https://github.com/nodejs/node/pull/34835 Reviewed-By: James M Snell Reviewed-By: Ricky Zhou <0x19951125@gmail.com> -------------------------------------------------------------------------------- ✔ Last GitHub Actions successful ℹ Last Full PR CI on 2020-08-23T11:16:38Z: https://ci.nodejs.org/job/node-test-pull-request/32902/ - Querying data for job/node-test-pull-request/32902/ ✔ Build data downloaded ✔ Last Jenkins CI successful ℹ This PR was created on Tue, 18 Aug 2020 20:00:38 GMT ✔ Approvals: 2 ✔ - James M Snell (@jasnell) (TSC): https://github.com/nodejs/node/pull/34835#pullrequestreview-472590480 ✔ - Ricky Zhou (@rickyes): https://github.com/nodejs/node/pull/34835#pullrequestreview-473555162 -------------------------------------------------------------------------------- ✔ No git am in progress ✔ No git rebase in progress -------------------------------------------------------------------------------- - Bringing origin/master up to date... From https://github.com/nodejs/node * branch master -> FETCH_HEAD ✔ origin/master is now up-to-date - Downloading patch for 34835 ✔ Downloaded patch to /home/runner/work/node/node/.ncu/34835/patch -------------------------------------------------------------------------------- Applying: http: allow Content-Length header for 304 responses Applying: Update test/parallel/test-http-allow-content-length-304.js ✔ Patches applied There are 2 commits in the PR. Attempting autorebase. Rebasing (2/4) |
|
Regarding the failure, should I squash both commits into one? |
rickyes
removed
the
commit-queue-failed
Of course it's better if you can. But it doesn't matter, we can use the tool to squash both commits into one and land it. |
trivikr
approved these changes
Sep 10, 2020
This comment has been minimized.
This comment has been minimized.
Fixes: nodejs#31037 PR-URL: nodejs#34835 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ricky Zhou <0x19951125@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
|
Landed in 23d6c42 |
joesepi
pushed a commit
to joesepi/node
that referenced
this pull request
Jan 8, 2021
Fixes: nodejs#31037 PR-URL: nodejs#34835 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ricky Zhou <0x19951125@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
According to the HTTP spec, a
304 Not Modifiedresponse can have aContent-Lengthheader:A server MAY send a Content-Length header field in a 304 (Not Modified) response to a conditional GET request (Section 4.1 of [RFC7232]); a server MUST NOT send Content-Length in such a response unless its field-value equals the decimal number of octets that would have been sent in the payload body of a 200 (OK) response to the same request.On the other hand, the spec doesn't allow a 304 response to have a body:
A 304 response cannot contain a message-body; it is always terminated by the first empty line after the header fields.Currently, the
httprequest module will emit anabortedevent if the response has a status code of304with aContent-Lengthheader. This pull request fixes this behavior and the request can successfully finish.This fixes issue #31037
I tried to integrate the fix in the best place I could find, let me know if there are better ways to fix this!
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passes