From d9161aeffa551b6154be395c7a86ed0650eecdb7 Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Fri, 23 Mar 2018 15:03:29 -0400
Subject: [PATCH] fix #3636

---
 src/js/redirect-engine.js | 2 +-
 tools/import-war.py       | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/js/redirect-engine.js b/src/js/redirect-engine.js
index bab57cda5..9ca363dd1 100644
--- a/src/js/redirect-engine.js
+++ b/src/js/redirect-engine.js
@@ -490,7 +490,7 @@ RedirectEngine.prototype.resourcesFromString = function(text) {
 
 /******************************************************************************/
 
-var resourcesSelfieVersion = 2;
+var resourcesSelfieVersion = 3;
 
 RedirectEngine.prototype.selfieFromResources = function() {
     vAPI.cacheStorage.set({
diff --git a/tools/import-war.py b/tools/import-war.py
index 6c296f3ab..70f36570f 100755
--- a/tools/import-war.py
+++ b/tools/import-war.py
@@ -20,6 +20,9 @@ with open('./src/web_accessible_resources/to-import.txt', 'r') as f:
         if len(line) != 0 and line[0] != '#':
             to_import.add(line)
 
+# https://github.com/gorhill/uBlock/issues/3636
+safe_exts = { 'javascript': 'js' }
+
 imported = []
 
 # scan the file until a resource to import is found
@@ -40,7 +43,10 @@ def safe_filename_from_token(token, mime):
     # extract file extension from mime
     match = re.search('^[^/]+/([^\s;]+)', mime)
     if match:
-        name += '.' + match.group(1)
+        ext = match.group(1)
+        if ext in safe_exts:
+            ext = safe_exts[ext]
+        name += '.' + ext
     return name
 
 def import_resource(f, token, mime):