diff --git a/gui.js b/gui.js
index 8c59fe98..3e94e0d8 100644
--- a/gui.js
+++ b/gui.js
@@ -75,7 +75,7 @@ isRetinaSupported, SliderMorph, Animation, BoxMorph, MediaRecorder*/
// Global stuff ////////////////////////////////////////////////////////
-modules.gui = '2018-July-09';
+modules.gui = '2018-July-10';
// Declarations
@@ -3504,7 +3504,7 @@ IDE_Morph.prototype.aboutSnap = function () {
module, btn1, btn2, btn3, btn4, licenseBtn, translatorsBtn,
world = this.world();
- aboutTxt = 'Snap! 4.2.1\nBuild Your Own Blocks\n\n'
+ aboutTxt = 'Snap! 4.2.1.1\nBuild Your Own Blocks\n\n'
+ 'Copyright \u24B8 2018 Jens M\u00F6nig and '
+ 'Brian Harvey\n'
+ 'jens@moenig.org, bh@cs.berkeley.edu\n\n'
@@ -5641,7 +5641,9 @@ IDE_Morph.prototype.getURL = function (url, callback, responseType) {
}
};
}
- request.setRequestHeader('Cache-Control', 'max-age=0');
+ // cache-control, commented out for now
+ // added for Snap4Arduino but has issues with local robot servers
+ // request.setRequestHeader('Cache-Control', 'max-age=0');
request.send();
if (!async) {
if (request.status === 200) {
diff --git a/history.txt b/history.txt
index 4ae82c9f..fe814353 100755
--- a/history.txt
+++ b/history.txt
@@ -4253,3 +4253,9 @@ Translation Updates:
* Portuguese, thanks, Manuel!
* French, thanks, Nathalie and Joan!
* Spanish, Catalan and French translations of the tools library, thanks, Nathalie and Joan!
+
+180710
+------
+* Threads, GUI: reverted Cache-Control header for HTTP requests b/c of CORS issues
+
+=== v4.2.1.1 maintenance release ===
diff --git a/snap.html b/snap.html
index 303144c0..fc7e62b1 100755
--- a/snap.html
+++ b/snap.html
@@ -2,14 +2,14 @@
- Snap! Build Your Own Blocks 4.2.1
+ Snap! Build Your Own Blocks 4.2.1.1
-
+
-
+
diff --git a/threads.js b/threads.js
index e21d4dbc..35c7e140 100644
--- a/threads.js
+++ b/threads.js
@@ -62,7 +62,7 @@ StageMorph, SpriteMorph, StagePrompterMorph, Note, modules, isString, copy,
isNil, WatcherMorph, List, ListWatcherMorph, alert, console, TableMorph,
TableFrameMorph, ColorSlotMorph, isSnapObject*/
-modules.threads = '2018-July-09';
+modules.threads = '2018-July-10';
var ThreadManager;
var Process;
@@ -2302,7 +2302,9 @@ Process.prototype.reportURL = function (url) {
}
this.httpRequest = new XMLHttpRequest();
this.httpRequest.open("GET", url, true);
- this.httpRequest.setRequestHeader('Cache-Control', 'max-age=0');
+ // cache-control, commented out for now
+ // added for Snap4Arduino but has issues with local robot servers
+ // this.httpRequest.setRequestHeader('Cache-Control', 'max-age=0');
this.httpRequest.send(null);
if (this.context.isCustomCommand) {
// special case when ignoring the result, e.g. when