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

Revert "Revert "repl: disable Ctrl+C support..." #12123

Merged
merged 1 commit into from Mar 29, 2017

Conversation

Projects
None yet
5 participants
@MylesBorins
Member

MylesBorins commented Mar 29, 2017

Full original message:

Revert "repl: disable Ctrl+C support on win32 for now"

This reverts commit 1d400ea.

Refs: #8645

@addaleax

LGTM, can’t wait for the revert ;)

@addaleax

This comment has been minimized.

Show comment
Hide comment
@addaleax

addaleax Mar 29, 2017

Member

Maybe also add Fixes: https://github.com/nodejs/node/issues/12085

Member

addaleax commented Mar 29, 2017

Maybe also add Fixes: https://github.com/nodejs/node/issues/12085

Revert "Revert "repl: disable Ctrl+C support..."
Full original message:

  Revert "repl: disable Ctrl+C support on win32 for now"

This reverts commit 1d400ea.

Fixes: #12085
Refs: #8645

PR-URL: #12123
Reviewed-By: Anna Henningsen <anna@addaleax.net>

@MylesBorins MylesBorins merged commit ee453a4 into nodejs:v6.x-staging Mar 29, 2017

@MylesBorins

This comment has been minimized.

Show comment
Hide comment
@MylesBorins

MylesBorins Mar 29, 2017

Member

landed in 59b869e

edit: updated sha

Member

MylesBorins commented Mar 29, 2017

landed in 59b869e

edit: updated sha

@jasnell

This comment has been minimized.

Show comment
Hide comment
@jasnell

jasnell Mar 29, 2017

Member

Hmm.. could you include a short explanation here about why it is reverted, just so folks have the context.

Member

jasnell commented Mar 29, 2017

Hmm.. could you include a short explanation here about why it is reverted, just so folks have the context.

MylesBorins added a commit that referenced this pull request Mar 29, 2017

Revert "Revert "repl: disable Ctrl+C support..."
Full original message:

  Revert "repl: disable Ctrl+C support on win32 for now"

The original fix was a stop gap until a libuv update landed.
As the libuv update has not yet landed on v6.x the revert should
not have landed. This commit reverts 1d400ea reapplying the
stopgap fix until we update libuv.

Fixes: #12085
Refs: #8645

PR-URL: #12123
Reviewed-By: Anna Henningsen <anna@addaleax.net>
@MylesBorins

This comment has been minimized.

Show comment
Hide comment
@MylesBorins

MylesBorins Mar 29, 2017

Member

I've updated the commit with the following copy. the sha has been updated above

The original fix was a stop gap until a libuv update landed.
As the libuv update has not yet landed on v6.x the revert should
not have landed. This commit reverts 1d400ea reapplying the
stopgap fix until we update libuv.

Member

MylesBorins commented Mar 29, 2017

I've updated the commit with the following copy. the sha has been updated above

The original fix was a stop gap until a libuv update landed.
As the libuv update has not yet landed on v6.x the revert should
not have landed. This commit reverts 1d400ea reapplying the
stopgap fix until we update libuv.

MylesBorins added a commit that referenced this pull request Mar 29, 2017

Revert "Revert "repl: disable Ctrl+C support..."
Full original message:

  Revert "repl: disable Ctrl+C support on win32 for now"

The original fix was a stop gap until a libuv update landed.
As the libuv update has not yet landed on v6.x the revert should
not have landed. This commit reverts 1d400ea reapplying the
stopgap fix until we update libuv.

Fixes: #12085
Refs: #8645

PR-URL: #12123
Reviewed-By: Anna Henningsen <anna@addaleax.net>

@MylesBorins MylesBorins referenced this pull request Mar 29, 2017

Merged

V6.10.2 proposal #12128

MylesBorins added a commit that referenced this pull request Mar 29, 2017

2017-04-04, Version 6.10.2 'Boron' (LTS)
This is a special LTS to fix a number of regressions that were found
on the 6.10.x release line.

This includes:

 * a fix for memory leak in the crypto module that
   was introduced in 6.10.1
 * a fix for a regression introduced to the windows repl in 6.10.0
 * a backported fix for V8 to stop a segfault that could occur
   when using spread syntax

It also includes an upgrade to zlib 1.2.11 to fix a numberof low
severity CVEs that were present in zlib 1.2.8.

http://seclists.org/oss-sec/2016/q4/602

Notable changes

* crypto:
  - fix memory leak if certificate is revoked (Tom Atkinson)
    #12089
* deps:
  - upgrade zlib to 1.2.11 (Sam Roberts)
    #10980
  - backport V8 fixes for spread syntax regression causing segfaults
    (Michaël Zasso) #12037
* repl:
  - Revert commit that broke REPL display on Windows (Myles Borins)
    #12123
@gibfahn

This comment has been minimized.

Show comment
Hide comment
@gibfahn

gibfahn Mar 29, 2017

Member

Does this mean we'll have a Revert "Revert "Revert "repl: disable Ctrl+C... in the next update?

Member

gibfahn commented Mar 29, 2017

Does this mean we'll have a Revert "Revert "Revert "repl: disable Ctrl+C... in the next update?

@addaleax

This comment has been minimized.

