From 8a8917ea2efbc87ce2e7a0e49ae30fc4af398ec6 Mon Sep 17 00:00:00 2001 From: Sam Lin Date: Mon, 1 Jun 2015 22:52:29 +0800 Subject: [PATCH 1/4] avoid hardcoded magic number --- lib/create-options.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/create-options.js b/lib/create-options.js index 271564d..05c7948 100644 --- a/lib/create-options.js +++ b/lib/create-options.js @@ -46,11 +46,12 @@ module.exports = function (opts, server){ windowsize: windowSize + "", rollover: "0" }; - - options.extensionsLength = 48 + - options.extensionsString.blksize.length + - options.extensionsString.timeout.length + - options.extensionsString.windowsize.length; + + options.extensionsLength = "tsize".length + 2; + for (var k in extensionsString) { + options.extensionsLength += (k.length + extensionsString[k].length + 2); + }; + return options; }; \ No newline at end of file From d20f2e5338c3ab74411f5e7fdbb9ed616ddf884a Mon Sep 17 00:00:00 2001 From: Sam Lin Date: Mon, 1 Jun 2015 23:03:29 +0800 Subject: [PATCH 2/4] disable extentions by default --- lib/create-options.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/create-options.js b/lib/create-options.js index 05c7948..62ac77a 100644 --- a/lib/create-options.js +++ b/lib/create-options.js @@ -40,11 +40,13 @@ module.exports = function (opts, server){ rollover: 0 }; + + // disable these extension by default options.extensionsString = { - blksize: blockSize + "", - timeout: timeout + "", - windowsize: windowSize + "", - rollover: "0" + // blksize: blockSize + "", + // timeout: timeout + "", + // windowsize: windowSize + "", + // rollover: "0" }; options.extensionsLength = "tsize".length + 2; From 705c090da11ab95e6acc5fc09a366a6f0bf73b66 Mon Sep 17 00:00:00 2001 From: Sam Lin Date: Mon, 1 Jun 2015 23:08:28 +0800 Subject: [PATCH 3/4] default to windowSize 1 --- lib/create-options.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/create-options.js b/lib/create-options.js index 62ac77a..b227c1b 100644 --- a/lib/create-options.js +++ b/lib/create-options.js @@ -21,8 +21,8 @@ module.exports = function (opts, server){ } //Default window size 4: https://github.com/joyent/node/issues/6696 - var windowSize = sanitizeNumber (opts.windowSize || 4); - if (windowSize > 65535) windowSize = 4; + var windowSize = sanitizeNumber (opts.windowSize || 1); + if (windowSize > 65535) windowSize = 1; //Maximum block size before IP packet fragmentation on Ethernet networks var blockSize = sanitizeNumber (opts.blockSize || 1468); From ef8708f825a76f70cda1293667b5de3f70f36d8d Mon Sep 17 00:00:00 2001 From: Sam Lin Date: Tue, 2 Jun 2015 07:29:51 +0800 Subject: [PATCH 4/4] fix typo --- lib/create-options.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/create-options.js b/lib/create-options.js index b227c1b..0b4dd16 100644 --- a/lib/create-options.js +++ b/lib/create-options.js @@ -50,7 +50,7 @@ module.exports = function (opts, server){ }; options.extensionsLength = "tsize".length + 2; - for (var k in extensionsString) { + for (var k in options.extensionsString) { options.extensionsLength += (k.length + extensionsString[k].length + 2); };