[WFS / OAPIF] Emit request headers of initial request when following …

…a redirect
qgis · May 10, 2023 · a8b34a5 · a8b34a5
1 parent e40e85e
commit a8b34a5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/providers/wfs/qgsbasenetworkrequest.cpp b/src/providers/wfs/qgsbasenetworkrequest.cpp
@@ -179,11 +179,15 @@ bool QgsBaseNetworkRequest::sendGET( const QUrl &url, const QString &acceptHeade
   QgsDebugMsgLevel( QStringLiteral( "Calling: %1" ).arg( modifiedUrl.toDisplayString( QUrl::EncodeSpaces ) ), 4 );
 
   QNetworkRequest request( modifiedUrl );
+
   if ( !acceptHeader.isEmpty() )
   {
-    request.setRawHeader( "Accept", acceptHeader.toUtf8() );
+    mRequestHeaders << QNetworkReply::RawHeaderPair( "Accept", acceptHeader.toUtf8() );
   }
 
+  for ( const QNetworkReply::RawHeaderPair &headerPair : std::as_const( mRequestHeaders ) )
+    request.setRawHeader( headerPair.first, headerPair.second );
+
   QgsSetRequestInitiatorClass( request, QStringLiteral( "QgsBaseNetworkRequest" ) );
   if ( !mAuth.setAuthorization( request ) )
   {
@@ -449,6 +453,9 @@ void QgsBaseNetworkRequest::replyFinished()
           request.setAttribute( QNetworkRequest::CacheLoadControlAttribute, mForceRefresh ? QNetworkRequest::AlwaysNetwork : QNetworkRequest::PreferCache );
           request.setAttribute( QNetworkRequest::CacheSaveControlAttribute, true );
 
+          for ( const QNetworkReply::RawHeaderPair &headerPair : std::as_const( mRequestHeaders ) )
+            request.setRawHeader( headerPair.first, headerPair.second );
+
           mReply->deleteLater();
           mReply = nullptr;
 

diff --git a/src/providers/wfs/qgsbasenetworkrequest.h b/src/providers/wfs/qgsbasenetworkrequest.h
@@ -122,6 +122,10 @@ class QgsBaseNetworkRequest : public QObject
     virtual int defaultExpirationInSec() { return 0; }
 
   private:
+
+    //! Request headers
+    QList<QNetworkReply::RawHeaderPair> mRequestHeaders;
+
     QString errorMessageFailedAuth();
 
     void logMessageIfEnabled();