[Pkg-mozext-commits] [adblock-plus] 33/98: Issue 4449 - Use 'websocket' type for WebSocket connections

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository adblock-plus.

commit 8a901831ae515c39084d8eafc2bd8144aeaebc34
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Tue Sep 20 13:29:01 2016 +0200

    Issue 4449 - Use 'websocket' type for WebSocket connections
---
 chrome/locale/en-US/global.properties | 1 +
 dependencies                          | 2 +-
 lib/contentPolicy.js                  | 5 +++--
 metadata.gecko                        | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/chrome/locale/en-US/global.properties b/chrome/locale/en-US/global.properties
index d63e7d2..4130d1b 100644
--- a/chrome/locale/en-US/global.properties
+++ b/chrome/locale/en-US/global.properties
@@ -53,6 +53,7 @@ type_label_object_subrequest=object subrequest
 type_label_media=audio/video
 type_label_font=font
 type_label_ping=ping
+type_label_websocket=websocket
 
 mobile_menu_enable=ABP: Enable
 # Note: the placeholder ?1? will be replaced by the site name. Ideally it should be at the end of the string (space is limited and site names can be long).
diff --git a/dependencies b/dependencies
index 81a3889..adfd338 100644
--- a/dependencies
+++ b/dependencies
@@ -1,5 +1,5 @@
 _root = hg:https://hg.adblockplus.org/ git:https://github.com/adblockplus/
 _self = buildtools/ensure_dependencies.py
 buildtools = buildtools hg:822863fb5df6 git:a0cd489
-adblockpluscore = adblockpluscore hg:f08c7cc52b2d git:74d6248
+adblockpluscore = adblockpluscore hg:d0d7a9d27bf7 git:b2333b7
 adblockplusui = adblockplusui hg:feea7a2cc0f5 git:c1e08b3
diff --git a/lib/contentPolicy.js b/lib/contentPolicy.js
index 55e7cc8..4318b00 100644
--- a/lib/contentPolicy.js
+++ b/lib/contentPolicy.js
@@ -60,7 +60,8 @@ var Policy = exports.Policy =
     for (let contentType of ["OTHER", "SCRIPT", "IMAGE", "STYLESHEET", "OBJECT",
                              "SUBDOCUMENT", "DOCUMENT", "XMLHTTPREQUEST",
                              "OBJECT_SUBREQUEST", "FONT", "MEDIA", "PING",
-                             "ELEMHIDE", "POPUP", "GENERICHIDE", "GENERICBLOCK"])
+                             "WEBSOCKET", "ELEMHIDE", "POPUP", "GENERICHIDE",
+                             "GENERICBLOCK"])
       yield [contentType, contentType];
   }()),
 
@@ -70,7 +71,7 @@ var Policy = exports.Policy =
    */
   nonVisualTypes: new Set([
     "SCRIPT", "STYLESHEET", "XMLHTTPREQUEST", "OBJECT_SUBREQUEST", "FONT",
-    "PING", "ELEMHIDE", "POPUP", "GENERICHIDE", "GENERICBLOCK"
+    "PING", "WEBSOCKET", "ELEMHIDE", "POPUP", "GENERICHIDE", "GENERICBLOCK"
   ]),
 
   /**
diff --git a/metadata.gecko b/metadata.gecko
index adba468..f2ef872 100644
--- a/metadata.gecko
+++ b/metadata.gecko
@@ -68,6 +68,7 @@ lib/ext_background.js = ext/background.js
 lib/ext_common.js = ext/common.js
 lib/messageResponder.js = adblockplusui/messageResponder.js
 lib/antiadblockInit.js = adblockpluscore/lib/antiadblockInit.js
+lib/coreUtils.js = adblockpluscore/lib/coreUtils.js
 lib/cssRules.js = adblockpluscore/lib/cssRules.js
 lib/downloader.js = adblockpluscore/lib/downloader.js
 lib/elemHide.js = adblockpluscore/lib/elemHide.js

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git