ENH: updated ws and web functions to use the global options object as a base

even if request options is specified. request options will over write any global options in a conflict
This commit is contained in:
srossross 2013-09-16 10:37:11 -07:00
parent 1b867a7f59
commit 268afe34bb

View File

@ -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--;
}