Fix handleSSlError ignore saved errors

troopa81 · nyalldawson · commit e99caaccd2cc · 2021-08-04T13:43:36.000+10:00
diff --git a/src/app/qgsappsslerrorhandler.cpp b/src/app/qgsappsslerrorhandler.cpp
@@ -41,7 +41,6 @@ void QgsAppSslErrorHandler::handleSslErrors( QNetworkReply *reply, const QList<Q
     QgsDebugMsg( QStringLiteral( "Ignored SSL errors cached item found, ignoring errors if they match for %1" ).arg( hostport ) );
     const QSet<QSslError::SslError> &errenums( errscache.value( dgsthostport ) );
     bool ignore = !errenums.isEmpty();
-    int errmatched = 0;
     if ( ignore )
     {
       for ( const QSslError &error : errors )
@@ -51,11 +50,10 @@ void QgsAppSslErrorHandler::handleSslErrors( QNetworkReply *reply, const QList<Q
 
         bool errmatch = errenums.contains( error.error() );
         ignore = ignore && errmatch;
-        errmatched += errmatch ? 1 : 0;
       }
     }
 
-    if ( ignore && errenums.size() == errmatched )
+    if ( ignore )
     {
       QgsDebugMsg( QStringLiteral( "Errors matched cached item's, ignoring all for %1" ).arg( hostport ) );
       reply->ignoreSslErrors();

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@ void QgsAppSslErrorHandler::handleSslErrors( QNetworkReply *reply, const QList<Q`
`41`	`41`	`QgsDebugMsg( QStringLiteral( "Ignored SSL errors cached item found, ignoring errors if they match for %1" ).arg( hostport ) );`
`42`	`42`	`const QSet<QSslError::SslError> &errenums( errscache.value( dgsthostport ) );`
`43`	`43`	`bool ignore = !errenums.isEmpty();`
`44`		`- int errmatched = 0;`
`45`	`44`	`if ( ignore )`
`46`	`45`	`{`
`47`	`46`	`for ( const QSslError &error : errors )`
`@@ -51,11 +50,10 @@ void QgsAppSslErrorHandler::handleSslErrors( QNetworkReply *reply, const QList<Q`
`51`	`50`
`52`	`51`	`bool errmatch = errenums.contains( error.error() );`
`53`	`52`	`ignore = ignore && errmatch;`
`54`		`- errmatched += errmatch ? 1 : 0;`
`55`	`53`	`}`
`56`	`54`	`}`
`57`	`55`
`58`		`- if ( ignore && errenums.size() == errmatched )`
	`56`	`+ if ( ignore )`
`59`	`57`	`{`
`60`	`58`	`QgsDebugMsg( QStringLiteral( "Errors matched cached item's, ignoring all for %1" ).arg( hostport ) );`
`61`	`59`	`reply->ignoreSslErrors();`