Merge branch 'master' into docker

This commit is contained in:
adolfintel 2019-02-12 18:45:43 +01:00
commit 9c54e969ce
2 changed files with 13 additions and 3 deletions

View file

@ -470,7 +470,12 @@ function ulTest(done) {
testStream(i, 0);
};
xhr[i].open("POST", settings.url_ul + url_sep(settings.url_ul) + "r=" + Math.random(), true); // random string to prevent caching
xhr[i].setRequestHeader("Content-Encoding", "identity"); // disable compression (some browsers may refuse it, but data is incompressible anyway)
try{
xhr[i].setRequestHeader("Content-Encoding", "identity"); // disable compression (some browsers may refuse it, but data is incompressible anyway)
}catch(e){}
try{
xhr[i].setRequestHeader("Content-Type", "application/octet-stream"); //force content-type to application/octet-stream in case the server misinterprets it
}catch(e){}
xhr[i].send(reqsmall);
} else {
// REGULAR version, no workaround
@ -503,7 +508,12 @@ function ulTest(done) {
}.bind(this);
// send xhr
xhr[i].open("POST", settings.url_ul + url_sep(settings.url_ul) + "r=" + Math.random(), true); // random string to prevent caching
xhr[i].setRequestHeader("Content-Encoding", "identity"); // disable compression (some browsers may refuse it, but data is incompressible anyway)
try{
xhr[i].setRequestHeader("Content-Encoding", "identity"); // disable compression (some browsers may refuse it, but data is incompressible anyway)
}catch(e){}
try{
xhr[i].setRequestHeader("Content-Type", "application/octet-stream"); //force content-type to application/octet-stream in case the server misinterprets it
}catch(e){}
xhr[i].send(req);
}
}.bind(this),

File diff suppressed because one or more lines are too long