filippodb
/
LocalCDN-Firefox-Chrome-Brave
mirror of https://codeberg.org/nobody/LocalCDN.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improved charset detection in HTML source code

This commit is contained in:
nobody 2020-05-25 06:19:17 +02:00
parent c1adace8c3
commit 91527a186c
No known key found for this signature in database
GPG Key ID: 8F6DE3D614FCFD7A
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/manipulate-dom.js
View File

@ -64,10 +64,7 @@ manipulateDOM._removeCrossOriginAndIntegrityAttr = function (details) {
if (!charset) { if (!charset) {
//content-type has no charset declared //content-type has no charset declared
let htmlHead = asciiDecoder.decode(evt.data, {stream: false}); let htmlHead = asciiDecoder.decode(evt.data, {stream: false});
let charsetMatch = htmlHead.match(/<meta\s+charset=["']?([^>"'\/]+)["'>\/]/i); let charsetMatch = htmlHead.match(/<meta.*charset=["']?([^>"'\/]+)["'].*[>\/]/i);
if (!charsetMatch) {
charsetMatch = htmlHead.match(/<meta\s+http-equiv=["']?content-type["']?\s+content=["']?text\/html;\s*charset=([^>"'\/]+)["'>\/]/i);
}
charset = charsetMatch ? charsetMatch[1] : "UTF-8"; charset = charsetMatch ? charsetMatch[1] : "UTF-8";
} }
decoder = new TextDecoder(charset); decoder = new TextDecoder(charset);

2
pages/updates/updates.html
View File

@ -23,7 +23,7 @@
New in LocalCDN: New in LocalCDN:
</div> </div>
<ul> <ul>
<li></li> <li>Improved charset detection in HTML source code</li>
</ul> </ul>
<div class="topic-label"> <div class="topic-label">
Please update your uBlock/uMatrix rules Please update your uBlock/uMatrix rules