Skip to content

Commit

Permalink
[WFS client] Revert read buffer size limitation (fixes #29258, fixes #…
Browse files Browse the repository at this point in the history
…27626)

This apparently caused deadlock issues.

Credit to @nyalldawson for spotting the offending commit.

Partial revert of 0addae5
  • Loading branch information
rouault authored and nyalldawson committed May 30, 2019
1 parent d61bc83 commit 6abc15d
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions src/providers/wfs/qgswfsrequest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
#include <QFuture>
#include <QtConcurrent>

const qint64 READ_BUFFER_SIZE_HINT = 1024 * 1024;

QgsWfsRequest::QgsWfsRequest( const QgsWFSDataSourceURI &uri )
: mUri( uri )
, mErrorCode( QgsWfsRequest::NoError )
Expand Down Expand Up @@ -143,7 +141,6 @@ bool QgsWfsRequest::sendGET( const QUrl &url, bool synchronous, bool forceRefres
success = true;
mReply = QgsNetworkAccessManager::instance()->get( request );

mReply->setReadBufferSize( READ_BUFFER_SIZE_HINT );
if ( !mUri.auth().setAuthorizationReply( mReply ) )
{
mErrorCode = QgsWfsRequest::NetworkError;
Expand Down Expand Up @@ -264,7 +261,6 @@ bool QgsWfsRequest::sendPOST( const QUrl &url, const QString &contentTypeHeader,
request.setHeader( QNetworkRequest::ContentTypeHeader, contentTypeHeader );

mReply = QgsNetworkAccessManager::instance()->post( request, data );
mReply->setReadBufferSize( READ_BUFFER_SIZE_HINT );
if ( !mUri.auth().setAuthorizationReply( mReply ) )
{
mErrorCode = QgsWfsRequest::NetworkError;
Expand Down Expand Up @@ -356,7 +352,6 @@ void QgsWfsRequest::replyFinished()

QgsDebugMsgLevel( QStringLiteral( "redirected: %1 forceRefresh=%2" ).arg( redirect.toString() ).arg( mForceRefresh ), 4 );
mReply = QgsNetworkAccessManager::instance()->get( request );
mReply->setReadBufferSize( READ_BUFFER_SIZE_HINT );
if ( !mUri.auth().setAuthorizationReply( mReply ) )
{
mResponse.clear();
Expand Down

0 comments on commit 6abc15d

Please sign in to comment.