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

v4.8.3 proposal #12499

Merged
merged 15 commits into from
May 2, 2017
Merged

v4.8.3 proposal #12499

merged 15 commits into from
May 2, 2017

Commits on Apr 19, 2017

  1. tls: TLSSocket emits 'error' on handshake failure

    Removes branch that would make TLSSocket emit '_tlsError' event if
    error occured on handshake and control was not released, as it was
    never happening.  Added test for tls.Server to ensure it still emits
    'tlsClientError' as expected.
    
    Note that 'tlsClientError' does not exist in the v4.x branch so this
    back-port emits 'clientError' instead.  See also pull request #4557.
    
    Fixes: #8803
    PR-URL: #8805
    Refs: #4557
    Reviewed-By: Matteo Collina <[email protected]>
    Reviewed-By: Fedor Indutny <[email protected]>
    lekoder authored and MylesBorins committed Apr 19, 2017
    Configuration menu
    Copy the full SHA
    6d3aaa7 View commit details
    Browse the repository at this point in the history
  2. doc: add supported platforms list for v4.x

    PR-URL: #12091
    Reviewed-By: James M Snell <[email protected]>
    Reviewed-By: JoãReis <[email protected]>
    Reviewed-By: Johan Bergströ[email protected]>
    mhdawson authored and MylesBorins committed Apr 19, 2017
    Configuration menu
    Copy the full SHA
    07b92a3 View commit details
    Browse the repository at this point in the history
  3. test: add test for loading from global folders

    Test executes with a copy of the node executable since $PREFIX/lib/node
    is relative to the executable location.
    
    PR-URL: #9283
    Reviewed-By: Sam Roberts <[email protected]>
    Reviewed-By: Gibson Fahnestock <[email protected]>
    Reviewed-By: João Reis <[email protected]>
    Reviewed-By: Ben Noordhuis <[email protected]>
    richardlau authored and MylesBorins committed Apr 19, 2017
    Configuration menu
    Copy the full SHA
    1dc6b38 View commit details
    Browse the repository at this point in the history
  4. module: fix loading from global folders on Windows

    Code was calculating $PREFIX/lib/node relative to process.execPath, but
    on Windows process.execPath is $PREFIX\node.exe whereas everywhere else
    process.execPath is $PREFIX/bin/node (where $PREFIX is the root of the
    installed Node.js).
    
    PR-URL: #9283
    Reviewed-By: Sam Roberts <[email protected]>
    Reviewed-By: Gibson Fahnestock <[email protected]>
    Reviewed-By: João Reis <[email protected]>
    Reviewed-By: Ben Noordhuis <[email protected]>
    richardlau authored and MylesBorins committed Apr 19, 2017
    Configuration menu
    Copy the full SHA
    ba91c41 View commit details
    Browse the repository at this point in the history
  5. tls: keep track of stream that is closed

    TLSWrap object keeps a pointer reference to the underlying
    TCPWrap object. This TCPWrap object could be closed and deleted
    by the event-loop which leaves us with a dangling pointer.
    So the TLSWrap object needs to track the "close" event on the
    TCPWrap object.
    
    PR-URL: #11776
    Reviewed-By: Fedor Indutny <[email protected]>
    Reviewed-By: James M Snell <[email protected]>
    Reviewed-By: Brian White <[email protected]>
    jBarz authored and MylesBorins committed Apr 19, 2017
    Configuration menu
    Copy the full SHA
    99749dc View commit details
    Browse the repository at this point in the history
  6. stream_base,tls_wrap: notify on destruct

    The TLSWrap constructor is passed a StreamBase* which it stores as
    TLSWrap::stream_, and is used to receive/send data along the pipeline
    (e.g. tls -> tcp). Problem is the lifetime of the instance that stream_
    points to is independent of the lifetime of the TLSWrap instance. So
    it's possible for stream_ to be delete'd while the TLSWrap instance is
    still alive, allowing potential access to a then invalid pointer.
    
    Fix by having the StreamBase destructor null out TLSWrap::stream_;
    allowing all TLSWrap methods that rely on stream_ to do a check to see
    if it's available.
    
    While the test provided is fixed by this commit, it was also previously
    fixed by 478fabf. Regardless, leave the test in for better testing.
    
    PR-URL: #11947
    Reviewed-By: Franziska Hinkelmann <[email protected]>
    Reviewed-By: James M Snell <[email protected]>
    Reviewed-By: Anna Henningsen <[email protected]>
    trevnorris authored and MylesBorins committed Apr 19, 2017
    Configuration menu
    Copy the full SHA
    ff1d61c View commit details
    Browse the repository at this point in the history
  7. Partial revert "tls: keep track of stream that is closed"

    This partually reverts commit 4cdb0e8.
    
    A nullptr check in TSLWrap::IsAlive() and the added test were left.
    
    PR-URL: #11947
    Reviewed-By: Franziska Hinkelmann <[email protected]>
    Reviewed-By: James M Snell <[email protected]>
    Reviewed-By: Anna Henningsen <[email protected]>
    trevnorris authored and MylesBorins committed Apr 19, 2017
    Configuration menu
    Copy the full SHA
    4426080 View commit details
    Browse the repository at this point in the history
  8. tls: fix segfault on destroy after partial read

    OnRead() calls into JS land which can result in the SSL context object
    being destroyed on return.  Check that `ssl_ != nullptr` afterwards.
    
    Fixes: #11885
    PR-URL: #11898
    Reviewed-By: Colin Ihrig <[email protected]>
    Reviewed-By: James M Snell <[email protected]>
    bnoordhuis authored and MylesBorins committed Apr 19, 2017
    Configuration menu
    Copy the full SHA
    54f5258 View commit details
    Browse the repository at this point in the history
  9. deps: cherry-pick ca0f9573 from V8 upstream

    Original commit message:
      Trigger OOM crash if no memory returned in v8::ArrayBuffer::New and v…
      …8::SharedArrayBuffer::New.
    
      This API does not allow reporting failure, but we should crash rather than have
      the caller get an ArrayBuffer that isn't properly set up.
    
      BUG=chromium:681843
    
      Review-Url: https://codereview.chromium.org/2641953002
      Cr-Commit-Position: refs/heads/master@{#42511}
    
    PR-URL: #11940
    Reviewed-By: Anna Henningsen <[email protected]>
    Reviewed-By: James M Snell <[email protected]>
    Reviewed-By: Ben Noordhuis <[email protected]>
    ofrobots authored and MylesBorins committed Apr 19, 2017
    Configuration menu
    Copy the full SHA
    ab3fdf5 View commit details
    Browse the repository at this point in the history
  10. src: ensure that fd 0-2 are valid on windows

    Check that stdin, stdout and stderr are valid file descriptors on
    Windows. If not, reopen them with 'nul' file.
    
    Refs: #875
    Fixes: #11656
    PR-URL: #11863
    Reviewed-By: Ben Noordhuis <[email protected]>
    Reviewed-By: James M Snell <[email protected]>
    Reviewed-By: Jeremiah Senkpiel <[email protected]>
    Reviewed-By: Anna Henningsen <[email protected]>
    bzoz authored and MylesBorins committed Apr 19, 2017
    Configuration menu
    Copy the full SHA
    8ed18a1 View commit details
    Browse the repository at this point in the history
  11. test: add hasCrypto check to tls-socket-close

    Currently test-tls-socket-close will fail if node
    was built using --without-ssl. This commit adds a check to
    verify is crypto support exists and if not skip this test.
    
    PR-URL: #11911
    Reviewed-By: Ben Noordhuis <[email protected]>
    Reviewed-By: Luigi Pinca <[email protected]>
    Reviewed-By: Yuta Hiroto <[email protected]>
    Reviewed-By: Colin Ihrig <[email protected]>
    Reviewed-By: Anna Henningsen <[email protected]>
    Reviewed-By: James M Snell <[email protected]>
    danbev authored and MylesBorins committed Apr 19, 2017
    Configuration menu
    Copy the full SHA
    7a1920d View commit details
    Browse the repository at this point in the history
  12. src: fix base64 decoding

    Make sure trailing garbage is not treated as a valid base64 character.
    
    Fixes: #11987
    PR-URL: #11995
    Reviewed-By: Anna Henningsen <[email protected]>
    seishun authored and MylesBorins committed Apr 19, 2017
    Configuration menu
    Copy the full SHA
    eb393f9 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2017

  1. src: add fcntl.h include to node.cc

    #11863 adds _O_RDWR to node.cc
    which is defined in fcntl.h. This adds this include directly to
    node.cc.
    
    PR-URL: #12540
    Reviewed-By: Colin Ihrig <[email protected]>
    Reviewed-By: James M Snell <[email protected]>
    Reviewed-By: Gibson Fahnestock <[email protected]>
    Reviewed-By: Anna Henningsen <[email protected]>
    Reviewed-By: Myles Borins <[email protected]>
    bzoz authored and MylesBorins committed Apr 24, 2017
    Configuration menu
    Copy the full SHA
    b5b78b1 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2017

  1. test: fix flaky test-tls-wrap-timeout

    Competing timers were causing a race condition and thus the test was
    flaky. Instead, we check an object property on process exit.
    
    Fixes: #7650
    Backport-PR-URL: #12567
    PR-URL: #7857
    Reviewed-By: Santiago Gimeno <[email protected]>
    Reviewed-By: Fedor Indutny <[email protected]>
    Reviewed-By: jasnell - James M Snell <[email protected]>
    Trott authored and MylesBorins committed May 2, 2017
    Configuration menu
    Copy the full SHA
    6040efd View commit details
    Browse the repository at this point in the history
  2. 2017-05-02, Version 4.8.3 'Argon' (Maintenance)

    Notable Changes:
    
    * module:
      - The module loading global fallback to the Node executable's
        directory now works correctly on Windows.
        (Richard Lau) #9283
    * src:
      - fix base64 decoding in rare edgecase
        (Nikolai Vavilov) #11995
    * tls:
      - fix rare segmentation faults when using TLS
       * (Trevor Norris) #11947
       * (Ben Noordhuis) #11898
       * (jBarz) #11776
    
    PR-URL: #12499
    MylesBorins committed May 2, 2017
    Configuration menu
    Copy the full SHA
    788f280 View commit details
    Browse the repository at this point in the history