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

[v6.x backport] tls: fix writeQueueSize prop, long write timeouts #16420

Closed
wants to merge 3 commits into from
Closed

[v6.x backport] tls: fix writeQueueSize prop, long write timeouts #16420

wants to merge 3 commits into from

Commits on Dec 12, 2017

  1. tls: properly track writeQueueSize during writes 

    Make writeQueueSize represent the actual size of the write queue
within the TLS socket. Add tls test to confirm that bufferSize
works as expected.

PR-URL: nodejs#15791
Fixes: nodejs#15005
Refs: nodejs#15006
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
    @apapirovski
    apapirovski committed Dec 12, 2017
    Configuration menu
    Copy the full SHA
    7533f59 View commit details
    Browse the repository at this point in the history

  2. net: fix timeouts during long writes 

    Add updateWriteQueueSize which updates and returns queue size
(net & tls). Make _onTimeout check whether an active write
is ongoing and if so, call _unrefTimer rather than emitting
a timeout event.

Add http & https test that checks whether long-lasting (but
active) writes timeout or can finish writing as expected.

PR-URL: nodejs#15791
Fixes: nodejs#15082
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
    @apapirovski
    apapirovski committed Dec 12, 2017
    Configuration menu
    Copy the full SHA
    3b5ac77 View commit details
    Browse the repository at this point in the history

  3. net: fix timeout with null handle 

    This commit handles the case where _onTimeout is called with a
null handle.

Refs: nodejs#15791
Fixes: nodejs#16484
PR-URL: nodejs#16489
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
    @apapirovski
    apapirovski committed Dec 12, 2017
    Configuration menu
    Copy the full SHA
    920f2ff View commit details
    Browse the repository at this point in the history