Skip to content
Permalink
Browse files

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

… the full URL
  • Loading branch information
rldhont committed Aug 21, 2018
1 parent c9409e5 commit 1bae625aca7f102494869ff68fe751b53964a561
@@ -251,7 +251,7 @@ namespace QgsWcs
q.removeAllQueryItems( QStringLiteral( "_DC" ) );

url.setQuery( q );
href = url.toString( QUrl::FullyDecoded );
href = url.toString();

}

@@ -53,7 +53,7 @@ namespace QgsWfs
params.remove( QgsServerParameter::SERVICE );

url.setQuery( params.urlQuery() );
href = url.toString( QUrl::FullyDecoded );
href = url.toString();
}

return href;
@@ -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
@@ -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() )
{
@@ -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
@@ -74,7 +74,7 @@ namespace QgsWmts
params.remove( QgsServerParameter::SERVICE );

url.setQuery( params.urlQuery() );
href = url.toString( QUrl::FullyDecoded );
href = url.toString();
}

return href;

0 comments on commit 1bae625

Please sign in to comment.
You can’t perform that action at this time.