From c07db7553d4990bf3e9a8b00aef4ba557a23af18 Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Mon, 28 Oct 2024 14:13:50 -0400
Subject: [PATCH] Fix `urlskip=` with `-blocked` directive for blocked requests

Related feedback:
https://github.com/uBlockOrigin/uBlock-issues/issues/3206#issuecomment-2441470631
---
 src/js/pagestore.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/js/pagestore.js b/src/js/pagestore.js
index 4b19f3975..44a5674cb 100644
--- a/src/js/pagestore.js
+++ b/src/js/pagestore.js
@@ -925,8 +925,11 @@ const PageStore = class {
     }
 
     redirectBlockedRequest(fctxt) {
-        const directives = staticNetFilteringEngine.redirectRequest(redirectEngine, fctxt);
-        if ( directives === undefined ) { return; }
+        const directives = staticNetFilteringEngine.redirectRequest(redirectEngine, fctxt) || [];
+        if ( this.urlSkippableResources.has(fctxt.itype) ) {
+            staticNetFilteringEngine.urlSkip(fctxt, true, directives);
+        }
+        if ( directives.length === 0 ) { return; }
         if ( logger.enabled !== true ) { return; }
         fctxt.pushFilters(directives.map(a => a.logData()));
         if ( fctxt.redirectURL === undefined ) { return; }
@@ -1152,6 +1155,7 @@ const PageStore = class {
         µb.FilteringContext.MAIN_FRAME,
         µb.FilteringContext.MEDIA,
         µb.FilteringContext.OBJECT,
+        µb.FilteringContext.OTHER,
         µb.FilteringContext.SUB_FRAME,
     ]);