From 2360bc02f301f572852b1609a97dedaf4b55929f Mon Sep 17 00:00:00 2001 From: Raymond Hill Date: Mon, 6 Nov 2023 19:45:16 -0500 Subject: [PATCH] Lower maximum `Expires` value to 4h Related issue: https://github.com/uBlockOrigin/uBlock-issues/issues/2899 --- src/js/assets.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/js/assets.js b/src/js/assets.js index 1a74613691542..29abfa54cae6b 100644 --- a/src/js/assets.js +++ b/src/js/assets.js @@ -55,7 +55,7 @@ const parseExpires = s => { if ( matches === null ) { return 0; } let updateAfter = parseInt(matches[1], 10); if ( matches[2] === 'h' ) { - updateAfter = Math.ceil(updateAfter / 6) / 4; + updateAfter = Math.max(updateAfter, 4) / 24; } return updateAfter; }; @@ -81,10 +81,10 @@ const extractMetadataFromList = (content, fields) => { out.lastModified = (new Date(out.lastModified)).getTime() || 0; } if ( out.expires ) { - out.expires = Math.max(parseExpires(out.expires), 0.5); + out.expires = parseExpires(out.expires); } if ( out.diffExpires ) { - out.diffExpires = Math.max(parseExpires(out.diffExpires), 0.25); + out.diffExpires = parseExpires(out.diffExpires); } return out; };