Close connections at server closure

lib/agent.js

@@ -63,6 +63,7 @@ module.exports = class HTTPAgent {
 
       socket.on('free', () => this._onfree(socket, name))
       socket.on('close', () => this._onremove(socket, name))
+      socket.on('end', () => socket.destroy())
     }
 
     let sockets = this._sockets.get(name)

lib/server.js

@@ -23,9 +23,16 @@ module.exports = class HTTPServer extends TCPServer {
 
   setTimeout (ms = 0, ontimeout) {
     if (ontimeout) this.on('timeout', ontimeout)
-
     this._timeout = ms
-
     return this
   }
+
+  close () {
+    this._closeConnections()
+    super.close()
+  }
+
+  _closeConnections () {
+    for (const socket of this._connections) socket.end()
+  }
 }

test.js

@@ -65,8 +65,7 @@ test('basic', async function (t) {
     host: server.address().address,
     port: server.address().port,
     path: '/something/?key1=value1&key2=value2&enabled',
-    headers: { 'Content-Length': 12 },
-    agent: false
+    headers: { 'Content-Length': 12 }
   }, (req) => {
     req.write('body message')
     req.end()
@@ -193,8 +192,7 @@ test('write head', async function (t) {
     method: 'GET',
     host: server.address().address,
     port: server.address().port,
-    path: '/',
-    agent: false
+    path: '/'
   })
 
   t.absent(reply.error)
@@ -232,8 +230,7 @@ test('write head with headers', async function (t) {
     method: 'GET',
     host: server.address().address,
     port: server.address().port,
-    path: '/',
-    agent: false
+    path: '/'
   })
 
   t.absent(reply.error)
@@ -278,8 +275,7 @@ test('chunked', async function (t) {
     method: 'POST',
     host: server.address().address,
     port: server.address().port,
-    path: '/',
-    agent: false
+    path: '/'
   }, (req) => {
     req.write('request body part 1 + ')
     setImmediate(() => { req.end('request body part 2') })
@@ -488,11 +484,11 @@ test('make requests using url', async function (t) {
   const url = `http://localhost:${server.address().port}/path`
   const expectedBuf = Buffer.from('response')
 
-  http.request(url, { agent: false }, res => {
+  http.request(url, res => {
     res.on('data', (data) => rqts.alike(data, expectedBuf, 'url as string'))
   }).end()
 
-  http.request(new URL(url), { agent: false }, res => {
+  http.request(new URL(url), res => {
     res.on('data', (data) => rqts.alike(data, expectedBuf, 'url instance'))
   }).end()
 
@@ -514,7 +510,7 @@ test('custom request headers', async function (t) {
   })
 
   const { port } = server.address()
-  http.request({ port, headers: { 'custom-header': 'value' }, agent: false }).end()
+  http.request({ port, headers: { 'custom-header': 'value' } }).end()
 
   await ht
 
@@ -532,7 +528,7 @@ test('request timeout', async function (t) {
 
   await waitForServer(server)
 
-  const client = http.request({ port: server.address().port, agent: false }).end()
+  const client = http.request({ port: server.address().port }).end()
 
   client.setTimeout(100, () => sub.pass('callback'))
   client.on('timeout', () => sub.pass('event'))
@@ -562,7 +558,7 @@ test('server timeout', async function (t) {
   await waitForServer(server)
 
   const { port } = server.address()
-  const req = http.request({ port, agent: false })
+  const req = http.request({ port })
 
   await sub
 
@@ -601,7 +597,7 @@ test('do not close the server at timeout if a handler is found', async function
 
   await waitForServer(server)
 
-  http.request({ port: server.address().port, agent: false }).end()
+  http.request({ port: server.address().port }).end()
 })
 
 test('server response timeout', async function (t) {
@@ -618,7 +614,7 @@ test('server response timeout', async function (t) {
 
   await waitForServer(server)
 
-  http.request({ port: server.address().port, agent: false }).end()
+  http.request({ port: server.address().port }).end()
 
   await sub