Merged with master

This commit is contained in:
dosse91 2019-09-25 08:25:27 +02:00
commit 337ebc77fd
7 changed files with 19 additions and 19 deletions

View file

@ -1,4 +1,4 @@
![HTML5 Speedtest Logo](https://github.com/adolfintel/speedtest/blob/master/.logo/Readme-Logo.png?raw=true) ![HTML5 Speedtest Logo](https://github.com/librespeed/speedtest/blob/master/.logo/logo3.png?raw=true)
# HTML5 Speedtest # HTML5 Speedtest
@ -7,7 +7,7 @@ No Flash, No Java, No Websocket, No Bullshit.
This is a very lightweight Speedtest implemented in Javascript, using XMLHttpRequest and Web Workers. This is a very lightweight Speedtest implemented in Javascript, using XMLHttpRequest and Web Workers.
## Try it ## Try it
[Take a Speedtest](http://speedtest.fdossena.com) [Take a Speedtest](https://speedtest.fdossena.com)
## Compatibility ## Compatibility
All modern browsers are supported: IE11, latest Edge, latest Chrome, latest Firefox, latest Safari. All modern browsers are supported: IE11, latest Edge, latest Chrome, latest Firefox, latest Safari.

12
doc.md
View file

@ -1,11 +1,11 @@
# HTML5 Speedtest # LibreSpeed
> by Federico Dossena > by Federico Dossena
> Version 5.0 > Version 5.1
> [https://github.com/adolfintel/speedtest/](https://github.com/adolfintel/speedtest/) > [https://github.com/librespeed/speedtest/](https://github.com/librespeed/speedtest/)
## Introduction ## Introduction
HTML5 Speedtest is a Free and Open Source speedtest that you can host on your server(s), and users can run in their browser. LibreSpeed is a Free and Open Source speedtest that you can host on your server(s), and users can run in their browser.
__Features:__ __Features:__
* Download test * Download test
@ -108,11 +108,11 @@ A login is required to access the interface. __Important__: change the default p
#### The end #### The end
Now that the test is installed, rename one of the examples to `index.html` and delete the other examples. Now that the test is installed, rename one of the examples to `index.html` and delete the other examples.
The best starting point for most people is `example-singleServer-pretty.html`. If you want to use telemetry and results sharing, use `example-singleServer-full.html` instead. The best starting point for most people is `example-singleServer-gauges.html`. If you want to use telemetry and results sharing, use `example-singleServer-full.html` instead.
If you're not using telemetry and results sharing, you can delete the `results` folder too. If you're not using telemetry and results sharing, you can delete the `results` folder too.
Details about the examples and how to make custom UIs will be discussed later. Details about the examples and how to make custom UIs will be discussed later. If you don't want to make a custom UI, feel free to modify the example and replace "LibreSpeed Example" with the name of your test.
#### Privacy #### Privacy
Telemetry contains personal information (according to GDPR defintion), therefore it is important to treat this data respectfully of national and international laws, especially if you plan to offer the service in the European Union. Telemetry contains personal information (according to GDPR defintion), therefore it is important to treat this data respectfully of national and international laws, especially if you plan to offer the service in the European Union.

View file

@ -218,10 +218,10 @@ function initUI(){
} }
} }
</style> </style>
<title>HTML5 Speedtest</title> <title>LibreSpeed Example</title>
</head> </head>
<body> <body>
<h1>HTML5 Speedtest</h1> <h1>LibreSpeed Example</h1>
<div id="testWrapper"> <div id="testWrapper">
<div id="startStopBtn" onclick="startStop()"></div> <div id="startStopBtn" onclick="startStop()"></div>
<div id="test"> <div id="test">
@ -255,7 +255,7 @@ function initUI(){
<span id="ip"></span> <span id="ip"></span>
</div> </div>
</div> </div>
<a href="https://github.com/adolfintel/speedtest">Source code</a> <a href="https://github.com/librespeed/speedtest">Source code</a>
</div> </div>
<script type="text/javascript">setTimeout(function(){initUI()},100);</script> <script type="text/javascript">setTimeout(function(){initUI()},100);</script>
</body> </body>

View file

@ -1,5 +1,5 @@
<?php <?php
$WATERMARK_TEXT="HTML5 Speedtest"; $WATERMARK_TEXT="LibreSpeed";
error_reporting(0); error_reporting(0);
putenv('GDFONTPATH=' . realpath('.')); putenv('GDFONTPATH=' . realpath('.'));

View file

@ -9,7 +9,7 @@ header('Pragma: no-cache');
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>HTML5 Speedtest - Stats</title> <title>LibreSpeed - Stats</title>
<style type="text/css"> <style type="text/css">
html,body{ html,body{
margin:0; margin:0;
@ -54,7 +54,7 @@ header('Pragma: no-cache');
</style> </style>
</head> </head>
<body> <body>
<h1>HTML5 Speedtest - Stats</h1> <h1>LibreSpeed - Stats</h1>
<?php <?php
include_once("telemetry_settings.php"); include_once("telemetry_settings.php");
require "idObfuscation.php"; require "idObfuscation.php";

View file

@ -1,7 +1,7 @@
/* /*
HTML5 Speedtest - Main LibreSpeed - Main
by Federico Dossena by Federico Dossena
https://github.com/adolfintel/speedtest/ https://github.com/librespeed/speedtest/
GNU LGPLv3 License GNU LGPLv3 License
*/ */
@ -49,7 +49,7 @@ function Speedtest() {
this._settings = {}; //settings for the speedtest worker this._settings = {}; //settings for the speedtest worker
this._state = 0; //0=adding settings, 1=adding servers, 2=server selection done, 3=test running, 4=done this._state = 0; //0=adding settings, 1=adding servers, 2=server selection done, 3=test running, 4=done
console.log( console.log(
"HTML5 Speedtest by Federico Dossena v5.0 - https://github.com/adolfintel/speedtest" "LibreSpeed by Federico Dossena v5.1 - https://github.com/librespeed/speedtest"
); );
} }

View file

@ -1,7 +1,7 @@
/* /*
HTML5 Speedtest - Worker LibreSpeed - Worker
by Federico Dossena by Federico Dossena
https://github.com/adolfintel/speedtest/ https://github.com/librespeed/speedtest/
GNU LGPLv3 License GNU LGPLv3 License
*/ */