[Server] Fix: QUrl::FullyDecoded is not permitted when reconstructing…

… the full URL
qgis · Aug 21, 2018 · 1bae625 · 1bae625
1 parent c9409e5
commit 1bae625
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/src/server/services/wcs/qgswcsutils.cpp b/src/server/services/wcs/qgswcsutils.cpp
@@ -251,7 +251,7 @@ namespace QgsWcs
       q.removeAllQueryItems( QStringLiteral( "_DC" ) );
 
       url.setQuery( q );
-      href = url.toString( QUrl::FullyDecoded );
+      href = url.toString();
 
     }
 

diff --git a/src/server/services/wfs/qgswfsutils.cpp b/src/server/services/wfs/qgswfsutils.cpp
@@ -53,7 +53,7 @@ namespace QgsWfs
       params.remove( QgsServerParameter::SERVICE );
 
       url.setQuery( params.urlQuery() );
-      href = url.toString( QUrl::FullyDecoded );
+      href = url.toString();
     }
 
     return  href;

diff --git a/src/server/services/wms/qgswmsdescribelayer.cpp b/src/server/services/wms/qgswmsdescribelayer.cpp
@@ -84,7 +84,7 @@ namespace QgsWms
 
     // get the wms service url defined in project or keep the one from the
     // request url
-    QString wmsHrefString = serviceUrl( request, project ).toString( QUrl::FullyDecoded );
+    QString wmsHrefString = serviceUrl( request, project ).toString();
 
     // get the wfs service url defined in project or take the same as the
     // wms service url

diff --git a/src/server/services/wms/qgswmsgetcapabilities.cpp b/src/server/services/wms/qgswmsgetcapabilities.cpp
@@ -167,7 +167,7 @@ namespace QgsWms
     QUrl href = serviceUrl( request, project );
 
     //href needs to be a prefix
-    QString hrefString = href.toString( QUrl::FullyDecoded );
+    QString hrefString = href.toString();
     hrefString.append( href.hasQuery() ? "&" : "?" );
 
     // XML declaration
@@ -407,7 +407,7 @@ namespace QgsWms
     QUrl href = serviceUrl( request, project );
 
     //href needs to be a prefix
-    QString hrefString = href.toString( QUrl::FullyDecoded );
+    QString hrefString = href.toString();
     hrefString.append( href.hasQuery() ? "&" : "?" );
 
     QDomElement capabilityElem = doc.createElement( QStringLiteral( "Capability" )/*wms:Capability*/ );
@@ -1140,7 +1140,7 @@ namespace QgsWms
       QUrl href = serviceUrl( request, project );
 
       //href needs to be a prefix
-      QString hrefString = href.toString( QUrl::FullyDecoded );
+      QString hrefString = href.toString();
       hrefString.append( href.hasQuery() ? "&" : "?" );
       for ( const QString &styleName : currentLayer->styleManager()->styles() )
       {

diff --git a/src/server/services/wms/qgswmsgetcontext.cpp b/src/server/services/wms/qgswmsgetcontext.cpp
@@ -311,7 +311,7 @@ namespace QgsWms
           QUrl href = serviceUrl( request, project );
 
           //href needs to be a prefix
-          QString hrefString = href.toString( QUrl::FullyDecoded );
+          QString hrefString = href.toString();
           hrefString.append( href.hasQuery() ? "&" : "?" );
 
           // COntext Server Element with WMS service URL

diff --git a/src/server/services/wmts/qgswmtsutils.cpp b/src/server/services/wmts/qgswmtsutils.cpp
@@ -74,7 +74,7 @@ namespace QgsWmts
       params.remove( QgsServerParameter::SERVICE );
 
       url.setQuery( params.urlQuery() );
-      href = url.toString( QUrl::FullyDecoded );
+      href = url.toString();
     }
 
     return  href;