Commit 7c7acc14 authored by David Fifield's avatar David Fifield
Browse files

Revert "allow some proxy defaults to be defined from an external script file." 

This reverts commit f0e9b364.

Conflicts:
	proxy/embed.html
	proxy/flashproxy.js
parent ac33274b

proxy/embed.html

+0 −11
Original line number Diff line number Diff line
@@ -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%;

proxy/flashproxy.js

+5 −5
Original line number Diff line number Diff line
@@ -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;