Skip to content

Commit 2025236

Browse files
author
jef
committedFeb 17, 2011
record which SSL errors are ok to ignore
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15182 c8812cc2-4d05-0410-92ff-de0c093fc19c

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed
 

‎src/app/qgisapp.cpp

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7218,23 +7218,29 @@ void QgisApp::namSslErrors( QNetworkReply *reply, const QList<QSslError> &errors
72187218
{
72197219
QString msg = tr( "SSL errors occured accessing URL %1:" ).arg( reply->request().url().toString() );
72207220
bool otherError = false;
7221+
static QSet<QSslError::SslError> ignoreErrors;
72217222

72227223
foreach( QSslError error, errors )
72237224
{
7224-
if ( error.error() != QSslError::SelfSignedCertificate &&
7225-
error.error() != QSslError::HostNameMismatch )
7226-
otherError = true;
7225+
QgsDebugMsg( QString( "SSL error %1: %2" ).arg( error.error() ).arg( error.errorString() ) );
7226+
7227+
otherError = otherError || !ignoreErrors.contains( error.error() );
7228+
72277229
msg += "\n" + error.errorString();
72287230
}
72297231

7230-
msg += tr( "\n\nIgnore errors?" );
7232+
msg += tr( "\n\nAlways ignore these errors?" );
72317233

72327234
if ( !otherError ||
72337235
QMessageBox::warning( this,
7234-
tr( "SSL errors occured" ),
7236+
tr( "%n SSL errors occured", "number of errors", errors.size() ),
72357237
msg,
72367238
QMessageBox::Ok | QMessageBox::Cancel ) == QMessageBox::Ok )
72377239
{
7240+
foreach( QSslError error, errors )
7241+
{
7242+
ignoreErrors << error.error();
7243+
}
72387244
reply->ignoreSslErrors();
72397245
}
72407246
}

0 commit comments

Comments
 (0)
Please sign in to comment.