Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix saving/restoring proxy excluded URLs (fix #20933)
  • Loading branch information
alexbruy authored and nyalldawson committed Jan 27, 2019
1 parent 3c2a20a commit fc9796f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
10 changes: 3 additions & 7 deletions src/app/qgsoptions.cpp
Expand Up @@ -1385,16 +1385,12 @@ void QgsOptions::saveOptions()
mSettings->setValue( QStringLiteral( "cache/size" ), QVariant::fromValue( mCacheSize->value() * 1024L ) );

//url to exclude from proxys
QString proxyExcludeString;
QStringList excludedUrls;
for ( int i = 0; i < mExcludeUrlListWidget->count(); ++i )
{
if ( i != 0 )
{
proxyExcludeString += '|';
}
proxyExcludeString += mExcludeUrlListWidget->item( i )->text();
excludedUrls << mExcludeUrlListWidget->item( i )->text();
}
mSettings->setValue( QStringLiteral( "proxy/proxyExcludedUrls" ), proxyExcludeString );
mSettings->setValue( QStringLiteral( "proxy/proxyExcludedUrls" ), excludedUrls );

QgisApp::instance()->namUpdate();

Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsnetworkaccessmanager.cpp
Expand Up @@ -362,7 +362,7 @@ void QgsNetworkAccessManager::setupDefaultProxyAndCache( Qt::ConnectionType conn
bool proxyEnabled = settings.value( QStringLiteral( "proxy/proxyEnabled" ), false ).toBool();
if ( proxyEnabled )
{
excludes = settings.value( QStringLiteral( "proxy/proxyExcludedUrls" ), "" ).toString().split( '|', QString::SkipEmptyParts );
excludes = settings.value( QStringLiteral( "proxy/proxyExcludedUrls" ), "" ).toStringList();

//read type, host, port, user, passw from settings
QString proxyHost = settings.value( QStringLiteral( "proxy/proxyHost" ), "" ).toString();
Expand Down
2 changes: 1 addition & 1 deletion src/providers/ogr/qgsogrprovider.cpp
Expand Up @@ -2431,7 +2431,7 @@ void QgsOgrProvider::setupProxy()
QNetworkProxy proxy( proxyes.first() );
// TODO/FIXME: check excludes (the GDAL config options are global, we need a per-connection config option)
//QStringList excludes;
//excludes = settings.value( QStringLiteral( "proxy/proxyExcludedUrls" ), "" ).toString().split( '|', QString::SkipEmptyParts );
//excludes = settings.value( QStringLiteral( "proxy/proxyExcludedUrls" ), "" ).toStringList();

QString proxyHost( proxy.hostName() );
qint16 proxyPort( proxy.port() );
Expand Down

0 comments on commit fc9796f

Please sign in to comment.