mirror of https://github.com/lukechilds/node.git
Browse Source
`request.abort()` did not destroy the socket if it was called before a socket was assigned to the request and the request did not use an `Agent` or a Unix Domain Socket was used. Fixes: https://github.com/nodejs/node/issues/10812 PR-URL: https://github.com/nodejs/node/pull/10818 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>v4.x
Luigi Pinca
8 years ago
committed by
Myles Borins
4 changed files with 84 additions and 1 deletions
@ -0,0 +1,36 @@ |
|||||
|
'use strict'; |
||||
|
const common = require('../common'); |
||||
|
const assert = require('assert'); |
||||
|
const http = require('http'); |
||||
|
|
||||
|
let socketsCreated = 0; |
||||
|
|
||||
|
class Agent extends http.Agent { |
||||
|
createConnection(options, oncreate) { |
||||
|
const socket = super.createConnection(options, oncreate); |
||||
|
socketsCreated++; |
||||
|
return socket; |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
const server = http.createServer((req, res) => res.end()); |
||||
|
|
||||
|
server.listen(0, common.mustCall(() => { |
||||
|
const port = server.address().port; |
||||
|
const agent = new Agent({ |
||||
|
keepAlive: true, |
||||
|
maxSockets: 1 |
||||
|
}); |
||||
|
|
||||
|
http.get({agent, port}, (res) => res.resume()); |
||||
|
|
||||
|
const req = http.get({agent, port}, common.fail); |
||||
|
req.abort(); |
||||
|
|
||||
|
http.get({agent, port}, common.mustCall((res) => { |
||||
|
res.resume(); |
||||
|
assert.strictEqual(socketsCreated, 1); |
||||
|
agent.destroy(); |
||||
|
server.close(); |
||||
|
})); |
||||
|
})); |
@ -0,0 +1,19 @@ |
|||||
|
'use strict'; |
||||
|
const common = require('../common'); |
||||
|
const http = require('http'); |
||||
|
const net = require('net'); |
||||
|
|
||||
|
const server = http.createServer(common.fail); |
||||
|
|
||||
|
server.listen(0, common.mustCall(() => { |
||||
|
const req = http.get({ |
||||
|
createConnection(options, oncreate) { |
||||
|
const socket = net.createConnection(options, oncreate); |
||||
|
socket.once('close', () => server.close()); |
||||
|
return socket; |
||||
|
}, |
||||
|
port: server.address().port |
||||
|
}); |
||||
|
|
||||
|
req.abort(); |
||||
|
})); |
@ -0,0 +1,24 @@ |
|||||
|
'use strict'; |
||||
|
const common = require('../common'); |
||||
|
const http = require('http'); |
||||
|
|
||||
|
const server = http.createServer(common.fail); |
||||
|
|
||||
|
class Agent extends http.Agent { |
||||
|
createConnection(options, oncreate) { |
||||
|
const socket = super.createConnection(options, oncreate); |
||||
|
socket.once('close', () => server.close()); |
||||
|
return socket; |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
common.refreshTmpDir(); |
||||
|
|
||||
|
server.listen(common.PIPE, common.mustCall(() => { |
||||
|
const req = http.get({ |
||||
|
agent: new Agent(), |
||||
|
socketPath: common.PIPE |
||||
|
}); |
||||
|
|
||||
|
req.abort(); |
||||
|
})); |
Loading…
Reference in new issue