fix defaults not setting non-nulls (related to M2Ys4U#2)

sidorares · Dec 9, 2014 · 86c088e · 86c088e
1 parent 4e5e906
commit 86c088e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/socks.js b/socks.js
@@ -313,10 +313,12 @@ var proxyData = function () {
 };
 
 var defaults = function(obj) {
+ if (!obj) 
+ obj = {};
  Array.prototype.slice.call(arguments, 1).forEach(function(source) {
  if (source) {
  for (var prop in source) {
- if (obj[prop] === null) {
+ if (typeof obj[prop] === 'undefined') {
  obj[prop] = source[prop];
  }
  }