Allow remote SVG files with text/plain MIME type, instead of only

nyalldawson · nyalldawson · commit 7af4997c9043 · 2018-04-02T13:01:12.000+10:00
valid image/svg+xml mime types This allows users to link to SVG files hosted on github, where the raw content is served up as plain text. (cherry-picked from d3aae3f)
diff --git a/src/core/symbology/qgssvgcache.cpp b/src/core/symbology/qgssvgcache.cpp
@@ -461,10 +461,13 @@ QByteArray QgsSvgCache::getImageData( const QString &path ) const
     return mMissingSvg;
   }
 
+  // we accept both real SVG mime types AND plain text types - because some sites
+  // (notably github) serve up svgs as raw text
   QString contentType = reply->header( QNetworkRequest::ContentTypeHeader ).toString();
-  QgsDebugMsg( "contentType: " + contentType );
-  if ( !contentType.startsWith( QLatin1String( "image/svg+xml" ), Qt::CaseInsensitive ) )
+  if ( !contentType.startsWith( QLatin1String( "image/svg+xml" ), Qt::CaseInsensitive )
+       && !contentType.startsWith( QLatin1String( "text/plain" ), Qt::CaseInsensitive ) )
   {
+    QgsMessageLog::logMessage( tr( "Unexpected MIME type %1 received for %2" ).arg( contentType, path ), tr( "SVG" ) );
     reply->deleteLater();
     return mMissingSvg;
   }

Original file line number	Diff line number	Diff line change
`@@ -461,10 +461,13 @@ QByteArray QgsSvgCache::getImageData( const QString &path ) const`
`461`	`461`	`return mMissingSvg;`
`462`	`462`	`}`
`463`	`463`
	`464`	`+ // we accept both real SVG mime types AND plain text types - because some sites`
	`465`	`+ // (notably github) serve up svgs as raw text`
`464`	`466`	`QString contentType = reply->header( QNetworkRequest::ContentTypeHeader ).toString();`
`465`		`- QgsDebugMsg( "contentType: " + contentType );`
`466`		`- if ( !contentType.startsWith( QLatin1String( "image/svg+xml" ), Qt::CaseInsensitive ) )`
	`467`	`+ if ( !contentType.startsWith( QLatin1String( "image/svg+xml" ), Qt::CaseInsensitive )`
	`468`	`+ && !contentType.startsWith( QLatin1String( "text/plain" ), Qt::CaseInsensitive ) )`
`467`	`469`	`{`
	`470`	`+ QgsMessageLog::logMessage( tr( "Unexpected MIME type %1 received for %2" ).arg( contentType, path ), tr( "SVG" ) );`
`468`	`471`	`reply->deleteLater();`
`469`	`472`	`return mMissingSvg;`
`470`	`473`	`}`