From 08b75c1591d6206febb1698cb03a116d11f94e70 Mon Sep 17 00:00:00 2001
From: Myles Borins <myles.borins@gmail.com>
Date: Tue, 31 Oct 2017 21:18:39 -0400
Subject: [PATCH] Revert "https: refactor to use http internals"

This reverts commit 5118f3146643dc55e7e7bd3082d1de4d0e7d5426.

It is breaking code in the wild that depends on the original behavior
to do tracing.

I don't think we need to necessarily fix this in 8.x but we might want
to reclassify the original commit as Semver Major

PR-URL: https://github.com/nodejs/node/pull/16660
Refs: https://github.com/nodejs/node/pull/16395
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Bryan English <bryan@bryanenglish.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Jan Krems <jan.krems@gmail.com>
---
 lib/https.js | 44 +++++++++++++++++---------------------------
 1 file changed, 17 insertions(+), 27 deletions(-)

diff --git a/lib/https.js b/lib/https.js
index 56dd67088b7bb3..6fcd9f65ce7858 100644
--- a/lib/https.js
+++ b/lib/https.js
@@ -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');
@@ -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;
 
@@ -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.
@@ -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;
@@ -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)
@@ -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) {
@@ -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
 };