let nodejs handle the connection pool when agent is passed

David Frank · David Frank · commit 7f68577de44c · 2016-04-30T13:19:08.000+08:00
diff --git a/index.js b/index.js
@@ -74,7 +74,7 @@ function Fetch(url, opts) {
 			headers.set('user-agent', 'node-fetch/1.0 (+https://github.com/bitinn/node-fetch)');
 		}
 
-		if (!headers.has('connection')) {
+		if (!headers.has('connection') && !options.agent) {
 			headers.set('connection', 'close');
 		}
 
diff --git a/test/server.js b/test/server.js
@@ -15,6 +15,9 @@ function TestServer() {
 	this.server.on('error', function(err) {
 		console.log(err.stack);
 	});
+	this.server.on('connection', function(socket) {
+		socket.setTimeout(1500);
+	});
 }
 
 TestServer.prototype.start = function(cb) {
diff --git a/test/test.js b/test/test.js
@@ -950,6 +950,20 @@ describe('node-fetch', function() {
 		});
 	});
 
+	it('should send request with connection keep-alive if agent is provided', function() {
+		url = base + '/inspect';
+		opts = {
+			agent: new http.Agent({
+				keepAlive: true
+			})
+		};
+		return fetch(url, opts).then(function(res) {
+			return res.json();
+		}).then(function(res) {
+			expect(res.headers['connection']).to.equal('keep-alive');
+		});
+	});
+
 	it('should ignore unsupported attributes while reading headers', function() {
 		var FakeHeader = function() {};
 		// prototypes are ignored

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ function Fetch(url, opts) {`
`74`	`74`	`headers.set('user-agent', 'node-fetch/1.0 (+https://github.com/bitinn/node-fetch)');`
`75`	`75`	`}`
`76`	`76`
`77`		`- if (!headers.has('connection')) {`
	`77`	`+ if (!headers.has('connection') && !options.agent) {`
`78`	`78`	`headers.set('connection', 'close');`
`79`	`79`	`}`
`80`	`80`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,9 @@ function TestServer() {`
`15`	`15`	`this.server.on('error', function(err) {`
`16`	`16`	`console.log(err.stack);`
`17`	`17`	`});`
	`18`	`+ this.server.on('connection', function(socket) {`
	`19`	`+ socket.setTimeout(1500);`
	`20`	`+ });`
`18`	`21`	`}`
`19`	`22`
`20`	`23`	`TestServer.prototype.start = function(cb) {`