Set xml declaration for QGIS server capabilities

qgis · Aug 14, 2012 · 0c67fdd · 0c67fdd
1 parent f53f468
commit 0c67fdd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp
@@ -90,10 +90,12 @@ QDomDocument QgsWMSServer::getCapabilities( QString version )
   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"
+    addXMLDeclaration( doc );
     wmsCapabilitiesElement = doc.createElement( "WMT_MS_Capabilities"/*wms:WMS_Capabilities*/ );
   }
   else // 1.3.0 as default
   {
+    addXMLDeclaration( doc );
     wmsCapabilitiesElement = doc.createElement( "WMS_Capabilities"/*wms:WMS_Capabilities*/ );
     wmsCapabilitiesElement.setAttribute( "xmlns", "http://www.opengis.net/wms" );
     wmsCapabilitiesElement.setAttribute( "xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance" );
@@ -1998,3 +2000,9 @@ QString QgsWMSServer::serviceUrl() const
   }
   return mapUrl.toString();
 }
+
+void QgsWMSServer::addXMLDeclaration( QDomDocument& doc ) const
+{
+  QDomProcessingInstruction xmlDeclaration = doc.createProcessingInstruction( "xml", "version=\"1.0\"" );
+  doc.appendChild( xmlDeclaration );
+}
diff --git a/src/mapserver/qgswmsserver.h b/src/mapserver/qgswmsserver.h
@@ -171,6 +171,9 @@ class QgsWMSServer
     /**Get service address from REQUEST_URI if not specified in the configuration*/
     QString serviceUrl() const;
 
+    /**Add '<?xml version="1.0" ?>'. Some clients need an xml declaration (though it is not strictly required)*/
+    void addXMLDeclaration( QDomDocument& doc ) const;
+
     /**Map containing the WMS parameters*/
     QMap<QString, QString> mParameterMap;
     QgsConfigParser* mConfigParser;