Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[v8.x] https: revert "refactor to use http internals" #16660

Closed
wants to merge 1 commit into from
Closed

[v8.x] https: revert "refactor to use http internals" #16660

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 17 additions & 27 deletions lib/https.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,8 @@ require('internal/util').assertCrypto();

const tls = require('tls');
const url = require('url');
const http = require('http');
const util = require('util');
const { Agent: HttpAgent } = require('_http_agent');
const {
Server: HttpServer,
_connectionListener
} = require('_http_server');
const { ClientRequest } = require('_http_client');
const { inherits } = util;
const debug = util.debuglog('https');
const { urlToOptions, searchParamsSymbol } = require('internal/url');
Expand All @@ -56,7 +51,7 @@ function Server(opts, requestListener) {
opts.ALPNProtocols = ['http/1.1'];
}

tls.Server.call(this, opts, _connectionListener);
tls.Server.call(this, opts, http._connectionListener);

this.httpAllowHalfOpen = false;

Expand All @@ -73,12 +68,13 @@ function Server(opts, requestListener) {
this.keepAliveTimeout = 5000;
}
inherits(Server, tls.Server);
exports.Server = Server;

Server.prototype.setTimeout = HttpServer.prototype.setTimeout;
Server.prototype.setTimeout = http.Server.prototype.setTimeout;

function createServer(opts, requestListener) {
exports.createServer = function createServer(opts, requestListener) {
return new Server(opts, requestListener);
}
};


// HTTPS agents.
Expand Down Expand Up @@ -133,7 +129,7 @@ function Agent(options) {
if (!(this instanceof Agent))
return new Agent(options);

HttpAgent.call(this, options);
http.Agent.call(this, options);
this.defaultPort = 443;
this.protocol = 'https:';
this.maxCachedSessions = this.options.maxCachedSessions;
Expand All @@ -145,11 +141,11 @@ function Agent(options) {
list: []
};
}
inherits(Agent, HttpAgent);
inherits(Agent, http.Agent);
Agent.prototype.createConnection = createConnection;

Agent.prototype.getName = function getName(options) {
var name = HttpAgent.prototype.getName.call(this, options);
var name = http.Agent.prototype.getName.call(this, options);

name += ':';
if (options.ca)
Expand Down Expand Up @@ -223,7 +219,10 @@ Agent.prototype._evictSession = function _evictSession(key) {

const globalAgent = new Agent();

function request(options, cb) {
exports.globalAgent = globalAgent;
exports.Agent = Agent;

exports.request = function request(options, cb) {
if (typeof options === 'string') {
options = url.parse(options);
if (!options.hostname) {
Expand All @@ -237,20 +236,11 @@ function request(options, cb) {
options = util._extend({}, options);
}
options._defaultAgent = globalAgent;
return new ClientRequest(options, cb);
}
return http.request(options, cb);
};

function get(options, cb) {
const req = request(options, cb);
exports.get = function get(options, cb) {
var req = exports.request(options, cb);
req.end();
return req;
}

module.exports = {
Agent,
globalAgent,
Server,
createServer,
get,
request
};