Revert flag merging to use blacklist

ZJONSSON · ZJONSSON · commit 63f6bfe6e567 · 2020-03-28T20:28:30.000-04:00
diff --git a/lib/ConnectionConfig.js b/lib/ConnectionConfig.js
@@ -69,7 +69,7 @@ ConnectionConfig.mergeFlags = function mergeFlags(defaultFlags, userFlags) {
 
   // Merge the new flags
   for (var flag in newFlags) {
-    if (allFlags[flag] !== newFlags[flag]) {
+    if (allFlags[flag] !== false) {
       allFlags[flag] = newFlags[flag];
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ ConnectionConfig.mergeFlags = function mergeFlags(defaultFlags, userFlags) {`
`69`	`69`
`70`	`70`	`// Merge the new flags`
`71`	`71`	`for (var flag in newFlags) {`
`72`		`- if (allFlags[flag] !== newFlags[flag]) {`
	`72`	`+ if (allFlags[flag] !== false) {`
`73`	`73`	`allFlags[flag] = newFlags[flag];`
`74`	`74`	`}`
`75`	`75`	`}`