Merge branch 'master' into docker

This commit is contained in:
adolfintel 2018-07-13 22:47:39 +02:00
commit a02af69820
3 changed files with 7 additions and 6 deletions

4
doc.md
View file

@ -415,10 +415,10 @@ Since this is an open source project, you can modify it.
To make changes to the speedtest itself, edit `speedtest_worker.js` To make changes to the speedtest itself, edit `speedtest_worker.js`
To create the minified version, use UglifyJS like this: To create the minified version, use [UglifyJS](https://github.com/mishoo/UglifyJS2) like this:
``` ```
uglifyjs -c speedtest_worker.js > speedtest_worker.min.js uglifyjs -c -o speedtest_worker.min.js -- speedtest_worker.js
``` ```
Pull requests are very appreciated. If you don't use github (or git), simply contact me at [info@fdossena.com](mailto:info@fdossena.com). Pull requests are very appreciated. If you don't use github (or git), simply contact me at [info@fdossena.com](mailto:info@fdossena.com).

View file

@ -1,5 +1,5 @@
/* /*
HTML5 Speedtest v4.5.4 HTML5 Speedtest v4.5.5
by Federico Dossena by Federico Dossena
https://github.com/adolfintel/speedtest/ https://github.com/adolfintel/speedtest/
GNU LGPLv3 License GNU LGPLv3 License
@ -264,13 +264,14 @@ function ulTest (done) {
if (ulCalled) return; else ulCalled = true // ulTest already called? if (ulCalled) return; else ulCalled = true // ulTest already called?
// garbage data for upload test // garbage data for upload test
var r = new ArrayBuffer(1048576) var r = new ArrayBuffer(1048576)
try { r = new Float32Array(r); for (var i = 0; i < r.length; i++)r[i] = Math.random() } catch (e) { } var maxInt=Math.pow(2,32)-1;
try { r = new Uint32Array(r); for (var i = 0; i < r.length; i++)r[i] = Math.random()*maxInt } catch (e) { }
var req = [] var req = []
var reqsmall = [] var reqsmall = []
for (var i = 0; i < settings.xhr_ul_blob_megabytes; i++) req.push(r) for (var i = 0; i < settings.xhr_ul_blob_megabytes; i++) req.push(r)
req = new Blob(req) req = new Blob(req)
r = new ArrayBuffer(262144) r = new ArrayBuffer(262144)
try { r = new Float32Array(r); for (var i = 0; i < r.length; i++)r[i] = Math.random() } catch (e) { } try { r = new Uint32Array(r); for (var i = 0; i < r.length; i++)r[i] = Math.random()*maxInt } catch (e) { }
reqsmall.push(r) reqsmall.push(r)
reqsmall = new Blob(reqsmall) reqsmall = new Blob(reqsmall)
var totLoaded = 0.0, // total number of transmitted bytes var totLoaded = 0.0, // total number of transmitted bytes

File diff suppressed because one or more lines are too long