Skip to content
Permalink
Browse files

Merge pull request #2943 from rouault/fix_networkTimeout

Use consistant default value of 60000ms for /qgis/networkAndProxy/networkTimeout
  • Loading branch information
jef-n committed Mar 24, 2016
2 parents 140b517 + f387291 commit 38941596c41c111d82023ac58ded38409a858a86
Showing with 4 additions and 4 deletions.
  1. +1 −1 src/app/qgisapp.cpp
  2. +2 −2 src/core/qgshttptransaction.cpp
  3. +1 −1 src/core/qgsnetworkaccessmanager.cpp
@@ -11089,7 +11089,7 @@ void QgisApp::namSslErrors( QNetworkReply *reply, const QList<QSslError> &errors
{
QgsDebugMsg( "Restarting network reply timeout" );
timer->setSingleShot( true );
timer->start( s.value( "/qgis/networkAndProxy/networkTimeout", "20000" ).toInt() );
timer->start( s.value( "/qgis/networkAndProxy/networkTimeout", "60000" ).toInt() );
}
}
}
@@ -58,7 +58,7 @@ QgsHttpTransaction::QgsHttpTransaction( const QString& uri,
Q_UNUSED( userName );
Q_UNUSED( password );
QSettings s;
mNetworkTimeoutMsec = s.value( "/qgis/networkAndProxy/networkTimeout", "20000" ).toInt();
mNetworkTimeoutMsec = s.value( "/qgis/networkAndProxy/networkTimeout", "60000" ).toInt();
}

QgsHttpTransaction::QgsHttpTransaction()
@@ -69,7 +69,7 @@ QgsHttpTransaction::QgsHttpTransaction()
, mWatchdogTimer( nullptr )
{
QSettings s;
mNetworkTimeoutMsec = s.value( "/qgis/networkAndProxy/networkTimeout", "20000" ).toInt();
mNetworkTimeoutMsec = s.value( "/qgis/networkAndProxy/networkTimeout", "60000" ).toInt();
}

QgsHttpTransaction::~QgsHttpTransaction()
@@ -217,7 +217,7 @@ QNetworkReply *QgsNetworkAccessManager::createRequest( QNetworkAccessManager::Op
timer->setObjectName( "timeoutTimer" );
connect( timer, SIGNAL( timeout() ), this, SLOT( abortRequest() ) );
timer->setSingleShot( true );
timer->start( s.value( "/qgis/networkAndProxy/networkTimeout", "20000" ).toInt() );
timer->start( s.value( "/qgis/networkAndProxy/networkTimeout", "60000" ).toInt() );

connect( reply, SIGNAL( downloadProgress( qint64, qint64 ) ), timer, SLOT( start() ) );
connect( reply, SIGNAL( uploadProgress( qint64, qint64 ) ), timer, SLOT( start() ) );

0 comments on commit 3894159

Please sign in to comment.
You can’t perform that action at this time.