[ogr provider] disable connection timeouts

qgis · Aug 15, 2018 · be04eeb · be04eeb
1 parent 270ac21
commit be04eeb
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/providers/ogr/qgsogrfeatureiterator.cpp b/src/providers/ogr/qgsogrfeatureiterator.cpp
@@ -43,8 +43,11 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource *source, bool
   , mFilterFids( mRequest.filterFids() )
   , mFilterFidsIt( mFilterFids.constBegin() )
 {
+  // Since connection timeout for OGR connections is problematic and can lead to crashes, disable for now.
+  mRequest.setConnectionTimeout( -1 );
+
   //QgsDebugMsg( "Feature iterator of " + mSource->mLayerName + ": acquiring connection");
-  mConn = QgsOgrConnPool::instance()->acquireConnection( QgsOgrProviderUtils::connectionPoolId( mSource->mDataSource ), request.connectionTimeout(), request.requestMayBeNested() );
+  mConn = QgsOgrConnPool::instance()->acquireConnection( QgsOgrProviderUtils::connectionPoolId( mSource->mDataSource ), mRequest.connectionTimeout(), mRequest.requestMayBeNested() );
   if ( !mConn->ds )
   {
     return;