fix http headers in OWS + fix test

qgis · Jan 16, 2023 · a88ec8b · a88ec8b
1 parent 1029bce
commit a88ec8b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/core/qgsowsconnection.cpp b/src/core/qgsowsconnection.cpp
@@ -143,7 +143,7 @@ QgsDataSourceUri &QgsOwsConnection::addWmsWcsConnectionSettings( QgsDataSourceUr
 {
   addCommonConnectionSettings( uri, service, connName );
 
-  settingsHeaders->setValue( uri.httpHeaders().headers(), {service.toLower(), connName} );
+  uri.setHttpHeaders( QgsHttpHeaders( settingsHeaders->value( {service.toLower(), connName} ) ) );
 
   if ( settingsIgnoreGetMapURI->value( {service.toLower(), connName} ) )
   {

diff --git a/tests/src/core/testqgshttpheaders.cpp b/tests/src/core/testqgshttpheaders.cpp
@@ -143,11 +143,8 @@ void TestQgsHttpheaders::updateSettings()
 
 void TestQgsHttpheaders::createQgsOwsConnection()
 {
-  QgsSettings settings;
-  settings.setValue( QString( QgsSettings::Prefix::QGIS ) + "/connections-service/name/" + QgsHttpHeaders::PATH_PREFIX + QgsHttpHeaders::KEY_REFERER,
-                     "http://test.com" );
-  settings.setValue( QString( QgsSettings::Prefix::QGIS ) + "/connections-service/name/" + QgsHttpHeaders::PATH_PREFIX + "other_http_header",
-                     "value" );
+  QgsHttpHeaders h( QVariantMap( { { QgsHttpHeaders::KEY_REFERER, "http://test.com"}, {"other_http_header", "value"}} ) );
+  QgsOwsConnection::settingsHeaders->setValue( h.headers(), {"service", "name"} );
 
   QgsOwsConnection ows( "service", "name" );
   QCOMPARE( ows.connectionInfo(), ",authcfg=,referer=http://test.com" );