소스 검색

Remove query string from failed url, before handling error

Currently wkhtmltox don't ignore media errors for URL with a query string whereas
load-media-error-handling takes 'ignore' value. This is due to QFileInfo::completeSuffix()
returning extension as well as qs.

This little fix circumvents this issue by removing everything using regexp: '\?.*$'.
Albin Kerouanton 8 년 전
부모
커밋
333521a51b
1개의 변경된 파일2개의 추가작업 그리고 1개의 파일을 삭제
  1. 2 1
      src/lib/multipageloader.cc

+ 2 - 1
src/lib/multipageloader.cc

@@ -397,7 +397,8 @@ void ResourceObject::amfinished(QNetworkReply * reply) {
 	if ((networkStatus != 0 && networkStatus != 5) || (httpStatus > 399 && httpErrorCode == 0))
 	{
 		QFileInfo fi(reply->url().toString());
-		bool mediaFile = settings::LoadPage::mediaFilesExtensions.contains(fi.completeSuffix().toLower());
+		QString extension = fi.completeSuffix().toLower().remove(QRegExp("\\?.*$"));
+		bool mediaFile = settings::LoadPage::mediaFilesExtensions.contains(extension);
 		if ( ! mediaFile) {
 			// XXX: Notify network errors as higher priority than HTTP errors.
 			//      QT's QNetworkReply::NetworkError enum uses values overlapping