Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 17:14:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

disable loading of serverless-domains over http(s), for now

Browse source
This commit is contained in:
Seth Alves 2018-03-14 15:53:35 -07:00
parent e63558dc05
commit afcbb6751b
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
interface/src/Application.cpp
View file

@ -516,9 +516,12 @@ bool isDomainURL(QUrl url) {
if (url.scheme() == URL_SCHEME_HIFI) {
return true;
}
if (url.scheme() != URL_SCHEME_FILE &&
url.scheme() != URL_SCHEME_HTTP &&
url.scheme() != URL_SCHEME_HTTPS) {
if (url.scheme() != URL_SCHEME_FILE
// TODO -- once Octree::readFromURL no-longer takes over the main event-loop, serverless-domain urls can
// be loaded over http(s)
// && url.scheme() != URL_SCHEME_HTTP &&
// url.scheme() != URL_SCHEME_HTTPS
) {
return false;
}
if (url.path().endsWith(".json", Qt::CaseInsensitive) ||

12
libraries/networking/src/AddressManager.cpp
View file

@ -133,8 +133,10 @@ void AddressManager::storeCurrentAddress() {
auto url = currentAddress();
if (url.scheme() == URL_SCHEME_FILE ||
url.scheme() == URL_SCHEME_HTTP ||
url.scheme() == URL_SCHEME_HTTPS ||
// TODO -- once Octree::readFromURL no-longer takes over the main event-loop, serverless-domain urls can
// be loaded over http(s)
// url.scheme() == URL_SCHEME_HTTP ||
// url.scheme() == URL_SCHEME_HTTPS ||
!url.host().isEmpty()) {
currentAddressHandle.set(url);
} else {
@ -286,8 +288,10 @@ bool AddressManager::handleUrl(const QUrl& lookupUrl, LookupTrigger trigger) {
emit lookupResultsFinished();
return true;
} else if (lookupUrl.scheme() == URL_SCHEME_HTTP ||
lookupUrl.scheme() == URL_SCHEME_HTTPS ||
} else if (// TODO -- once Octree::readFromURL no-longer takes over the main event-loop, serverless-domain urls can
// be loaded over http(s)
// lookupUrl.scheme() == URL_SCHEME_HTTP ||
// lookupUrl.scheme() == URL_SCHEME_HTTPS ||
lookupUrl.scheme() == URL_SCHEME_FILE) {
_previousLookup.clear();
QUrl domainUrl = PathUtils::expandToLocalDataAbsolutePath(lookupUrl);