WMS 1.3 compliance: Each OnlineResource URL intended for HTTP Get requests in the capabilities document is a URL prefix

mhugent · rldhont · commit dd688a5d1c3e · 2016-12-12T10:56:31.000+01:00
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
@@ -423,6 +423,12 @@ QDomDocument QgsWMSServer::getCapabilities( QString version, bool fullProjectInf
     hrefString = serviceUrl();
   }
 
+  //href needs to be a prefix
+  if ( !hrefString.endsWith( "?" ) && !hrefString.endsWith( "&" ) )
+  {
+    hrefString.append( hrefString.contains( "?" ) ? "&" : "?" );
+  }
+
   if ( version == "1.1.1" )
   {
     doc = QDomDocument( "WMT_MS_Capabilities SYSTEM 'http://schemas.opengis.net/wms/1.1.1/WMS_MS_Capabilities.dtd'" );  //WMS 1.1.1 needs DOCTYPE  "SYSTEM http://schemas.opengis.net/wms/1.1.1/WMS_MS_Capabilities.dtd"

Original file line number	Diff line number	Diff line change
`@@ -423,6 +423,12 @@ QDomDocument QgsWMSServer::getCapabilities( QString version, bool fullProjectInf`
`423`	`423`	`hrefString = serviceUrl();`
`424`	`424`	`}`
`425`	`425`
	`426`	`+ //href needs to be a prefix`
	`427`	`+ if ( !hrefString.endsWith( "?" ) && !hrefString.endsWith( "&" ) )`
	`428`	`+ {`
	`429`	`+ hrefString.append( hrefString.contains( "?" ) ? "&" : "?" );`
	`430`	`+ }`
	`431`	`+`
`426`	`432`	`if ( version == "1.1.1" )`
`427`	`433`	`{`
`428`	`434`	`doc = QDomDocument( "WMT_MS_Capabilities SYSTEM 'http://schemas.opengis.net/wms/1.1.1/WMS_MS_Capabilities.dtd'" ); //WMS 1.1.1 needs DOCTYPE "SYSTEM http://schemas.opengis.net/wms/1.1.1/WMS_MS_Capabilities.dtd"`