Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Also read proxyFactories of main NAM
  • Loading branch information
manisandro committed Jul 9, 2021
1 parent f083876 commit 523135e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
8 changes: 7 additions & 1 deletion src/core/network/qgsnetworkaccessmanager.cpp
Expand Up @@ -67,7 +67,13 @@ class QgsNetworkProxyFactory : public QNetworkProxyFactory
QgsNetworkAccessManager *nam = QgsNetworkAccessManager::instance();

// iterate proxies factories and take first non empty list
const auto constProxyFactories = nam->proxyFactories();
QList<QNetworkProxyFactory *> proxyFactories = QgsNetworkAccessManager::sMainNAM->proxyFactories();
if ( nam != QgsNetworkAccessManager::sMainNAM )
{
proxyFactories.append( nam->proxyFactories() );
}
const auto constProxyFactories = proxyFactories;

for ( QNetworkProxyFactory *f : constProxyFactories )
{
QList<QNetworkProxy> systemproxies = f->systemProxyForQuery( query );
Expand Down
2 changes: 2 additions & 0 deletions src/core/network/qgsnetworkaccessmanager.h
Expand Up @@ -795,6 +795,8 @@ class CORE_EXPORT QgsNetworkAccessManager : public QNetworkAccessManager
QNetworkReply *createRequest( QNetworkAccessManager::Operation op, const QNetworkRequest &req, QIODevice *outgoingData = nullptr ) override;

private:
friend class QgsNetworkProxyFactory;

#ifndef QT_NO_SSL
void unlockAfterSslErrorHandled();
void afterSslErrorHandled( QNetworkReply *reply );
Expand Down

0 comments on commit 523135e

Please sign in to comment.