Skip to content

V6.10.2 proposal #12128

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

Merged
MylesBorins merged 8 commits into from
Apr 4, 2017
Merged

V6.10.2 proposal #12128

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
52bdb8f
deps: backport 2cabc86 from upstream V8
targos Mar 25, 2017
8dfc710
deps: cherry-pick b9f682b from upstream V8
targos Mar 25, 2017
1ff512c
deps: backport e427300 from upstream V8
targos Mar 25, 2017
5f644d2
crypto: fix memory leak if certificate is revoked
Mar 28, 2017
abe9132
deps: upgrade zlib to 1.2.11
sam-github Jan 20, 2017
912f78a
deps: fix CLEAR_HASH macro to be usable as a single statement
sam-github Feb 28, 2017
64fc5a4
Revert "Revert "repl: disable Ctrl+C support..."
MylesBorins Mar 28, 2017
fbc9fde
2017-04-04, Version 6.10.2 'Boron' (LTS)
MylesBorins Mar 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
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>
  • Loading branch information
@MylesBorins
MylesBorins committed Mar 29, 2017
commit 64fc5a45417e5d487f163af686ee89bd5444c19f
11 changes: 9 additions & 2 deletions lib/repl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,13 @@ function REPLServer(prompt,
if (!err) {
// Unset raw mode during evaluation so that Ctrl+C raises a signal.
let previouslyInRawMode;
if (self.breakEvalOnSigint) {

// Temporarily disabled on Windows due to output problems that likely
// result from the raw mode switches here, see
// https://github.com/nodejs/node/issues/7837
// Setting NODE_REPL_CTRLC is meant as a temporary opt-in for debugging.
if (self.breakEvalOnSigint &&
(process.platform !== 'win32' || process.env.NODE_REPL_CTRLC)) {
// Start the SIGINT watchdog before entering raw mode so that a very
// quick Ctrl+C doesn’t lead to aborting the process completely.
utilBinding.startSigintWatchdog();
Expand All @@ -342,7 +348,8 @@ function REPLServer(prompt,
result = script.runInContext(context, scriptOptions);
}
} finally {
if (self.breakEvalOnSigint) {
if (self.breakEvalOnSigint &&
(process.platform !== 'win32' || process.env.NODE_REPL_CTRLC)) {
// Reset terminal mode to its previous value.
self._setRawMode(previouslyInRawMode);

Expand Down