RFR: 8309118: HttpClient: Add more tests for 100 ExpectContinue with HTTP/2 [v5]

Conor Cleary ccleary at openjdk.org
Wed Oct 18 10:19:51 UTC 2023


> ### **Issue Description**
> There is missing test coverage for the implementation of partial/informational responses (status code 1xx in server response headers) for the `HttpClient`, specifically in the `HTTP/2` use case. RFC 9113 - HTTP/2, details the behavior of any client in these situations. Small changes and new test cases are needed to verify compliance with this specification.  This issue primarily concerns how the client reacts to receiving a `RST_STREAM` frame at various stages of a partial/informational response from a server.
> 
> ### **Solution Details**
> Changes were made in `src/java.net.http/share/classes/jdk/internal/net/http/Stream.java` to improve the handling client's handling of receiving a `RST_STREAM`. `incoming_reset()` (L574) will now cause the client to ignore a `RST_STREAM` frame if an `END_STREAM` flag has been received _and_ the request body has completed sending. Previously it would be ignored only if an `END_STREAM` flag was seen which caused cancelled partial responses to 'hang' indefinitely should a client be transmitting data in a POST/PUT request. An overhaul of how `incoming_reset()` was done in an effore to simplify the method and make it easier to debug in the future.
> 
> Some changes where also made to the `schedule()` method in Stream (L190) to ensure both the sending of the Request Body and receipt of a RST_STREAM at various stages of an exchange do not cause unexpected behavior. Minor changes were made to the `Http2TestServer` implementation to improve the convinience of testing edge cases involving the sending of `HTTP/2` response headers. 
> 
> Concerning the new test cases, I have listed below the specifics of each case and the expected behavior of the client in the given scenario.
> 
> **test/jdk/java/net/httpclient/ExpectContinueTest.java**
> - Client sends a POST request with the `Expect: 100-Continue` header included
>    - Server responds with a `HEADERS` frame including a 100 status code. Server then sends `RST_STREAM` with code `NO_ERROR` or `PROTOCOL_ERROR` set before an END_STREAM is received from the server.
>        - Expected/Observed Client Behavior: Client completes exceptionally in both cases.
> - Client sends a POST request with the `Expect: 100-Continue` header included
>    - Server responds with a `HEADERS` frame including a 100 status code and reads the request body. Server then sends Response Headers with status code 200 to complete the response. Server then sends RST_STREAM with code `NO_ERROR` or `PROTOCOL_ERROR` set...

Conor Cleary has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. The pull request contains 12 additional commits since the last revision:

 - 8309118: Update Comment in schedule()
 - Merge remote-tracking branch 'upstream/master' into JDK-8309118
 - 8309118: Remove irrelevant comments and logs
 - 8309118: Fixed error in handleReset ReentrantLock
 - 8309118: Updates to Stream cancelImpl
 - 8309118: Refactored test, updated incoming_reset
 - Merge branch 'master' into JDK-8309118
 - 8309118: Cleanup identifiers and whitespace
 - 8309118: Removed unused try-with-resources
 - 8309118: Improve comments and annotations
 - ... and 2 more: https://git.openjdk.org/jdk/compare/8d54aa4a...d74b08a0

-------------

Changes:
  - all: https://git.openjdk.org/jdk/pull/15664/files
  - new: https://git.openjdk.org/jdk/pull/15664/files/94e2e1d2..d74b08a0

Webrevs:
 - full: https://webrevs.openjdk.org/?repo=jdk&pr=15664&range=04
 - incr: https://webrevs.openjdk.org/?repo=jdk&pr=15664&range=03-04

  Stats: 27406 lines in 869 files changed: 15439 ins; 5991 del; 5976 mod
  Patch: https://git.openjdk.org/jdk/pull/15664.diff
  Fetch: git fetch https://git.openjdk.org/jdk.git pull/15664/head:pull/15664

PR: https://git.openjdk.org/jdk/pull/15664


More information about the net-dev mailing list