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

8278158: jwebserver should set request timeout #6737

Closed
wants to merge 1 commit into from

Conversation

FrauBoes
Copy link
Member

@FrauBoes FrauBoes commented Dec 7, 2021

This change sets a maximum request time for the jwebserver (and java -m jdk.httpserver), unless it has already been set.

While here, I removed a comment from the implementation classes, a left-over from the pre-module era that is not needed and should not have been included in the first place.

Testing: tier 1-3, and manual testing to confirm a request fails after the given time, e.g.:

$ curl https://127.0.0.1:8000
curl: (35) LibreSSL SSL_connect: SSL_ERROR_SYSCALL in connection to 127.0.0.1:8000

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/6737/head:pull/6737
$ git checkout pull/6737

Update a local copy of the PR:
$ git checkout pull/6737
$ git pull https://git.openjdk.java.net/jdk pull/6737/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6737

View PR using the GUI difftool:
$ git pr show -t 6737

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/6737.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Dec 7, 2021

👋 Welcome back jboes! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr label Dec 7, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Dec 7, 2021

@FrauBoes The following label will be automatically applied to this pull request:

  • net

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the net label Dec 7, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Dec 7, 2021

Webrevs

dfuch
dfuch approved these changes Dec 7, 2021
Copy link
Member

@dfuch dfuch left a comment

LGTM.
Might be good to have at least a manual test to verify that for ATR - I'm OK if this is done in a followup PR

@openjdk
Copy link

@openjdk openjdk bot commented Dec 7, 2021

@FrauBoes This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8278158: jwebserver should set request timeout

Reviewed-by: dfuchs, michaelm

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 6 new commits pushed to the master branch:

  • 5b81d5e: 8276901: Implement UseHeavyMonitors consistently
  • 69d8669: 8278339: ServerSocket::isClosed may return false after accept throws
  • 56ca66e: 8277863: Deprecate sun.misc.Unsafe methods that return offsets
  • 3536127: 8277383: VM.metaspace optionally show chunk freelist details
  • 44fcee3: 8278289: Drop G1BlockOffsetTablePart::_object_can_span
  • b2638e5: 8244602: Add JTREG_REPEAT_COUNT to repeat execution of a test

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready label Dec 7, 2021
Copy link
Member

@Michael-Mc-Mahon Michael-Mc-Mahon left a comment

LGTM

@FrauBoes
Copy link
Member Author

@FrauBoes FrauBoes commented Dec 8, 2021

Might be good to have at least a manual test to verify that for ATR - I'm OK if this is done in a followup PR

I agree, I'll add a manual test separately.

@FrauBoes
Copy link
Member Author

@FrauBoes FrauBoes commented Dec 8, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Dec 8, 2021

Going to push as commit 10e0318.
Since your change was applied there have been 28 commits pushed to the master branch:

  • 5dcdee4: 8262341: Refine identical code in AddI/LNode.
  • b334d96: 8276964: Better indicate a snippet that could not be processed
  • 30f0c64: 8277992: Add fast jdk_svc subtests to jdk:tier3
  • 5266e7d: 8278379: Zero VM is broken due to UseRTMForStackLocks was not declared after JDK-8276901
  • e7db581: 8277168: AArch64: Enable arraycopy partial inlining with SVE
  • fb6d611: 8278276: G1: Refine naming of G1GCParPhaseTimesTracker::_must_record
  • d7ad546: 8276422: Add command-line option to disable finalization
  • ec7cb6d: 8276447: Deprecate finalization-related methods for removal
  • 3c2951f: 8275771: JDK source code contains redundant boolean operations in jdk.compiler and langtools
  • 3d61372: 8278363: Create extented container test groups
  • ... and 18 more: https://git.openjdk.java.net/jdk/compare/07669e3bc65b1728d784e21ec83b437374f9fa19...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Dec 8, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Dec 8, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Dec 8, 2021

@FrauBoes Pushed as commit 10e0318.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@FrauBoes FrauBoes deleted the 8278158 branch Dec 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated net
3 participants