Skip to content

Commit 1bae625

Browse files
committed
[Server] Fix: QUrl::FullyDecoded is not permitted when reconstructing the full URL
1 parent c9409e5 commit 1bae625

6 files changed

+8
-8
lines changed

src/server/services/wcs/qgswcsutils.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ namespace QgsWcs
251251
q.removeAllQueryItems( QStringLiteral( "_DC" ) );
252252

253253
url.setQuery( q );
254-
href = url.toString( QUrl::FullyDecoded );
254+
href = url.toString();
255255

256256
}
257257

src/server/services/wfs/qgswfsutils.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ namespace QgsWfs
5353
params.remove( QgsServerParameter::SERVICE );
5454

5555
url.setQuery( params.urlQuery() );
56-
href = url.toString( QUrl::FullyDecoded );
56+
href = url.toString();
5757
}
5858

5959
return href;

src/server/services/wms/qgswmsdescribelayer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ namespace QgsWms
8484

8585
// get the wms service url defined in project or keep the one from the
8686
// request url
87-
QString wmsHrefString = serviceUrl( request, project ).toString( QUrl::FullyDecoded );
87+
QString wmsHrefString = serviceUrl( request, project ).toString();
8888

8989
// get the wfs service url defined in project or take the same as the
9090
// wms service url

src/server/services/wms/qgswmsgetcapabilities.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ namespace QgsWms
167167
QUrl href = serviceUrl( request, project );
168168

169169
//href needs to be a prefix
170-
QString hrefString = href.toString( QUrl::FullyDecoded );
170+
QString hrefString = href.toString();
171171
hrefString.append( href.hasQuery() ? "&" : "?" );
172172

173173
// XML declaration
@@ -407,7 +407,7 @@ namespace QgsWms
407407
QUrl href = serviceUrl( request, project );
408408

409409
//href needs to be a prefix
410-
QString hrefString = href.toString( QUrl::FullyDecoded );
410+
QString hrefString = href.toString();
411411
hrefString.append( href.hasQuery() ? "&" : "?" );
412412

413413
QDomElement capabilityElem = doc.createElement( QStringLiteral( "Capability" )/*wms:Capability*/ );
@@ -1140,7 +1140,7 @@ namespace QgsWms
11401140
QUrl href = serviceUrl( request, project );
11411141

11421142
//href needs to be a prefix
1143-
QString hrefString = href.toString( QUrl::FullyDecoded );
1143+
QString hrefString = href.toString();
11441144
hrefString.append( href.hasQuery() ? "&" : "?" );
11451145
for ( const QString &styleName : currentLayer->styleManager()->styles() )
11461146
{

src/server/services/wms/qgswmsgetcontext.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ namespace QgsWms
311311
QUrl href = serviceUrl( request, project );
312312

313313
//href needs to be a prefix
314-
QString hrefString = href.toString( QUrl::FullyDecoded );
314+
QString hrefString = href.toString();
315315
hrefString.append( href.hasQuery() ? "&" : "?" );
316316

317317
// COntext Server Element with WMS service URL

src/server/services/wmts/qgswmtsutils.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ namespace QgsWmts
7474
params.remove( QgsServerParameter::SERVICE );
7575

7676
url.setQuery( params.urlQuery() );
77-
href = url.toString( QUrl::FullyDecoded );
77+
href = url.toString();
7878
}
7979

8080
return href;

0 commit comments

Comments
 (0)