fix:iframe add extra extension to passthrough when enabled ad block.

xiaoyifang · May 17, 2022 · 949f463 · 949f463
1 parent bb3924e
commit 949f463
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/iframeschemehandler.cpp b/iframeschemehandler.cpp
@@ -88,7 +88,12 @@ void IframeSchemeHandler::requestStarted(QWebEngineUrlRequestJob *requestJob)
     QBuffer * buffer = new QBuffer(requestJob);
     buffer->setData(codec->fromUnicode(articleString));
 
-    requestJob->reply( "text/html;charset=UTF-8", buffer );
+    QByteArray contentType="text/html;charset=UTF-8";
+    auto contentTypeHeader=reply->header(QNetworkRequest::ContentTypeHeader);
+    if(contentTypeHeader.isValid())
+      contentType= contentTypeHeader.toByteArray();
+
+    requestJob->reply(contentType , buffer );
   };
   connect( reply, &QNetworkReply::finished, requestJob, finishAction );
 

diff --git a/utils.hh b/utils.hh
@@ -57,7 +57,7 @@ inline bool isExternalLink(QUrl const &url) {
 inline bool isCssFontImage(QUrl const &url) {
   auto fileName = url.fileName();
   auto ext=fileName.mid(fileName.lastIndexOf("."));
-  QStringList extensions{".css",".woff",".woff2",".bmp" ,".jpg", ".png", ".tif",".wav", ".ogg", ".oga", ".mp3", ".mp4", ".aac", ".flac",".mid", ".wv ",".ape"} ;
+  QStringList extensions{".css",".woff",".woff2","ttf",".bmp" ,".jpg", ".png", ".tif",".wav", ".ogg", ".oga", ".mp3", ".mp4", ".aac", ".flac",".mid", ".wv ",".ape"} ;
   return extensions.indexOf(ext)>-1;
 }