Merge pull request #915 from gas-buddy/mm_fix_ca

Fix connectionAgent behavior to apply to both spec fetch and requests…

Author: fehguy

lib/client.js

@@ -406,7 +406,7 @@ SwaggerClient.prototype.buildFromSpec = function (response) {
   }
 
   // get paths, create functions for each operationId
-  
+
   // Bind help to 'client.apis'
   self.apis.help = _.bind(self.help, self);
 
@@ -447,6 +447,7 @@ SwaggerClient.prototype.buildFromSpec = function (response) {
         self.models,
         self.clientAuthorizations);
 
+      operationObject.connectionAgent = self.connectionAgent;
       operationObject.vendorExtensions = {};
       for(i in operation) {
         helpers.extractExtensions(i, operationObject, operation[i]);

lib/http.js

@@ -216,7 +216,6 @@ JQueryHttpClient.prototype.execute = function (obj) {
 };
 
 SuperagentHttpClient.prototype.execute = function (obj) {
-  var connectionAgent = obj.connectionAgent;
   var method = obj.method.toLowerCase();
   var timeout = obj.timeout;
 
@@ -225,12 +224,12 @@ SuperagentHttpClient.prototype.execute = function (obj) {
   }
   var headers = obj.headers || {};
 
-  if (connectionAgent) {
-      request = request.agent(connectionAgent);
-  }
-
   var r = request[method](obj.url);
 
+  if (obj.connectionAgent) {
+    r.agent(obj.connectionAgent);
+  }
+
   if (timeout) {
     r.timeout(timeout);
   }

lib/types/operation.js

@@ -860,6 +860,7 @@ Operation.prototype.execute = function (arg1, arg2, arg3, arg4, parent) {
     headers: headers,
     clientAuthorizations: opts.clientAuthorizations,
     operation: this.operation,
+    connectionAgent: this.connectionAgent,
     on: {
       response: function (response) {
         if (deferred) {