1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

http: reduce usage of public util

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/26548
Refs: https://github.com/nodejs/node/issues/26546
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
This commit is contained in:
ZYSzys 2019-03-10 00:06:48 +08:00 committed by Daniel Bevenius
parent c51735fd2d
commit 4c4e4f4bda
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/_http_agent.js
View File

@ -22,9 +22,8 @@
'use strict'; 'use strict';
const net = require('net'); const net = require('net');
const util = require('util');
const EventEmitter = require('events'); const EventEmitter = require('events');
const debug = util.debuglog('http'); const debug = require('internal/util/debuglog').debuglog('http');
const { async_id_symbol } = require('internal/async_hooks').symbols; const { async_id_symbol } = require('internal/async_hooks').symbols;
// New Agent code. // New Agent code.

2
lib/_http_common.js
View File

@ -36,7 +36,7 @@ const {
readStop readStop
} = incoming; } = incoming;
const debug = require('util').debuglog('http'); const debug = require('internal/util/debuglog').debuglog('http');
const kIncomingMessage = Symbol('IncomingMessage'); const kIncomingMessage = Symbol('IncomingMessage');
const kOnHeaders = HTTPParser.kOnHeaders | 0; const kOnHeaders = HTTPParser.kOnHeaders | 0;

9
lib/_http_outgoing.js
View File

@ -23,7 +23,6 @@
const assert = require('internal/assert'); const assert = require('internal/assert');
const Stream = require('stream'); const Stream = require('stream');
const util = require('util');
const internalUtil = require('internal/util'); const internalUtil = require('internal/util');
const { outHeadersKey, utcDate } = require('internal/http'); const { outHeadersKey, utcDate } = require('internal/http');
const { Buffer } = require('buffer'); const { Buffer } = require('buffer');
@ -109,10 +108,10 @@ Object.setPrototypeOf(OutgoingMessage, Stream);
Object.defineProperty(OutgoingMessage.prototype, '_headers', { Object.defineProperty(OutgoingMessage.prototype, '_headers', {
get: util.deprecate(function() { get: internalUtil.deprecate(function() {
return this.getHeaders(); return this.getHeaders();
}, 'OutgoingMessage.prototype._headers is deprecated', 'DEP0066'), }, 'OutgoingMessage.prototype._headers is deprecated', 'DEP0066'),
set: util.deprecate(function(val) { set: internalUtil.deprecate(function(val) {
if (val == null) { if (val == null) {
this[outHeadersKey] = null; this[outHeadersKey] = null;
} else if (typeof val === 'object') { } else if (typeof val === 'object') {
@ -127,7 +126,7 @@ Object.defineProperty(OutgoingMessage.prototype, '_headers', {
}); });
Object.defineProperty(OutgoingMessage.prototype, '_headerNames', { Object.defineProperty(OutgoingMessage.prototype, '_headerNames', {
get: util.deprecate(function() { get: internalUtil.deprecate(function() {
const headers = this[outHeadersKey]; const headers = this[outHeadersKey];
if (headers !== null) { if (headers !== null) {
const out = Object.create(null); const out = Object.create(null);
@ -141,7 +140,7 @@ Object.defineProperty(OutgoingMessage.prototype, '_headerNames', {
} }
return null; return null;
}, 'OutgoingMessage.prototype._headerNames is deprecated', 'DEP0066'), }, 'OutgoingMessage.prototype._headerNames is deprecated', 'DEP0066'),
set: util.deprecate(function(val) { set: internalUtil.deprecate(function(val) {
if (typeof val === 'object' && val !== null) { if (typeof val === 'object' && val !== null) {
const headers = this[outHeadersKey]; const headers = this[outHeadersKey];
if (!headers) if (!headers)

4
lib/_http_server.js
View File

@ -21,7 +21,6 @@
'use strict'; 'use strict';
const util = require('util');
const net = require('net'); const net = require('net');
const assert = require('internal/assert'); const assert = require('internal/assert');
const { const {
@ -310,7 +309,8 @@ function Server(options, requestListener) {
this.maxHeadersCount = null; this.maxHeadersCount = null;
this.headersTimeout = 40 * 1000; // 40 seconds this.headersTimeout = 40 * 1000; // 40 seconds
} }
util.inherits(Server, net.Server); Object.setPrototypeOf(Server.prototype, net.Server.prototype);
Object.setPrototypeOf(Server, net.Server);
Server.prototype.setTimeout = function setTimeout(msecs, callback) { Server.prototype.setTimeout = function setTimeout(msecs, callback) {