[bugfix] Do not cache invalid WM(T)S responses

elpaso · elpaso · commit b09fb37d0d9d · 2017-10-04T16:05:47.000+02:00
The problem here was that in case of http->https redirect from a misconfigured server (that advertizes http and then redirects all request to https) all http redirect requests were cached, making all subsequent requests to the same url hit the 301 Moved Permanently reponse page intead of the redirected content. Fixes #16427 WMTS rendering problems in 2.18 and Master cherry-picked from d102404
diff --git a/src/providers/wms/qgstilecache.cpp b/src/providers/wms/qgstilecache.cpp
@@ -33,10 +33,11 @@ void QgsTileCache::insertTile( const QUrl& url, const QImage& image )
 bool QgsTileCache::tile( const QUrl& url, QImage& image )
 {
   QMutexLocker locker( &sTileCacheMutex );
-  if ( QImage* i = sTileCache.object( url ) )
+  bool success = false;
+  if ( QImage *i = sTileCache.object( url ) )
   {
     image = *i;
-    return true;
+    success = true;
   }
   else if ( QgsNetworkAccessManager::instance()->cache()->metaData( url ).isValid() )
   {
@@ -48,10 +49,13 @@ bool QgsTileCache::tile( const QUrl& url, QImage& image )
       image = QImage::fromData( imageData );
 
       // cache it as well (mutex is already locked)
-      sTileCache.insert( url, new QImage( image ) );
-
-      return true;
+      // Check for null because it could be a redirect (see: https://issues.qgis.org/issues/16427 )
+      if ( ! image.isNull( ) )
+      {
+        sTileCache.insert( url, new QImage( image ) );
+        success = true;
+      }
     }
   }
-  return false;
+  return success;
 }

Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,11 @@ void QgsTileCache::insertTile( const QUrl& url, const QImage& image )`
`33`	`33`	`bool QgsTileCache::tile( const QUrl& url, QImage& image )`
`34`	`34`	`{`
`35`	`35`	`QMutexLocker locker( &sTileCacheMutex );`
`36`		`- if ( QImage* i = sTileCache.object( url ) )`
	`36`	`+ bool success = false;`
	`37`	`+ if ( QImage *i = sTileCache.object( url ) )`
`37`	`38`	`{`
`38`	`39`	`image = *i;`
`39`		`- return true;`
	`40`	`+ success = true;`
`40`	`41`	`}`
`41`	`42`	`else if ( QgsNetworkAccessManager::instance()->cache()->metaData( url ).isValid() )`
`42`	`43`	`{`
`@@ -48,10 +49,13 @@ bool QgsTileCache::tile( const QUrl& url, QImage& image )`
`48`	`49`	`image = QImage::fromData( imageData );`
`49`	`50`
`50`	`51`	`// cache it as well (mutex is already locked)`
`51`		`- sTileCache.insert( url, new QImage( image ) );`
`52`		`-`
`53`		`- return true;`
	`52`	`+ // Check for null because it could be a redirect (see: https://issues.qgis.org/issues/16427 )`
	`53`	`+ if ( ! image.isNull( ) )`
	`54`	`+ {`
	`55`	`+ sTileCache.insert( url, new QImage( image ) );`
	`56`	`+ success = true;`
	`57`	`+ }`
`54`	`58`	`}`
`55`	`59`	`}`
`56`		`- return false;`
	`60`	`+ return success;`
`57`	`61`	`}`