From 6337158cfcd4618858224335f660085cbce12ec9 Mon Sep 17 00:00:00 2001 From: Howard Stearns Date: Sat, 9 May 2015 13:34:35 -0700 Subject: [PATCH 1/4] Fix "simple inline/"direct code injection" entity scripts fail to load" (https://app.asana.com/0/32622044445063/33562012389754) --- libraries/entities-renderer/src/EntityTreeRenderer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp index e4c476c6f7..c10d673890 100644 --- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp +++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp @@ -142,7 +142,7 @@ QString EntityTreeRenderer::loadScriptContents(const QString& scriptMaybeURLorTe QUrl url(scriptMaybeURLorText); // If the url is not valid, this must be script text... - if (!url.isValid()) { + if (!url.isValid() || scriptMaybeURLorText.startsWith("(")) { isURL = false; return scriptMaybeURLorText; } From aed165809c8b1a2a85e8e4029410183f26b5a3e1 Mon Sep 17 00:00:00 2001 From: Howard Stearns Date: Mon, 11 May 2015 10:01:49 -0700 Subject: [PATCH 2/4] Use resource cache as long as it is no older than network resource. This allows chache to be used when cdn provides different values for get-vs-head, or for cdn with different resource times in different requests of different sessions. --- libraries/networking/src/ResourceCache.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/networking/src/ResourceCache.cpp b/libraries/networking/src/ResourceCache.cpp index c66ae4ce1d..c182b9c1d8 100644 --- a/libraries/networking/src/ResourceCache.cpp +++ b/libraries/networking/src/ResourceCache.cpp @@ -350,7 +350,7 @@ void Resource::maybeRefresh() { QDateTime lastModified = variant.value(); QDateTime lastModifiedOld = metaData.lastModified(); if (lastModified.isValid() && lastModifiedOld.isValid() && - lastModifiedOld == lastModified) { + lastModifiedOld >= lastModified) { qCDebug(networking) << "Using cached version of" << _url.fileName(); // We don't need to update, return return; From cdef09c9dd503ab5e330f26c9bb439216bdc0bc7 Mon Sep 17 00:00:00 2001 From: Howard Stearns Date: Mon, 11 May 2015 10:12:03 -0700 Subject: [PATCH 3/4] Add comment (and force previous change to the right branch). --- libraries/networking/src/ResourceCache.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/networking/src/ResourceCache.cpp b/libraries/networking/src/ResourceCache.cpp index c182b9c1d8..0b6e39b151 100644 --- a/libraries/networking/src/ResourceCache.cpp +++ b/libraries/networking/src/ResourceCache.cpp @@ -350,7 +350,7 @@ void Resource::maybeRefresh() { QDateTime lastModified = variant.value(); QDateTime lastModifiedOld = metaData.lastModified(); if (lastModified.isValid() && lastModifiedOld.isValid() && - lastModifiedOld >= lastModified) { + lastModifiedOld >= lastModified) { // With >=, cache won't thrash in eventually-consistent cdn. qCDebug(networking) << "Using cached version of" << _url.fileName(); // We don't need to update, return return; From 57f0d9435d6a443caefd94a46c4c90b6dc247039 Mon Sep 17 00:00:00 2001 From: Howard Stearns Date: Mon, 11 May 2015 10:17:31 -0700 Subject: [PATCH 4/4] Remove change that doesn't belong in this branch. --- libraries/entities-renderer/src/EntityTreeRenderer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp index c10d673890..e4c476c6f7 100644 --- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp +++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp @@ -142,7 +142,7 @@ QString EntityTreeRenderer::loadScriptContents(const QString& scriptMaybeURLorTe QUrl url(scriptMaybeURLorText); // If the url is not valid, this must be script text... - if (!url.isValid() || scriptMaybeURLorText.startsWith("(")) { + if (!url.isValid()) { isURL = false; return scriptMaybeURLorText; }