From 55a1f94e44d6ed76dc5be1a625cac3c524f71dc7 Mon Sep 17 00:00:00 2001 From: Roman Reiss Date: Sun, 27 Sep 2015 13:59:53 +0200 Subject: [PATCH 1/6] dns: remove nonexistant exports.ADNAME MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This error code export was mistakingly introduced in a 2012 commit which added more error codes. The correct export.BADNAME was added in https://github.com/nodejs/node/pull/3051. Semver: Major PR-URL: https://github.com/nodejs/node/pull/3051 Fixes: https://github.com/nodejs/node/issues/3050 Reviewed-By: Сковорода Никита Андреевич Reviewed-By: Sakthipriyan Vairamani --- lib/dns.js | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/dns.js b/lib/dns.js index e1a2c03385309d..bbbcec13ff97fb 100644 --- a/lib/dns.js +++ b/lib/dns.js @@ -330,7 +330,6 @@ exports.NOTFOUND = 'ENOTFOUND'; exports.NOTIMP = 'ENOTIMP'; exports.REFUSED = 'EREFUSED'; exports.BADQUERY = 'EBADQUERY'; -exports.ADNAME = 'EADNAME'; exports.BADNAME = 'EBADNAME'; exports.BADFAMILY = 'EBADFAMILY'; exports.BADRESP = 'EBADRESP'; From b97358a772748dddabfb382f8c38275a2dd2951d Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Sat, 26 Sep 2015 15:49:04 -0700 Subject: [PATCH 2/6] test: replace deprecated util.debug() calls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit common.debug() is just util.debug() and emits a deprecation notice. Per docs, use console.error() instead. PR-URL: https://github.com/nodejs/node/pull/3082 Reviewed-By: Michaël Zasso --- test/disabled/test-sendfd.js | 2 +- test/parallel/test-file-read-noexist.js | 4 ++-- test/parallel/test-fs-realpath.js | 1 - test/parallel/test-http-after-connect.js | 8 ++++---- test/parallel/test-http-connect.js | 4 ++-- test/parallel/test-http-expect-continue.js | 10 +++++----- test/parallel/test-http-legacy.js | 8 ++++---- test/parallel/test-http-pause.js | 12 +++++------ test/parallel/test-http-pipe-fs.js | 4 ++-- test/parallel/test-http-set-timeout.js | 2 +- test/parallel/test-http.js | 8 ++++---- test/parallel/test-https-drain.js | 8 ++++---- test/parallel/test-module-loading-error.js | 2 +- test/parallel/test-net-listen-close-server.js | 2 +- test/parallel/test-net-listen-error.js | 2 +- test/parallel/test-tls-client-reject.js | 4 ++-- test/parallel/test-tls-pause.js | 6 +++--- .../test-tls-peer-certificate-encoding.js | 2 +- .../test-tls-peer-certificate-multi-keys.js | 2 +- test/parallel/test-tls-peer-certificate.js | 2 +- test/pummel/test-net-pause.js | 2 +- test/pummel/test-net-pingpong-delay.js | 4 ++-- test/sequential/test-module-loading.js | 20 +++++++++---------- test/sequential/test-pump-file2tcp-noexist.js | 4 ++-- 24 files changed, 61 insertions(+), 62 deletions(-) diff --git a/test/disabled/test-sendfd.js b/test/disabled/test-sendfd.js index 4eefbeab549685..b48acadba51768 100644 --- a/test/disabled/test-sendfd.js +++ b/test/disabled/test-sendfd.js @@ -52,7 +52,7 @@ var logChild = function(d) { d.split('\n').forEach(function(l) { if (l.length > 0) { - common.debug('CHILD: ' + l); + console.error('CHILD: ' + l); } }); }; diff --git a/test/parallel/test-file-read-noexist.js b/test/parallel/test-file-read-noexist.js index 47c8d256e3ba18..a976e534bc3455 100644 --- a/test/parallel/test-file-read-noexist.js +++ b/test/parallel/test-file-read-noexist.js @@ -10,8 +10,8 @@ fs.readFile(filename, 'raw', function(err, content) { if (err) { got_error = true; } else { - common.debug('cat returned some content: ' + content); - common.debug('this shouldn\'t happen as the file doesn\'t exist...'); + console.error('cat returned some content: ' + content); + console.error('this shouldn\'t happen as the file doesn\'t exist...'); assert.equal(true, false); } }); diff --git a/test/parallel/test-fs-realpath.js b/test/parallel/test-fs-realpath.js index 9082e1d65f4d0e..fc2db16e1049c1 100644 --- a/test/parallel/test-fs-realpath.js +++ b/test/parallel/test-fs-realpath.js @@ -326,7 +326,6 @@ function test_deep_symlink_mix(callback) { [fixturesAbsDir + '/nested-index/two/realpath-c', '../../../' + common.tmpDirName + '/cycles/root.js'] ].forEach(function(t) { - //common.debug('setting up '+t[0]+' -> '+t[1]); try { fs.unlinkSync(t[0]); } catch (e) {} fs.symlinkSync(t[1], t[0]); unlink.push(t[0]); diff --git a/test/parallel/test-http-after-connect.js b/test/parallel/test-http-after-connect.js index 19011fcbcb4fc4..edd03b2178b2ba 100644 --- a/test/parallel/test-http-after-connect.js +++ b/test/parallel/test-http-after-connect.js @@ -8,7 +8,7 @@ var serverRequests = 0; var clientResponses = 0; var server = http.createServer(function(req, res) { - common.debug('Server got GET request'); + console.error('Server got GET request'); req.resume(); ++serverRequests; res.writeHead(200); @@ -18,7 +18,7 @@ var server = http.createServer(function(req, res) { }, 50); }); server.on('connect', function(req, socket, firstBodyChunk) { - common.debug('Server got CONNECT request'); + console.error('Server got CONNECT request'); serverConnected = true; socket.write('HTTP/1.1 200 Connection established\r\n\r\n'); socket.resume(); @@ -33,7 +33,7 @@ server.listen(common.PORT, function() { path: 'google.com:80' }); req.on('connect', function(res, socket, firstBodyChunk) { - common.debug('Client got CONNECT response'); + console.error('Client got CONNECT response'); socket.end(); socket.on('end', function() { doRequest(0); @@ -49,7 +49,7 @@ function doRequest(i) { port: common.PORT, path: '/request' + i }, function(res) { - common.debug('Client got GET response'); + console.error('Client got GET response'); var data = ''; res.setEncoding('utf8'); res.on('data', function(chunk) { diff --git a/test/parallel/test-http-connect.js b/test/parallel/test-http-connect.js index 92fed5a72556db..43c272d89352e0 100644 --- a/test/parallel/test-http-connect.js +++ b/test/parallel/test-http-connect.js @@ -12,7 +12,7 @@ var server = http.createServer(function(req, res) { server.on('connect', function(req, socket, firstBodyChunk) { assert.equal(req.method, 'CONNECT'); assert.equal(req.url, 'google.com:443'); - common.debug('Server got CONNECT request'); + console.error('Server got CONNECT request'); serverGotConnect = true; socket.write('HTTP/1.1 200 Connection established\r\n\r\n'); @@ -40,7 +40,7 @@ server.listen(common.PORT, function() { }); req.on('connect', function(res, socket, firstBodyChunk) { - common.debug('Client got CONNECT request'); + console.error('Client got CONNECT request'); clientGotConnect = true; // Make sure this request got removed from the pool. diff --git a/test/parallel/test-http-expect-continue.js b/test/parallel/test-http-expect-continue.js index 1a1418a41c421f..84c7d473efa108 100644 --- a/test/parallel/test-http-expect-continue.js +++ b/test/parallel/test-http-expect-continue.js @@ -11,7 +11,7 @@ var got_continue = false; function handler(req, res) { assert.equal(sent_continue, true, 'Full response sent before 100 Continue'); - common.debug('Server sending full response...'); + console.error('Server sending full response...'); res.writeHead(200, { 'Content-Type' : 'text/plain', 'ABCD' : '1' @@ -21,7 +21,7 @@ function handler(req, res) { var server = http.createServer(handler); server.on('checkContinue', function(req, res) { - common.debug('Server got Expect: 100-continue...'); + console.error('Server got Expect: 100-continue...'); res.writeContinue(); sent_continue = true; setTimeout(function() { @@ -38,11 +38,11 @@ server.on('listening', function() { path: '/world', headers: { 'Expect': '100-continue' } }); - common.debug('Client sending request...'); + console.error('Client sending request...'); outstanding_reqs++; var body = ''; req.on('continue', function() { - common.debug('Client got 100 Continue...'); + console.error('Client got 100 Continue...'); got_continue = true; req.end(test_req_body); }); @@ -54,7 +54,7 @@ server.on('listening', function() { res.setEncoding('utf8'); res.on('data', function(chunk) { body += chunk; }); res.on('end', function() { - common.debug('Got full response.'); + console.error('Got full response.'); assert.equal(body, test_res_body, 'Response body doesn\'t match.'); assert.ok('abcd' in res.headers, 'Response headers missing.'); outstanding_reqs--; diff --git a/test/parallel/test-http-legacy.js b/test/parallel/test-http-legacy.js index 039037114d37d4..c28e30d10f8f02 100644 --- a/test/parallel/test-http-legacy.js +++ b/test/parallel/test-http-legacy.js @@ -54,7 +54,7 @@ server.listen(common.PORT, function() { responses_recvd += 1; res.setEncoding('utf8'); res.on('data', function(chunk) { body0 += chunk; }); - common.debug('Got /hello response'); + console.error('Got /hello response'); }); setTimeout(function() { @@ -65,16 +65,16 @@ server.listen(common.PORT, function() { responses_recvd += 1; res.setEncoding('utf8'); res.on('data', function(chunk) { body1 += chunk; }); - common.debug('Got /world response'); + console.error('Got /world response'); }); }, 1); }); process.on('exit', function() { - common.debug('responses_recvd: ' + responses_recvd); + console.error('responses_recvd: ' + responses_recvd); assert.equal(2, responses_recvd); - common.debug('responses_sent: ' + responses_sent); + console.error('responses_sent: ' + responses_sent); assert.equal(2, responses_sent); assert.equal('The path was /hello', body0); diff --git a/test/parallel/test-http-pause.js b/test/parallel/test-http-pause.js index 70a04657b81011..2d317d8ea7d988 100644 --- a/test/parallel/test-http-pause.js +++ b/test/parallel/test-http-pause.js @@ -9,17 +9,17 @@ var expectedClient = 'Response Body from Server'; var resultClient = ''; var server = http.createServer(function(req, res) { - common.debug('pause server request'); + console.error('pause server request'); req.pause(); setTimeout(function() { - common.debug('resume server request'); + console.error('resume server request'); req.resume(); req.setEncoding('utf8'); req.on('data', function(chunk) { resultServer += chunk; }); req.on('end', function() { - common.debug(resultServer); + console.error(resultServer); res.writeHead(200); res.end(expectedClient); }); @@ -32,16 +32,16 @@ server.listen(common.PORT, function() { path: '/', method: 'POST' }, function(res) { - common.debug('pause client response'); + console.error('pause client response'); res.pause(); setTimeout(function() { - common.debug('resume client response'); + console.error('resume client response'); res.resume(); res.on('data', function(chunk) { resultClient += chunk; }); res.on('end', function() { - common.debug(resultClient); + console.error(resultClient); server.close(); }); }, 100); diff --git a/test/parallel/test-http-pipe-fs.js b/test/parallel/test-http-pipe-fs.js index a5428d2b6bbee2..d180da3fbf6e64 100644 --- a/test/parallel/test-http-pipe-fs.js +++ b/test/parallel/test-http-pipe-fs.js @@ -31,7 +31,7 @@ var server = http.createServer(function(req, res) { } }, function(res) { res.on('end', function() { - common.debug('res' + i + ' end'); + console.error('res' + i + ' end'); if (i === 2) { server.close(); } @@ -39,7 +39,7 @@ var server = http.createServer(function(req, res) { res.resume(); }); req.on('socket', function(s) { - common.debug('req' + i + ' start'); + console.error('req' + i + ' start'); }); req.end('12345'); }(i + 1)); diff --git a/test/parallel/test-http-set-timeout.js b/test/parallel/test-http-set-timeout.js index b3ca90a67bbe90..9bda60b2226443 100644 --- a/test/parallel/test-http-set-timeout.js +++ b/test/parallel/test-http-set-timeout.js @@ -10,7 +10,7 @@ var server = http.createServer(function(req, res) { assert.ok(s instanceof net.Socket); req.connection.on('timeout', function() { req.connection.destroy(); - common.debug('TIMEOUT'); + console.error('TIMEOUT'); server.close(); }); }); diff --git a/test/parallel/test-http.js b/test/parallel/test-http.js index daa746cdbe5b7a..ed040ca7f6fe6c 100644 --- a/test/parallel/test-http.js +++ b/test/parallel/test-http.js @@ -56,7 +56,7 @@ server.on('listening', function() { responses_recvd += 1; res.setEncoding('utf8'); res.on('data', function(chunk) { body0 += chunk; }); - common.debug('Got /hello response'); + console.error('Got /hello response'); }); setTimeout(function() { @@ -70,17 +70,17 @@ server.on('listening', function() { responses_recvd += 1; res.setEncoding('utf8'); res.on('data', function(chunk) { body1 += chunk; }); - common.debug('Got /world response'); + console.error('Got /world response'); }); req.end(); }, 1); }); process.on('exit', function() { - common.debug('responses_recvd: ' + responses_recvd); + console.error('responses_recvd: ' + responses_recvd); assert.equal(2, responses_recvd); - common.debug('responses_sent: ' + responses_sent); + console.error('responses_sent: ' + responses_sent); assert.equal(2, responses_sent); assert.equal('The path was /hello', body0); diff --git a/test/parallel/test-https-drain.js b/test/parallel/test-https-drain.js index 43113ef980b47a..1ba5e2a4679f6d 100644 --- a/test/parallel/test-https-drain.js +++ b/test/parallel/test-https-drain.js @@ -34,7 +34,7 @@ server.listen(common.PORT, function() { }, function(res) { var timer; res.pause(); - common.debug('paused'); + console.error('paused'); send(); function send() { if (req.write(new Buffer(bufSize))) { @@ -43,10 +43,10 @@ server.listen(common.PORT, function() { return process.nextTick(send); } sent += bufSize; - common.debug('sent: ' + sent); + console.error('sent: ' + sent); resumed = true; res.resume(); - common.debug('resumed'); + console.error('resumed'); timer = setTimeout(function() { process.exit(1); }, 1000); @@ -60,7 +60,7 @@ server.listen(common.PORT, function() { } received += data.length; if (received >= sent) { - common.debug('received: ' + received); + console.error('received: ' + received); req.end(); server.close(); } diff --git a/test/parallel/test-module-loading-error.js b/test/parallel/test-module-loading-error.js index f430b65d8cf0a5..3756953a40dc3c 100644 --- a/test/parallel/test-module-loading-error.js +++ b/test/parallel/test-module-loading-error.js @@ -2,7 +2,7 @@ var common = require('../common'); var assert = require('assert'); -common.debug('load test-module-loading-error.js'); +console.error('load test-module-loading-error.js'); var error_desc = { win32: '%1 is not a valid Win32 application', diff --git a/test/parallel/test-net-listen-close-server.js b/test/parallel/test-net-listen-close-server.js index 9c4dbcfe2e15e2..144ca58bbbe2b9 100644 --- a/test/parallel/test-net-listen-close-server.js +++ b/test/parallel/test-net-listen-close-server.js @@ -10,7 +10,7 @@ server.listen(common.PORT, function() { assert(false); }); server.on('error', function(error) { - common.debug(error); + console.error(error); assert(false); }); server.close(); diff --git a/test/parallel/test-net-listen-error.js b/test/parallel/test-net-listen-error.js index b0d8aac8f816e3..79cfc7da6c9255 100644 --- a/test/parallel/test-net-listen-error.js +++ b/test/parallel/test-net-listen-error.js @@ -10,7 +10,7 @@ server.listen(1, '1.1.1.1', function() { // EACCESS or EADDRNOTAVAIL assert(false); }); server.on('error', function(error) { - common.debug(error); + console.error(error); gotError = true; }); diff --git a/test/parallel/test-tls-client-reject.js b/test/parallel/test-tls-client-reject.js index f2b93393e7d32d..2f9ea230a06828 100644 --- a/test/parallel/test-tls-client-reject.js +++ b/test/parallel/test-tls-client-reject.js @@ -21,7 +21,7 @@ var connectCount = 0; var server = tls.createServer(options, function(socket) { ++connectCount; socket.on('data', function(data) { - common.debug(data.toString()); + console.error(data.toString()); assert.equal(data, 'ok'); }); }).listen(common.PORT, function() { @@ -51,7 +51,7 @@ function rejectUnauthorized() { assert(false); }); socket.on('error', function(err) { - common.debug(err); + console.error(err); authorized(); }); socket.write('ng'); diff --git a/test/parallel/test-tls-pause.js b/test/parallel/test-tls-pause.js index 3dc3e53d47f336..a19c4aee403d87 100644 --- a/test/parallel/test-tls-pause.js +++ b/test/parallel/test-tls-pause.js @@ -35,7 +35,7 @@ server.listen(common.PORT, function() { }, function() { console.error('connected'); client.pause(); - common.debug('paused'); + console.error('paused'); send(); function send() { console.error('sending'); @@ -48,7 +48,7 @@ server.listen(common.PORT, function() { return process.nextTick(send); } sent += bufSize; - common.debug('sent: ' + sent); + console.error('sent: ' + sent); resumed = true; client.resume(); console.error('resumed', client); @@ -61,7 +61,7 @@ server.listen(common.PORT, function() { console.error('received', received); console.error('sent', sent); if (received >= sent) { - common.debug('received: ' + received); + console.error('received: ' + received); client.end(); server.close(); } diff --git a/test/parallel/test-tls-peer-certificate-encoding.js b/test/parallel/test-tls-peer-certificate-encoding.js index 771c8181c8c3b6..96cb6944ef6a97 100644 --- a/test/parallel/test-tls-peer-certificate-encoding.js +++ b/test/parallel/test-tls-peer-certificate-encoding.js @@ -30,7 +30,7 @@ server.listen(common.PORT, function() { }, function() { var peerCert = socket.getPeerCertificate(); - common.debug(util.inspect(peerCert)); + console.error(util.inspect(peerCert)); assert.equal(peerCert.subject.CN, 'Ádám Lippai'); verified = true; server.close(); diff --git a/test/parallel/test-tls-peer-certificate-multi-keys.js b/test/parallel/test-tls-peer-certificate-multi-keys.js index 3cfd6420cdf507..fca7a1a77dda67 100644 --- a/test/parallel/test-tls-peer-certificate-multi-keys.js +++ b/test/parallel/test-tls-peer-certificate-multi-keys.js @@ -28,7 +28,7 @@ server.listen(common.PORT, function() { rejectUnauthorized: false }, function() { var peerCert = socket.getPeerCertificate(); - common.debug(util.inspect(peerCert)); + console.error(util.inspect(peerCert)); assert.deepEqual(peerCert.subject.OU, ['Information Technology', 'Engineering', 'Marketing']); verified = true; diff --git a/test/parallel/test-tls-peer-certificate.js b/test/parallel/test-tls-peer-certificate.js index 3c25af19c87e88..3cb0eef2d56268 100644 --- a/test/parallel/test-tls-peer-certificate.js +++ b/test/parallel/test-tls-peer-certificate.js @@ -35,7 +35,7 @@ server.listen(common.PORT, function() { peerCert = socket.getPeerCertificate(true); assert.ok(peerCert.issuerCertificate); - common.debug(util.inspect(peerCert)); + console.error(util.inspect(peerCert)); assert.equal(peerCert.subject.emailAddress, 'ry@tinyclouds.org'); assert.equal(peerCert.serialNumber, '9A84ABCFB8A72AC0'); assert.equal(peerCert.exponent, '0x10001'); diff --git a/test/pummel/test-net-pause.js b/test/pummel/test-net-pause.js index 6386d29835da11..71a3e17c12c361 100644 --- a/test/pummel/test-net-pause.js +++ b/test/pummel/test-net-pause.js @@ -65,5 +65,5 @@ server.listen(common.PORT); process.on('exit', function() { assert.equal(N, recv.length); - common.debug('Exit'); + console.error('Exit'); }); diff --git a/test/pummel/test-net-pingpong-delay.js b/test/pummel/test-net-pingpong-delay.js index e459c71a7185ac..1a25ed3fe2b7ed 100644 --- a/test/pummel/test-net-pingpong-delay.js +++ b/test/pummel/test-net-pingpong-delay.js @@ -27,7 +27,7 @@ function pingPongTest(port, host, on_complete) { }); socket.on('timeout', function() { - common.debug('server-side timeout!!'); + console.error('server-side timeout!!'); assert.equal(false, true); }); @@ -73,7 +73,7 @@ function pingPongTest(port, host, on_complete) { }); client.on('timeout', function() { - common.debug('client-side timeout!!'); + console.error('client-side timeout!!'); assert.equal(false, true); }); diff --git a/test/sequential/test-module-loading.js b/test/sequential/test-module-loading.js index dfca2e420263b6..94aa36240b2faf 100644 --- a/test/sequential/test-module-loading.js +++ b/test/sequential/test-module-loading.js @@ -4,7 +4,7 @@ var assert = require('assert'); var path = require('path'); var fs = require('fs'); -common.debug('load test-module-loading.js'); +console.error('load test-module-loading.js'); // assert that this is the main module. assert.equal(require.main.id, '.', 'main module should have id of \'.\''); @@ -56,36 +56,36 @@ assert.equal('D', d4.D()); assert.ok((new a.SomeClass()) instanceof c.SomeClass); -common.debug('test index.js modules ids and relative loading'); +console.error('test index.js modules ids and relative loading'); var one = require('../fixtures/nested-index/one'), two = require('../fixtures/nested-index/two'); assert.notEqual(one.hello, two.hello); -common.debug('test index.js in a folder with a trailing slash'); +console.error('test index.js in a folder with a trailing slash'); var three = require('../fixtures/nested-index/three'), threeFolder = require('../fixtures/nested-index/three/'), threeIndex = require('../fixtures/nested-index/three/index.js'); assert.equal(threeFolder, threeIndex); assert.notEqual(threeFolder, three); -common.debug('test package.json require() loading'); +console.error('test package.json require() loading'); assert.equal(require('../fixtures/packages/main').ok, 'ok', 'Failed loading package'); assert.equal(require('../fixtures/packages/main-index').ok, 'ok', 'Failed loading package with index.js in main subdir'); -common.debug('test cycles containing a .. path'); +console.error('test cycles containing a .. path'); var root = require('../fixtures/cycles/root'), foo = require('../fixtures/cycles/folder/foo'); assert.equal(root.foo, foo); assert.equal(root.sayHello(), root.hello); -common.debug('test node_modules folders'); +console.error('test node_modules folders'); // asserts are in the fixtures files themselves, // since they depend on the folder structure. require('../fixtures/node_modules/foo'); -common.debug('test name clashes'); +console.error('test name clashes'); // this one exists and should import the local module var my_path = require('../fixtures/path'); assert.ok(common.indirectInstanceOf(my_path.path_func, Function)); @@ -102,7 +102,7 @@ try { assert.equal(require('path').dirname(__filename), __dirname); -common.debug('load custom file types with extensions'); +console.error('load custom file types with extensions'); require.extensions['.test'] = function(module, filename) { var content = fs.readFileSync(filename).toString(); assert.equal('this is custom source\n', content); @@ -115,7 +115,7 @@ assert.equal(require('../fixtures/registerExt').test, 'passed'); // unknown extension, load as .js assert.equal(require('../fixtures/registerExt.hello.world').test, 'passed'); -common.debug('load custom file types that return non-strings'); +console.error('load custom file types that return non-strings'); require.extensions['.test'] = function(module, filename) { module.exports = { custom: 'passed' @@ -139,7 +139,7 @@ try { } // Check load order is as expected -common.debug('load order'); +console.error('load order'); var loadOrder = '../fixtures/module-load-order/', msg = 'Load order incorrect.'; diff --git a/test/sequential/test-pump-file2tcp-noexist.js b/test/sequential/test-pump-file2tcp-noexist.js index 1ffdb5d4615ce3..9dbbda2dfa1685 100644 --- a/test/sequential/test-pump-file2tcp-noexist.js +++ b/test/sequential/test-pump-file2tcp-noexist.js @@ -17,8 +17,8 @@ var server = net.createServer(function(stream) { if (err) { got_error = true; } else { - common.debug('util.pump\'s callback fired with no error'); - common.debug('this shouldn\'t happen as the file doesn\'t exist...'); + console.error('util.pump\'s callback fired with no error'); + console.error('this shouldn\'t happen as the file doesn\'t exist...'); assert.equal(true, false); } server.close(); From 1e964bb8e99e3ef589b2609e5d46df5e6dbccfbe Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Sat, 26 Sep 2015 16:16:35 -0700 Subject: [PATCH 3/6] test: change calls to deprecated util.print() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit common.print() is just util.print() and as such prints a deprecation warning. Per docs, update to console.log(). PR-URL: https://github.com/nodejs/node/pull/3083 Reviewed-By: Michaël Zasso Reviewed-By: Brendan Ashworth --- test/fixtures/net-fd-passing-receiver.js | 2 +- test/pummel/test-net-many-clients.js | 6 +++--- test/pummel/test-net-pause.js | 2 +- test/sequential/test-stdout-to-file.js | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/fixtures/net-fd-passing-receiver.js b/test/fixtures/net-fd-passing-receiver.js index 99f69be2a40101..0dba242766a62b 100644 --- a/test/fixtures/net-fd-passing-receiver.js +++ b/test/fixtures/net-fd-passing-receiver.js @@ -26,7 +26,7 @@ receiver = net.createServer(function(socket) { /* To signal the test runne we're up and listening */ receiver.on('listening', function() { - common.print('ready'); + console.log('ready'); }); receiver.listen(path); diff --git a/test/pummel/test-net-many-clients.js b/test/pummel/test-net-many-clients.js index b70efbda582571..6d9dde1ddbc863 100644 --- a/test/pummel/test-net-many-clients.js +++ b/test/pummel/test-net-many-clients.js @@ -19,7 +19,7 @@ for (var i = 0; i < bytes; i++) { var server = net.createServer(function(c) { console.log('connected'); total_connections++; - common.print('#'); + console.log('#'); c.write(body); c.end(); }); @@ -32,7 +32,7 @@ function runClient(callback) { client.setEncoding('utf8'); client.on('connect', function() { - common.print('c'); + console.log('c'); client.recved = ''; client.connections += 1; }); @@ -51,7 +51,7 @@ function runClient(callback) { }); client.on('close', function(had_error) { - common.print('.'); + console.log('.'); assert.equal(false, had_error); assert.equal(bytes, client.recved.length); diff --git a/test/pummel/test-net-pause.js b/test/pummel/test-net-pause.js index 71a3e17c12c361..b0c51260436e0c 100644 --- a/test/pummel/test-net-pause.js +++ b/test/pummel/test-net-pause.js @@ -24,7 +24,7 @@ server.on('listening', function() { var client = net.createConnection(common.PORT); client.setEncoding('ascii'); client.on('data', function(d) { - common.print(d); + console.log(d); recv += d; }); diff --git a/test/sequential/test-stdout-to-file.js b/test/sequential/test-stdout-to-file.js index 41b61df4d72bd5..bd1d97b3d8d278 100644 --- a/test/sequential/test-stdout-to-file.js +++ b/test/sequential/test-stdout-to-file.js @@ -24,7 +24,7 @@ function test(size, useBuffer, cb) { fs.unlinkSync(tmpFile); } catch (e) {} - common.print(size + ' chars to ' + tmpFile + '...'); + console.log(size + ' chars to ' + tmpFile + '...'); childProcess.exec(cmd, function(err) { if (err) throw err; From 4fc89939f5ec54ecfb53dc0e1f466d5e31722608 Mon Sep 17 00:00:00 2001 From: Brendan Ashworth Date: Sun, 27 Sep 2015 22:38:11 -0700 Subject: [PATCH 4/6] smalloc: remove module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bye bye, smalloc. I'm not sure why this was still here; it was removed in 70d1f32 and hasn't worked since. It wasn't packaged in the binary, either. Reviewed-By: Michaël Zasso Reviewed-By: Sakthipriyan Vairamani Reviewed-By: Сковорода Никита Андреевич Reviewed-By: Ben Noordhuis PR-URL: https://github.com/nodejs/node/pull/3099 --- lib/smalloc.js | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 lib/smalloc.js diff --git a/lib/smalloc.js b/lib/smalloc.js deleted file mode 100644 index 9d52e02cd098a4..00000000000000 --- a/lib/smalloc.js +++ /dev/null @@ -1,7 +0,0 @@ -'use strict'; - -const util = require('internal/util'); - -module.exports = require('internal/smalloc'); -util.printDeprecationMessage('smalloc is deprecated. ' + - 'Use typed arrays instead.'); From 3de58b953139f63f8fc4af88ee87ccaa1ed61b11 Mon Sep 17 00:00:00 2001 From: Minwoo Jung Date: Sun, 5 Oct 2014 21:24:10 +0900 Subject: [PATCH 5/6] benchmark: update comment in common.js MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Very minor update in benchmark/common.js Not exactly a critical change, just continued cleaning out of old joyent/node PRs that never landed. Ref: https://github.com/nodejs/node-v0.x-archive/pull/8515 PR-URL: https://github.com/nodejs/node/pull/2399 Reviewed-By: Sakthipriyan Vairamani Reviewed-By: Brendan Ashworth Reviewed-By: Michaël Zasso --- benchmark/common.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benchmark/common.js b/benchmark/common.js index 158354004cd6bb..511ae384f418bf 100644 --- a/benchmark/common.js +++ b/benchmark/common.js @@ -137,7 +137,7 @@ Benchmark.prototype._run = function() { if (this.config) return this.fn(this.config); - // one more more options weren't set. + // some options weren't set. // run with all combinations var main = require.main.filename; var settings = []; From e6482c6daa78444141c5551f6bd62e841cd119fd Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Wed, 30 Sep 2015 18:42:34 +1000 Subject: [PATCH 6/6] 2015-10-05, Version 4.1.2 (Stable) Release Notable changes --- CHANGELOG.md | 41 +++++++++++++++++++++++++++++++++++++++++ src/node_version.h | 2 +- 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ee6cf111d8eb8..d8dded0e93dcf4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,46 @@ # Node.js ChangeLog +## 2015-10-05, Version 4.1.2 (Stable), @rvagg + +### Notable changes + +_WIP_ + +### Known issues + +See https://github.com/nodejs/node/labels/confirmed-bug for complete and current list of known issues. + +* Some problems with unreferenced timers running during `beforeExit` are still to be resolved. See [#1264](https://github.com/nodejs/node/issues/1264). +* Surrogate pair in REPL can freeze terminal. [#690](https://github.com/nodejs/node/issues/690) +* Calling `dns.setServers()` while a DNS query is in progress can cause the process to crash on a failed assertion. [#894](https://github.com/nodejs/node/issues/894) +* `url.resolve` may transfer the auth portion of the url when resolving between two full hosts, see [#1435](https://github.com/nodejs/node/issues/1435). + +### Commits + +* [[`3de58b9531`](https://github.com/nodejs/node/commit/3de58b9531)] - **benchmark**: update comment in common.js (Minwoo Jung) [#2399](https://github.com/nodejs/node/pull/2399) +* [[`9e9bfa4dc0`](https://github.com/nodejs/node/commit/9e9bfa4dc0)] - **build**: iojs -> nodejs of release-urlbase (P.S.V.R) [#3015](https://github.com/nodejs/node/pull/3015) +* [[`8335ec7191`](https://github.com/nodejs/node/commit/8335ec7191)] - **build**: fix some typos inside the configure script (P.S.V.R) [#3016](https://github.com/nodejs/node/pull/3016) +* [[`798dad24f4`](https://github.com/nodejs/node/commit/798dad24f4)] - **child_process**: `null` channel handle on close (Fedor Indutny) [#3041](https://github.com/nodejs/node/pull/3041) +* [[`4c8d96bc30`](https://github.com/nodejs/node/commit/4c8d96bc30)] - **crypto**: add more keylen sanity checks in pbkdf2 (Johann) [#3029](https://github.com/nodejs/node/pull/3029) +* [[`039f73fa83`](https://github.com/nodejs/node/commit/039f73fa83)] - **deps**: remove and gitignore .bin directory (Ben Noordhuis) [#3004](https://github.com/nodejs/node/pull/3004) +* [[`5fbb24812d`](https://github.com/nodejs/node/commit/5fbb24812d)] - **deps**: backport c281c15 from V8's upstream (Julien Gilli) [#3031](https://github.com/nodejs/node/pull/3031) +* [[`55a1f94e44`](https://github.com/nodejs/node/commit/55a1f94e44)] - **dns**: remove nonexistant exports.ADNAME (Roman Reiss) [#3051](https://github.com/nodejs/node/pull/3051) +* [[`6ee5d0f69f`](https://github.com/nodejs/node/commit/6ee5d0f69f)] - **dns**: add missing exports.BADNAME (Roman Reiss) [#3051](https://github.com/nodejs/node/pull/3051) +* [[`75d5dcea76`](https://github.com/nodejs/node/commit/75d5dcea76)] - **doc**: jenkins-iojs.nodesource.com -> ci.nodejs.org (Michał Gołębiowski) [#2886](https://github.com/nodejs/node/pull/2886) +* [[`5c3f50b21d`](https://github.com/nodejs/node/commit/5c3f50b21d)] - **doc**: rearrange execSync and execFileSync (Laurent Fortin) [#2940](https://github.com/nodejs/node/pull/2940) +* [[`4fc33ac11a`](https://github.com/nodejs/node/commit/4fc33ac11a)] - **doc**: make execFileSync in line with execFile (Laurent Fortin) [#2940](https://github.com/nodejs/node/pull/2940) +* [[`a366e84b17`](https://github.com/nodejs/node/commit/a366e84b17)] - **doc**: fix typos in cluster & errors (reggi) [#3011](https://github.com/nodejs/node/pull/3011) +* [[`52031e1bf1`](https://github.com/nodejs/node/commit/52031e1bf1)] - **doc**: switch LICENSE from closure-linter to eslint (P.S.V.R) [#3018](https://github.com/nodejs/node/pull/3018) +* [[`b28f6a53bc`](https://github.com/nodejs/node/commit/b28f6a53bc)] - **docs**: Clarify assert.doesNotThrow behavior (Fabio Oliveira) [#2807](https://github.com/nodejs/node/pull/2807) +* [[`ac2bce0b0c`](https://github.com/nodejs/node/commit/ac2bce0b0c)] - **path**: improve posixSplitPath performance (Evan Lucas) [#3034](https://github.com/nodejs/node/pull/3034) +* [[`4fc89939f5`](https://github.com/nodejs/node/commit/4fc89939f5)] - **smalloc**: remove module (Brendan Ashworth) [#3099](https://github.com/nodejs/node/pull/3099) +* [[`5ec5d0aa8b`](https://github.com/nodejs/node/commit/5ec5d0aa8b)] - **src**: internalize binding function property names (Ben Noordhuis) [#3060](https://github.com/nodejs/node/pull/3060) +* [[`c8175fc2af`](https://github.com/nodejs/node/commit/c8175fc2af)] - **src**: internalize per-isolate string properties (Ben Noordhuis) [#3060](https://github.com/nodejs/node/pull/3060) +* [[`9a593abc47`](https://github.com/nodejs/node/commit/9a593abc47)] - **src**: include signal.h in util.h (Cheng Zhao) [#3058](https://github.com/nodejs/node/pull/3058) +* [[`fde0c6f321`](https://github.com/nodejs/node/commit/fde0c6f321)] - **src**: fix function and variable names in comments (Sakthipriyan Vairamani) [#3039](https://github.com/nodejs/node/pull/3039) +* [[`1e964bb8e9`](https://github.com/nodejs/node/commit/1e964bb8e9)] - **test**: change calls to deprecated util.print() (Rich Trott) [#3083](https://github.com/nodejs/node/pull/3083) +* [[`b97358a772`](https://github.com/nodejs/node/commit/b97358a772)] - **test**: replace deprecated util.debug() calls (Rich Trott) [#3082](https://github.com/nodejs/node/pull/3082) + ## 2015-09-22, Version 4.1.1 (Stable), @rvagg ### Notable changes diff --git a/src/node_version.h b/src/node_version.h index 71767793099386..cdd0c86a8d08e2 100644 --- a/src/node_version.h +++ b/src/node_version.h @@ -5,7 +5,7 @@ #define NODE_MINOR_VERSION 1 #define NODE_PATCH_VERSION 2 -#define NODE_VERSION_IS_RELEASE 0 +#define NODE_VERSION_IS_RELEASE 1 #ifndef NODE_STRINGIFY #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)