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

Send 408 request timeout even when queue requests is disabled #2119

Merged
merged 1 commit into from Feb 20, 2020

Conversation

@wjordan
Copy link
Contributor

wjordan commented Feb 20, 2020

Description

Return a 408 Request Timeout response based on first_data_timeout when queue_requests is disabled, matching the behavior for when queue_requests is enabled (the default).

Your checklist for this pull request

  • I have reviewed the guidelines for contributing to this repository.
  • I have added an entry to History.md if this PR fixes a bug or adds a feature. If it doesn't need an entry to HISTORY.md, I have added [changelog skip] the pull request title.
  • I have added appropriate tests if this PR fixes a bug or adds a feature.
  • My pull request is 100 lines added/removed or less so that it can be easily reviewed.
  • If this PR doesn't need tests (docs change), I added [ci skip] to the title of the PR.
  • If this closes any issues, I have added "Closes #issue" to the PR description or my commit messages.
  • I have updated the documentation accordingly.
  • All new and existing tests passed, including Rubocop.
@wjordan wjordan force-pushed the wjordan:timeout_data_no_queue_requests branch from d73ec35 to e47121c Feb 20, 2020
@wjordan wjordan force-pushed the wjordan:timeout_data_no_queue_requests branch from e47121c to 109e49a Feb 20, 2020
@nateberkopec nateberkopec added the bug label Feb 20, 2020
@nateberkopec
Copy link
Member

nateberkopec commented Feb 20, 2020

Good catch. Test hangs on master (as expected).

@nateberkopec nateberkopec merged commit 4f8a85f into puma:master Feb 20, 2020
20 checks passed
20 checks passed
build
Details
ubuntu-18.04, 2.3
Details
ubuntu-18.04, 2.4
Details
ubuntu-18.04, 2.5
Details
ubuntu-18.04, 2.6
Details
ubuntu-18.04, 2.7
Details
ubuntu-18.04, ruby-head
Details
macos, 2.3
Details
macos, 2.4
Details
macos, 2.5
Details
macos, 2.6
Details
macos, 2.7
Details
macos, ruby-head
Details
windows-latest, 2.3
Details
windows-latest, 2.4
Details
windows-latest, 2.5
Details
windows-latest, 2.6
Details
windows-latest, 2.7
Details
windows-latest, ruby-head
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.