Merge branch 'customizeOutgoingAddress' of github.com:sberan/node-http-proxy into sberan-customizeOutgoingAddress

Conflicts:
	lib/http-proxy.js
	lib/http-proxy/common.js

Author: jcrugzz

lib/http-proxy.js

@@ -11,7 +11,7 @@ module.exports  = httpProxy.Server;
 module.exports.createProxy = function(options) {
   return {
     web: httpProxy.createRightProxy('web')(options),
-    ws:  httpProxy.createRightProxy('ws')(options) 
+    ws:  httpProxy.createRightProxy('ws')(options)
   };
 }
 
@@ -43,6 +43,7 @@ module.exports.createProxyServer = module.exports.createServer = function create
    *    xfwd   : <true/false, adds x-forward headers>
    *    secure : <true/false, verify SSL certificate>
    *    toProxy: <true/false, explicitly specify if we are proxying to another proxy
+   *    localAddress : <Local interface string to bind for outgoing connections>
    *  }
    *
    *  NOTE: `options.ws` and `options.ssl` are optional.

lib/http-proxy/common.js

@@ -44,6 +44,7 @@ common.setupOutgoing = function(outgoing, options, req, forward) {
 
 
   outgoing.agent = options.agent || false;
+  outgoing.localAddress = options.localAddress;
 
   //
   // Remark: If we are false set the connection: close. This is the right thing to do

test/lib-http-proxy-common-test.js

@@ -15,6 +15,7 @@ describe('lib/http-proxy/common.js', function () {
           port      : 'you',
         },
         headers: {'fizz': 'bang', 'overwritten':true},
+        localAddress: 'local.address',
       },
       {
         method    : 'i',
@@ -34,6 +35,7 @@ describe('lib/http-proxy/common.js', function () {
       expect(outgoing.headers.pro).to.eql('xy');
       expect(outgoing.headers.fizz).to.eql('bang');
       expect(outgoing.headers.overwritten).to.eql(true);
+      expect(outgoing.localAddress).to.eql('local.address');
     });
 
     it('should set the agent to false if none is given', function () {