Improved handling of 100 Continue #12113
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
* Changed ContentSender demand from iterate()+IDLE to succeeded()+SCHEDULED. This ensures that there is no re-iteration in case a 100 Continue response arrives. This, in turn, avoids that the demand is performed multiple times, causing ISE to be thrown. * Changed the 100 Continue action of the proxy Servlet/Handler, that provides the request content, to be executed by the HttpSender, rather than by the HttpReceiver. Signed-off-by: Simone Bordet <[email protected]>
* Now `HttpClient` removed the `Expect` header if there is no request content. * Changed AbstractProxyServlet and ProxyHandler check for request content: now the Content-Type header is not taken into consideration. * Now the server avoids sending the 100 Continue response if there is no request content. Signed-off-by: Simone Bordet <[email protected]>
gregw
previously requested changes
Jul 31, 2024
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpChannelState.java
Show resolved
Hide resolved
|
Is the work here going to help the old 100-Continue issue with AsyncMiddleManServlet? |
Now the request body is not defaulted if missing, but just kept null. Signed-off-by: Simone Bordet <[email protected]>
gregw
previously approved these changes
Aug 2, 2024
jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpConnection.java
Outdated
Show resolved
Hide resolved
| @@ -215,6 +207,9 @@ protected void normalizeRequest(HttpRequest request) | |||
| request.addHeader(new HttpField.LongValueHttpField(HttpHeader.CONTENT_LENGTH, contentLength)); | |||
| } | |||
| } | |||
| // RFC 9110, section 10.1.1. | |||
| if (content == null || content.getLength() == 0) | |||
| request.headers(h -> h.remove(HttpHeader.EXPECT)); | |||
There was a problem hiding this comment.
technically you should just remove the 100-continue value from the Expect header, but as there are currently no other defined values, this is probably OK.
There was a problem hiding this comment.
Correct. And we don't have an easy API in HttpFields to remove a single value.
jetty-ee9/jetty-ee9-proxy/src/main/java/org/eclipse/jetty/ee9/proxy/AbstractProxyServlet.java
Outdated
Show resolved
Hide resolved
…continue-fixes'. Signed-off-by: Simone Bordet <[email protected]>
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
firoj0
approved these changes
Aug 2, 2024
lorban
previously approved these changes
Aug 7, 2024
|
Hi All, Would you please set expectations as to next steps? Are we waiting on a review from @gregw ? TY! |
Signed-off-by: Simone Bordet <[email protected]>
sbordet
requested review from
firoj0 and
lorban
and removed request for
firoj0
lorban
requested changes
Aug 13, 2024
jetty-ee10/jetty-ee10-proxy/src/test/java/org/eclipse/jetty/ee10/proxy/ProxyServletTest.java
Outdated
Show resolved
Hide resolved
|
@garydgregory this PR is almost ready to be merged in, we won't wait for @gregw (currently in vacation). It will be in the next Jetty 12 release, due end of month. |
Signed-off-by: Simone Bordet <[email protected]>
lorban
approved these changes
Aug 13, 2024
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.
HttpClientremoved theExpectheader if there is no request content.