commit 7c7acc14638a3e9346c99defa6d4dd80b4f437aa Author: David Fifield david@bamsoftware.com Date: Wed Dec 21 02:03:17 2016 -0800
Revert "allow some proxy defaults to be defined from an external script file."
This reverts commit f0e9b3647c6df72c2b1f71a3cbe180150d1b67a9.
Conflicts: proxy/embed.html proxy/flashproxy.js --- proxy/embed.html | 11 ----------- proxy/flashproxy.js | 10 +++++----- 2 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/proxy/embed.html b/proxy/embed.html index 178b80a..53b5bf5 100644 --- a/proxy/embed.html +++ b/proxy/embed.html @@ -3,17 +3,6 @@ <head> <meta charset="utf-8"> <meta http-equiv="refresh" content="86400"> -<script type="text/javascript" > -/* - You can tweak the behaviour of the proxy by giving URL query parameters to - this embedding document. If you wish to override the default values even in - the absence of those parameters, you may set them below. - - See the main code of the proxy for details on which URL query parameters - are available, as well as which defaults you can override. -*/ -//var DEFAULT_FACILITATOR_URL = "https://fp-facilitator.org/"; -</script> <style type="text/css"> html { width: 100%; diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 15c6cf3..24c7a0d 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -62,20 +62,20 @@ * http://autobahn.ws/testsuite/reports/clients/index.html */
-var DEFAULT_FACILITATOR_URL = DEFAULT_FACILITATOR_URL || "https://fp-facilitator.org/"; +var DEFAULT_FACILITATOR_URL = "https://fp-facilitator.org/";
/* Start two connections because some versions of Tor make two PT connections: https://lists.torproject.org/pipermail/tor-dev/2012-December/004221.html https://trac.torproject.org/projects/tor/ticket/7733 */ var CONNECTIONS_PER_CLIENT = 2 -var DEFAULT_MAX_NUM_CLIENTS = DEFAULT_MAX_NUM_CLIENTS || 10; +var DEFAULT_MAX_NUM_CLIENTS = 10;
-var DEFAULT_INITIAL_FACILITATOR_POLL_INTERVAL = DEFAULT_INITIAL_FACILITATOR_POLL_INTERVAL || 60.0; -var DEFAULT_FACILITATOR_POLL_INTERVAL = DEFAULT_FACILITATOR_POLL_INTERVAL || 3600.0; +var DEFAULT_INITIAL_FACILITATOR_POLL_INTERVAL = 60.0; +var DEFAULT_FACILITATOR_POLL_INTERVAL = 3600.0; var MIN_FACILITATOR_POLL_INTERVAL = 10.0;
/* Bytes per second. Set to undefined to disable limit. */ -var DEFAULT_RATE_LIMIT = DEFAULT_RATE_LIMIT || undefined; +var DEFAULT_RATE_LIMIT = undefined; var MIN_RATE_LIMIT = 10 * 1024; var RATE_LIMIT_HISTORY = 5.0;