Skip to content

Commit 6258d63

Browse files
authored
http,http2,https: use http internals
1 parent 8cbe66d commit 6258d63

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
@@ -53,15 +53,15 @@ const {
5353
kWaitForProxyTunnel,
5454
getGlobalAgent,
5555
} = require('internal/http');
56-
const { Agent: HttpAgent } = require('_http_agent');
56+
const { Agent: HttpAgent } = require('internal/http/agent');
5757
const {
5858
httpServerPreClose,
5959
Server: HttpServer,
6060
setupConnectionsTracking,
6161
storeHTTPOptions,
6262
_connectionListener,
63-
} = require('_http_server');
64-
const { ClientRequest } = require('_http_client');
63+
} = require('internal/http/server');
64+
const { ClientRequest } = require('internal/http/client');
6565
let debug = require('internal/util/debuglog').debuglog('https', (fn) => {
6666
debug = fn;
6767
});

lib/internal/child_process.js

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

150150
if (freeParser === undefined)
151-
freeParser = require('_http_common').freeParser;
151+
freeParser = require('internal/http/common').freeParser;
152152
if (HTTPParser === undefined)
153-
HTTPParser = require('_http_common').HTTPParser;
153+
HTTPParser = require('internal/http/common').HTTPParser;
154154

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

lib/internal/http/server.js

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

lib/internal/http2/compat.js

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

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

lib/internal/http2/core.js

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

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

5561
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)