Fix load error messages on "data:" URL and "http:" on "https:" context

vivliostyle · Feb 24, 2019 · c2df75f · c2df75f
1 parent 6b1f7cd
commit c2df75f
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/adapt/epub.js b/src/adapt/epub.js
@@ -298,7 +298,13 @@ adapt.epub.EPUBDocStore.prototype.load = function(url) {
         r = adapt.epub.EPUBDocStore.superClass_.load.call(this, docURL, true, `Failed to fetch a source document from ${docURL}`);
         r.then(xmldoc => {
             if (!xmldoc) {
-                vivliostyle.logging.logger.error(`Received an empty response for ${docURL}. This may be caused by the server not allowing cross-origin resource sharing (CORS).`);
+                if (docURL.startsWith("data:")) {
+                    vivliostyle.logging.logger.error(`Failed to load ${docURL}. Invalid data.`);
+                } else if (docURL.startsWith("http:") && adapt.base.baseURL.startsWith("https:")) {
+                    vivliostyle.logging.logger.error(`Failed to load ${docURL}. Mixed Content ("http:" content on "https:" context) is not allowed.`);
+                } else {
+                    vivliostyle.logging.logger.error(`Received an empty response for ${docURL}. This may be caused by the server not allowing cross-origin resource sharing (CORS).`);
+                }
             } else {
                 frame.finish(xmldoc);
             }