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.

Sign up for GitHub

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

Jump to bottom

Issue #5605 unconsumed input on sendError #5637

Merged
merged 22 commits into from
Nov 18, 2020
Merged

Issue #5605 unconsumed input on sendError #5637

merged 22 commits into from
Nov 18, 2020

Commits on Nov 10, 2020

  1. Issue #5605 unconsumed input on sendError 

    Add Connection:close if content can't be consumed during a sendError. Processed after the request has returned to the container.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
    @gregw
    gregw committed Nov 10, 2020
    Configuration menu
    Copy the full SHA
    0cdc78e View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2020

  1. Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-56… 

    …05-unconsumed-send-error
    @gregw
    gregw committed Nov 11, 2020
    Configuration menu
    Copy the full SHA
    368b071 View commit details
    Browse the repository at this point in the history

  2. Update from review 

     + Add close on all uncommitted requests when content cannot be consumed.
    @gregw
    gregw committed Nov 11, 2020
    Configuration menu
    Copy the full SHA
    4b934b5 View commit details
    Browse the repository at this point in the history

  3. Update from review 

     + fixed comment
 + space comma
    @gregw
    gregw committed Nov 11, 2020
    Configuration menu
    Copy the full SHA
    6ea3c05 View commit details
    Browse the repository at this point in the history

  4. Only consume input in COMPLETE if response is >=200 (ie not an upgrad… 

    …e or similar)
    @gregw
    gregw committed Nov 11, 2020
    Configuration menu
    Copy the full SHA
    83ad9cc View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2020

  1. Updated to be less adventurous 

    I do not think it was valid to always consumeAll in COMPLETE as this could break upgrades with both 101s and 200s
Instead I have reverted to having this consumeAll logic only:
 + in sendError once control has passed back to the container and we are about to generate an error page.
 + in front of all the sendRedirection that we do without calling the application first.

Extra tests also added
    @gregw
    gregw committed Nov 12, 2020
    Configuration menu
    Copy the full SHA
    ef560df View commit details
    Browse the repository at this point in the history

  2. Updated to be less adventurous 

    reverted test
    @gregw
    gregw committed Nov 12, 2020
    Configuration menu
    Copy the full SHA
    8c0e4fe View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2020

  1. Testcase for odd sendError(400) issue. 

    Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
    @joakime
    joakime committed Nov 14, 2020
    Configuration menu
    Copy the full SHA
    727b3e1 View commit details
    Browse the repository at this point in the history

  2. Fix for odd sendError(400) issue. 

    Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
    @sbordet
    sbordet committed Nov 14, 2020
    Configuration menu
    Copy the full SHA
    59611a4 View commit details
    Browse the repository at this point in the history

  3. Testcase for odd sendError(400) issue. 

    Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
    @joakime @gregw
    joakime authored and gregw committed Nov 14, 2020
    Configuration menu
    Copy the full SHA
    7846e0f View commit details
    Browse the repository at this point in the history

  4. Always try to consumeAll on all requests

    @gregw
    gregw committed Nov 14, 2020
    Configuration menu
    Copy the full SHA
    66ea4cc View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2020

  1. Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-56… 

    …05-unconsumed-send-error
    @gregw
    gregw committed Nov 16, 2020
    Configuration menu
    Copy the full SHA
    0518273 View commit details
    Browse the repository at this point in the history

  2. Refinements after testing in 10

    @gregw
    gregw committed Nov 16, 2020
    Configuration menu
    Copy the full SHA
    c04f31b View commit details
    Browse the repository at this point in the history

  3. Refinements after testing in 10 

    Fixed test
    @gregw
    gregw committed Nov 16, 2020
    Configuration menu
    Copy the full SHA
    901e6dc View commit details
    Browse the repository at this point in the history

  4. Fixed comment from review

    @gregw
    gregw committed Nov 16, 2020
    Configuration menu
    Copy the full SHA
    bdbd5d9 View commit details
    Browse the repository at this point in the history

  5. Updates from review 

    + added redirect methods that consumeAll
+ ensureContentConsumedOrConnectionClose renamed to ensureConsumeAllOrNotPersistent
+ ensureConsumeAllOrNotPersistent now handles HTTP/1.0 and HTTP/1.1 differently
    @gregw
    gregw committed Nov 16, 2020
    Configuration menu
    Copy the full SHA
    cbaf3bf View commit details
    Browse the repository at this point in the history

  6. better consumeAll implementation

    @gregw
    gregw committed Nov 16, 2020
    Configuration menu
    Copy the full SHA
    9c6d60d View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2020

  1. update from review 

     + better javadoc
 + filter out keep-alive
 + added more tests
    @gregw
    gregw committed Nov 17, 2020
    Configuration menu
    Copy the full SHA
    5daecad View commit details
    Browse the repository at this point in the history

  2. update from review 

     + better javadoc
    @gregw
    gregw committed Nov 17, 2020
    Configuration menu
    Copy the full SHA
    578a961 View commit details
    Browse the repository at this point in the history

  3. update from review 

     + fixed form redirection test for http 1.0 and 1.1
    @gregw
    gregw committed Nov 17, 2020
    Configuration menu
    Copy the full SHA
    9a5f987 View commit details
    Browse the repository at this point in the history

  4. update from review 

     + HttpGenerator removes keep-alive if close present
 + Use isRedirection
    @gregw
    gregw committed Nov 17, 2020
    Configuration menu
    Copy the full SHA
    bff386b View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2020

  1. Merge remote-tracking branch 'origin/jetty-9.4.x-400-gzip' into jetty… 

    …-9.4.x-5605-unconsumed-send-error
    @gregw
    gregw committed Nov 18, 2020
    Configuration menu
    Copy the full SHA
    f3a5868 View commit details
    Browse the repository at this point in the history