Show comment
Hide comment
@addaleax

addaleax Mar 29, 2017

Member

@gibfahn The original Revert (#8645) was landed too early in v6.x, it needs to come with the libuv 1.10.x upgrade. So, yes, together with that we should be able to land a Revert³. 😄

Member

addaleax commented Mar 29, 2017

@gibfahn The original Revert (#8645) was landed too early in v6.x, it needs to come with the libuv 1.10.x upgrade. So, yes, together with that we should be able to land a Revert³. 😄

MylesBorins added a commit that referenced this pull request Apr 4, 2017

2017-04-04, Version 6.10.2 'Boron' (LTS)
This is a special LTS to fix a number of regressions that were found
on the 6.10.x release line.

This includes:

 * a fix for memory leak in the crypto module that
   was introduced in 6.10.1
 * a fix for a regression introduced to the windows repl in 6.10.0
 * a backported fix for V8 to stop a segfault that could occur
   when using spread syntax

It also includes an upgrade to zlib 1.2.11 to fix a numberof low
severity CVEs that were present in zlib 1.2.8.

http://seclists.org/oss-sec/2016/q4/602

Notable changes

* crypto:
  - fix memory leak if certificate is revoked (Tom Atkinson)
    #12089
* deps:
  - upgrade zlib to 1.2.11 (Sam Roberts)
    #10980
  - backport V8 fixes for spread syntax regression causing segfaults
    (Michaël Zasso) #12037
* repl:
  - Revert commit that broke REPL display on Windows (Myles Borins)
    #12123

MylesBorins added a commit to MylesBorins/node that referenced this pull request Apr 4, 2017

2017-04-04, Version 6.10.2 'Boron' (LTS)
This is a special LTS to fix a number of regressions that were found
on the 6.10.x release line.

This includes:

 * a fix for memory leak in the crypto module that
   was introduced in 6.10.1
 * a fix for a regression introduced to the windows repl in 6.10.0
 * a backported fix for V8 to stop a segfault that could occur
   when using spread syntax

It also includes an upgrade to zlib 1.2.11 to fix a numberof low
severity CVEs that were present in zlib 1.2.8.

http://seclists.org/oss-sec/2016/q4/602

Notable changes

* crypto:
  - fix memory leak if certificate is revoked (Tom Atkinson)
    nodejs#12089
* deps:
  - upgrade zlib to 1.2.11 (Sam Roberts)
    nodejs#10980
  - backport V8 fixes for spread syntax regression causing segfaults
    (Michaël Zasso) nodejs#12037
* repl:
  - Revert commit that broke REPL display on Windows (Myles Borins)
    nodejs#12123

imyller added a commit to imyller/meta-nodejs that referenced this pull request Apr 20, 2017

2017-04-04, Version 6.10.2 'Boron' (LTS)
    This is a special LTS to fix a number of regressions that were found
    on the 6.10.x release line.

    This includes:

     * a fix for memory leak in the crypto module that
       was introduced in 6.10.1
     * a fix for a regression introduced to the windows repl in 6.10.0
     * a backported fix for V8 to stop a segfault that could occur
       when using spread syntax

    It also includes an upgrade to zlib 1.2.11 to fix a numberof low
    severity CVEs that were present in zlib 1.2.8.

    http://seclists.org/oss-sec/2016/q4/602

    Notable changes

    * crypto:
      - fix memory leak if certificate is revoked (Tom Atkinson)
        nodejs/node#12089
    * deps:
      - upgrade zlib to 1.2.11 (Sam Roberts)
        nodejs/node#10980
      - backport V8 fixes for spread syntax regression causing segfaults
        (Michaël Zasso) nodejs/node#12037
    * repl:
      - Revert commit that broke REPL display on Windows (Myles Borins)
        nodejs/node#12123

Signed-off-by: Ilkka Myller <ilkka.myller@nodefield.com>

imyller added a commit to imyller/meta-nodejs that referenced this pull request Apr 20, 2017

2017-04-04, Version 6.10.2 'Boron' (LTS)
    This is a special LTS to fix a number of regressions that were found
    on the 6.10.x release line.

    This includes:

     * a fix for memory leak in the crypto module that
       was introduced in 6.10.1
     * a fix for a regression introduced to the windows repl in 6.10.0
     * a backported fix for V8 to stop a segfault that could occur
       when using spread syntax

    It also includes an upgrade to zlib 1.2.11 to fix a numberof low
    severity CVEs that were present in zlib 1.2.8.

    http://seclists.org/oss-sec/2016/q4/602

    Notable changes

    * crypto:
      - fix memory leak if certificate is revoked (Tom Atkinson)
        nodejs/node#12089
    * deps:
      - upgrade zlib to 1.2.11 (Sam Roberts)
        nodejs/node#10980
      - backport V8 fixes for spread syntax regression causing segfaults
        (Michaël Zasso) nodejs/node#12037
    * repl:
      - Revert commit that broke REPL display on Windows (Myles Borins)
        nodejs/node#12123

Signed-off-by: Ilkka Myller <ilkka.myller@nodefield.com>

@MylesBorins MylesBorins deleted the MylesBorins:revert-windows-repl branch Nov 14, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment