From c0c1be43b892a087299e9a0e167664894c378c4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erich=20Jagom=C3=A4gis?= Date: Wed, 15 Apr 2020 11:31:10 +0300 Subject: [PATCH 1/2] INFRA-159 banklink vead Debug messages to help identify issues. --- lib/forcecharset.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/forcecharset.js b/lib/forcecharset.js index c374a7d..2da7a27 100644 --- a/lib/forcecharset.js +++ b/lib/forcecharset.js @@ -40,6 +40,11 @@ module.exports = function(req, res, next) { } if (buffer) { + + console.log("buffer: ", buffer); + for (let idx in buffer) { + console.log("Is element buffer ", idx,":", Buffer.isBuffer(buffer[idx]) ? " Is buffer " : " Is not buffer: " + buffer[idx]); + } let buf = Buffer.concat(buffer, bufferLen); let out = encodinglib.convert(buf, res.forceCharset); From cb56760969052a2c71fcada060772a939449f2de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erich=20Jagom=C3=A4gis?= Date: Wed, 29 Apr 2020 10:28:49 +0300 Subject: [PATCH 2/2] INFRA-159 banklink vead --- lib/forcecharset.js | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/forcecharset.js b/lib/forcecharset.js index 2da7a27..1d37d68 100644 --- a/lib/forcecharset.js +++ b/lib/forcecharset.js @@ -24,8 +24,9 @@ module.exports = function(req, res, next) { if (!buffer) { write.call(res, chunk, encoding); } else { - if (encoding && typeof chunk === 'string') { - chunk = new Buffer(chunk, encoding); + + if (typeof chunk === 'string') { + chunk = new Buffer(chunk, !!encoding ? encoding : 'utf-8'); } buffer.push(chunk); bufferLen += chunk.length; @@ -38,13 +39,7 @@ module.exports = function(req, res, next) { if (chunk) { res.write(chunk, encoding); } - if (buffer) { - - console.log("buffer: ", buffer); - for (let idx in buffer) { - console.log("Is element buffer ", idx,":", Buffer.isBuffer(buffer[idx]) ? " Is buffer " : " Is not buffer: " + buffer[idx]); - } let buf = Buffer.concat(buffer, bufferLen); let out = encodinglib.convert(buf, res.forceCharset);