Skip to content

Commit 1ab6b21

Browse files
committed
tls: rename clientError to tlsClientError
`clientError` will have `http.Server`-specific behavior, and we don't want to shadow it in `tls.Server`. PR-URL: #4557 Reviewed-By: Brian White <mscdex@mscdex.net>
1 parent f1653cc commit 1ab6b21

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

doc/api/tls.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ This class is a subclass of `net.Server` and has the same methods on it.
169169
Instead of accepting just raw TCP connections, this accepts encrypted
170170
connections using TLS or SSL.
171171

172-
### Event: 'clientError'
172+
### Event: 'tlsClientError'
173173

174174
`function (exception, tlsSocket) { }`
175175

lib/_tls_wrap.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -809,14 +809,14 @@ function Server(/* [options], listener */) {
809809
errorEmitted = true;
810810
var connReset = new Error('socket hang up');
811811
connReset.code = 'ECONNRESET';
812-
self.emit('clientError', connReset, socket);
812+
self.emit('tlsClientError', connReset, socket);
813813
}
814814
});
815815

816816
socket.on('_tlsError', function(err) {
817817
if (!socket._controlReleased && !errorEmitted) {
818818
errorEmitted = true;
819-
self.emit('clientError', err, socket);
819+
self.emit('tlsClientError', err, socket);
820820
}
821821
});
822822
});

test/parallel/test-tls-econnreset.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ var connectError = null;
4848

4949
var server = tls.createServer({ ca: ca, cert: cert, key: key }, function(conn) {
5050
throw 'unreachable';
51-
}).on('clientError', function(err, conn) {
51+
}).on('tlsClientError', function(err, conn) {
5252
assert(!clientError && conn);
5353
clientError = err;
5454
}).listen(common.PORT, function() {

test/parallel/test-tls-no-sslv3.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ server.listen(common.PORT, '127.0.0.1', function() {
4848
}));
4949
});
5050

51-
server.on('clientError', err => errors.push(err));
51+
server.on('tlsClientError', err => errors.push(err));
5252

5353
process.on('exit', function() {
5454
if (/unknown option -ssl3/.test(stderr)) {

test/parallel/test-tls-sni-option.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ var server = tls.createServer(serverOptions, function(c) {
110110
serverResults.push({ sni: c.servername, authorized: c.authorized });
111111
});
112112

113-
server.on('clientError', function(err) {
113+
server.on('tlsClientError', function(err) {
114114
serverResults.push(null);
115115
serverError = err.message;
116116
});

test/parallel/test-tls-timeout-server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ var options = {
2525

2626
var server = tls.createServer(options, common.fail);
2727

28-
server.on('clientError', function(err, conn) {
28+
server.on('tlsClientError', function(err, conn) {
2929
conn.destroy();
3030
server.close();
3131
clientErrors++;

0 commit comments

Comments
 (0)