summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-12-16 07:42:37 +0000
committerMoonchild <moonchild@palemoon.org>2020-12-16 07:42:37 +0000
commit810c2bf8080da2bc8ec4efb05223fea31817944b (patch)
tree1c0dfd0363791da1332e4df0d63fb11a489dd7c5 /modules
parentdabdec3b3ae9cd920e9fe75622a10ce290552941 (diff)
parent203be74ffe19ea3010e389cee32077ec6c7a173a (diff)
downloadUXP-RELBASE_20201218.tar
UXP-RELBASE_20201218.tar.gz
UXP-RELBASE_20201218.tar.lz
UXP-RELBASE_20201218.tar.xz
UXP-RELBASE_20201218.zip
Merge branch 'redwood' into releaseRELBASE_20201218RC_20201216
Diffstat (limited to 'modules')
-rw-r--r--modules/libpref/init/all.js5
1 files changed, 0 insertions, 5 deletions
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 1e60c97c5..314beac37 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -1663,11 +1663,6 @@ pref("network.websocket.timeout.open", 20);
// close message
pref("network.websocket.timeout.close", 20);
-// Setting this to true will clamp the websocket timeout value to a minimum
-// regardless if there are pending events on the thread.
-// This is a workaround for runaway polling, see issue #1695
-pref("network.websocket.timeout.clamped", false);
-
// the number of seconds of idle read activity to sustain before sending a
// ping probe. 0 to disable.
pref("network.websocket.timeout.ping.request", 0);