Use consistant default value of 60000ms for /qgis/networkAndProxy/networkTimeout

rouault · jef-n · commit 2f7d4a788cdf · 2016-03-24T18:35:27.000+01:00
Currently there's an inconsistancy between the Options dialog that displays a default value of 60000ms for network request timeouts, whereas places in the code use 20000ms. I propose to align on 60000s, since there are occurrences of network requests, for example big WFS GetFeature requests, that can take more than 20s to start. (cherry picked from commit f387291) (testqgswcspublicservers.cpp update added)
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -11068,7 +11068,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() );
     }
   }
 }
diff --git a/src/core/qgshttptransaction.cpp b/src/core/qgshttptransaction.cpp
@@ -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()
diff --git a/src/core/qgsnetworkaccessmanager.cpp b/src/core/qgsnetworkaccessmanager.cpp
@@ -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() ) );
diff --git a/tests/src/providers/testqgswcspublicservers.cpp b/tests/src/providers/testqgswcspublicservers.cpp
@@ -78,7 +78,7 @@ void TestQgsWcsPublicServers::init()
   // Unfortunately this seems to be the only way to set timeout, we try to reset it
   // at the end but it can be canceled before ...
   QSettings settings;
-  mOrigTimeout = settings.value( "/qgis/networkAndProxy/networkTimeout", "20000" ).toInt();
+  mOrigTimeout = settings.value( "/qgis/networkAndProxy/networkTimeout", "60000" ).toInt();
   settings.setValue( "/qgis/networkAndProxy/networkTimeout", mTimeout );
 
   //mCacheDir = QDir( "./wcstestcache" );

Original file line number	Diff line number	Diff line change
`@@ -11068,7 +11068,7 @@ void QgisApp::namSslErrors( QNetworkReply *reply, const QList<QSslError> &errors`
`11068`	`11068`	`{`
`11069`	`11069`	`QgsDebugMsg( "Restarting network reply timeout" );`
`11070`	`11070`	`timer->setSingleShot( true );`
`11071`		`- timer->start( s.value( "/qgis/networkAndProxy/networkTimeout", "20000" ).toInt() );`
	`11071`	`+ timer->start( s.value( "/qgis/networkAndProxy/networkTimeout", "60000" ).toInt() );`
`11072`	`11072`	`}`
`11073`	`11073`	`}`
`11074`	`11074`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ QgsHttpTransaction::QgsHttpTransaction( const QString& uri,`
`58`	`58`	`Q_UNUSED( userName );`
`59`	`59`	`Q_UNUSED( password );`
`60`	`60`	`QSettings s;`
`61`		`- mNetworkTimeoutMsec = s.value( "/qgis/networkAndProxy/networkTimeout", "20000" ).toInt();`
	`61`	`+ mNetworkTimeoutMsec = s.value( "/qgis/networkAndProxy/networkTimeout", "60000" ).toInt();`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`QgsHttpTransaction::QgsHttpTransaction()`
`@@ -69,7 +69,7 @@ QgsHttpTransaction::QgsHttpTransaction()`
`69`	`69`	`, mWatchdogTimer( nullptr )`
`70`	`70`	`{`
`71`	`71`	`QSettings s;`
`72`		`- mNetworkTimeoutMsec = s.value( "/qgis/networkAndProxy/networkTimeout", "20000" ).toInt();`
	`72`	`+ mNetworkTimeoutMsec = s.value( "/qgis/networkAndProxy/networkTimeout", "60000" ).toInt();`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`QgsHttpTransaction::~QgsHttpTransaction()`