ENH: updated ws and web functions to use the global options objec…

…t as a base even if request options is specified. request options will over write any global options in a conflict
http-party · Sep 16, 2013 · 268afe3 · 268afe3
1 parent 1b867a7
commit 268afe3
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/lib/caronte/index.js b/lib/caronte/index.js
@@ -1,5 +1,6 @@
 var caronte = exports,
-    web     = require('./passes/web-incoming');
+    extend  = require('util')._extend,
+    web     = require('./passes/web-incoming'),
     ws      = require('./passes/ws-incoming');
 
 caronte.createWebProxy = createRightProxy('web');
@@ -41,7 +42,11 @@ function createRightProxy(type) {
         !(args[cntr] instanceof Buffer) &&
         args[cntr] !== res
       ) {  
-        options = args[cntr]; 
+        //Copy global options
+        options = extend({}, options);
+        //Overwrite with request options
+        extend(options, args[cntr]);
+
         cntr--;
       }