Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 05:17:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

review

Browse source
This commit is contained in:
Seth Alves 2018-03-21 16:18:31 -07:00
parent ae94ab3d67
commit 916ed3a0d4
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/Application.cpp
View file

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

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

@ -133,14 +133,14 @@ void AddressManager::storeCurrentAddress() {
auto url = currentAddress(); auto url = currentAddress();
if (url.scheme() == URL_SCHEME_FILE || if (url.scheme() == URL_SCHEME_FILE ||
(url.scheme() == URL_SCHEME_HIFI && !url.host().isEmpty())) {
// TODO -- once Octree::readFromURL no-longer takes over the main event-loop, serverless-domain urls can // TODO -- once Octree::readFromURL no-longer takes over the main event-loop, serverless-domain urls can
// be loaded over http(s) // be loaded over http(s)
// url.scheme() == URL_SCHEME_HTTP || // url.scheme() == URL_SCHEME_HTTP ||
// url.scheme() == URL_SCHEME_HTTPS || // url.scheme() == URL_SCHEME_HTTPS ||
!url.host().isEmpty()) {
currentAddressHandle.set(url); currentAddressHandle.set(url);
} else { } else {
qCWarning(networking) << "Ignoring attempt to save current address with an empty host" << url; qCWarning(networking) << "Ignoring attempt to save current address with an invalid url:" << url;
} }
} }
@ -307,7 +307,7 @@ bool AddressManager::handleUrl(const QUrl& lookupUrl, LookupTrigger trigger) {
bool isPossiblePlaceName(QString possiblePlaceName) { bool isPossiblePlaceName(QString possiblePlaceName) {
bool result { false }; bool result { false };
int length = possiblePlaceName.length(); int length = possiblePlaceName.length();
static const int MINIMUM_PLACENAME_LENGTH = 2; static const int MINIMUM_PLACENAME_LENGTH = 1;
static const int MAXIMUM_PLACENAME_LENGTH = 64; static const int MAXIMUM_PLACENAME_LENGTH = 64;
if (possiblePlaceName.toLower() != "localhost" && if (possiblePlaceName.toLower() != "localhost" &&
length >= MINIMUM_PLACENAME_LENGTH && length <= MAXIMUM_PLACENAME_LENGTH) { length >= MINIMUM_PLACENAME_LENGTH && length <= MAXIMUM_PLACENAME_LENGTH) {