From 36e89a31467e4c7f08075f4394c391fe2a66d19e Mon Sep 17 00:00:00 2001
From: Marco Hugentobler <marco.hugentobler@sourcepole.ch>
Date: Tue, 29 Nov 2016 16:46:26 +0100
Subject: [PATCH] WMS 1.3 compliance: Each OnlineResource URL intended for HTTP
 Get requests in the capabilities document is a URL prefix

---
 src/server/qgswmsserver.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
index 1ab1c16afa3..03ba4c8260d 100644
--- a/src/server/qgswmsserver.cpp
+++ b/src/server/qgswmsserver.cpp
@@ -427,6 +427,12 @@ QDomDocument QgsWmsServer::getCapabilities( const QString& version, bool fullPro
     hrefString = serviceUrl();
   }
 
+  //href needs to be a prefix
+  if ( !hrefString.endsWith( "?" ) && !hrefString.endsWith( "&" ) )
+  {
+    hrefString.append( hrefString.contains( "?" ) ? "&" : "?" );
+  }
+
   if ( version == QLatin1String( "1.1.1" ) )
   {
     doc = QDomDocument( QStringLiteral( "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"