Skip to content

Commit cdce873

Browse files
authored
http,http2,https: use http internals
1 parent e6a2193 commit cdce873

6 files changed

Lines changed: 17 additions & 10 deletions

File tree

lib/https.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ const {
4444
assertCrypto();
4545

4646
const tls = require('tls');
47-
const { Agent: HttpAgent } = require('_http_agent');
47+
const { Agent: HttpAgent } = require('internal/http/agent');
4848
const {
4949
httpServerPreClose,
5050
Server: HttpServer,
5151
setupConnectionsTracking,
5252
storeHTTPOptions,
5353
_connectionListener,
54-
} = require('_http_server');
55-
const { ClientRequest } = require('_http_client');
54+
} = require('internal/http/server');
55+
const { ClientRequest } = require('internal/http/client');
5656
let debug = require('internal/util/debuglog').debuglog('https', (fn) => {
5757
debug = fn;
5858
});

lib/internal/child_process.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,9 @@ const handleConversion = {
149149
socket.setTimeout(0);
150150

151151
if (freeParser === undefined)
152-
freeParser = require('_http_common').freeParser;
152+
freeParser = require('internal/http/common').freeParser;
153153
if (HTTPParser === undefined)
154-
HTTPParser = require('_http_common').HTTPParser;
154+
HTTPParser = require('internal/http/common').HTTPParser;
155155

156156
// In case of an HTTP connection socket, release the associated
157157
// resources

lib/internal/http/server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ const {
6565
defaultTriggerAsyncIdScope,
6666
getOrSetAsyncId,
6767
} = require('internal/async_hooks');
68-
const { IncomingMessage } = require('_http_incoming');
68+
const { IncomingMessage } = require('internal/http/incoming');
6969
const {
7070
ConnResetException,
7171
codes: {

lib/internal/http2/compat.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ const {
5959
assertValidPseudoHeader,
6060
getAuthority,
6161
} = require('internal/http2/util');
62-
const { _checkIsHttpToken: checkIsHttpToken } = require('_http_common');
62+
63+
const { _checkIsHttpToken: checkIsHttpToken } = require('internal/http/common');
6364

6465
const kBeginSend = Symbol('begin-send');
6566
const kState = Symbol('state');

lib/internal/http2/core.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,14 @@ const { Duplex } = require('stream');
4646
const tls = require('tls');
4747
const { setImmediate, setTimeout, clearTimeout } = require('timers');
4848

49-
const { kIncomingMessage } = require('_http_common');
50-
const { kServerResponse, Server: HttpServer, httpServerPreClose, setupConnectionsTracking } = require('_http_server');
49+
const { kIncomingMessage } = require('internal/http/common');
50+
const {
51+
kServerResponse,
52+
Server: HttpServer,
53+
httpServerPreClose,
54+
setupConnectionsTracking,
55+
} = require('internal/http/server');
56+
5157
const JSStreamSocket = require('internal/js_stream_socket');
5258

5359
const {

lib/internal/http2/util.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const {
1616

1717
const {
1818
_checkIsHttpToken: checkIsHttpToken,
19-
} = require('_http_common');
19+
} = require('internal/http/common');
2020

2121
const binding = internalBinding('http2');
2222
const {

0 commit comments

Comments
 (0)