ENH: updated https and agent option

Removed logic from createProxyServer and put it into setupOutgoing.

Conflicts:
	lib/caronte.js

lib/caronte.js

@@ -28,6 +28,7 @@ proxy.createProxyServer = function createProxyServer(options) {
  " { ",
  " target : <url string to be parsed with the url module> ",
  " forward: <url string to be parsed with the url module> ",
+ " agent : <object to be passed to http(s).request(...)> ",
  " ssl : <object to be passed to https.createServer()> ",
  " ws : <true/false, if you want to proxy websockets> ",
  " xfwd : <true/false, adds x-forward headers> ",
@@ -41,14 +42,6 @@ proxy.createProxyServer = function createProxyServer(options) {
  ].join("\n"));
  }
 
- ['target', 'forward'].forEach(function(key) {
- if(!options[key]) return;
- options[key] = url.parse(options[key]);
-
- options[key].maxSockets = options.maxSock;
- options[key].agent = options.agent || false // new (options.ssl ? https.Agent : http.Agent)(options[key].maxSockets || 100);
- });
-
  options.ee = new events.EventEmitter2({ wildcard: true, delimiter: ':' }); 
 
  return {

lib/caronte/common.js

@@ -1,4 +1,7 @@
-var common = exports;
+var common = exports
+ , http = require('http')
+ , https = require('https')
+ ;
 
 /**
  * Copies the right headers from `options` and `req` to 
@@ -32,6 +35,15 @@ common.setupOutgoing = function(outgoing, options, req, forward) {
  function(e) { outgoing[e] = req[e]; }
  );
 
+ if (options.agent){
+ outgoing.agent = options.agent;
+ }
+
+ if (!outgoing.agent){
+ var Agent = (~['https:', 'wss:'].indexOf(options[forward || 'target'].protocol) ? https.Agent : http.Agent);
+ outgoing.agent = new Agent(options.maxSock || 100); 
+ }
+
  outgoing.path = req.url;
 
  return outgoing;