WMS run as a module service !

dmarteau · dmarteau · commit dc211f89bd58 · 2017-01-10T14:34:18.000+01:00
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
@@ -25,7 +25,7 @@ SET ( qgis_mapserv_SRCS
   qgsconfigcache.cpp
   qgsrequesthandler.cpp
   qgsowsserver.cpp
-  qgswmsserver.cpp
+  #  qgswmsserver.cpp
   qgswfsserver.cpp
   qgswcsserver.cpp
   qgsmapserviceexception.cpp
diff --git a/src/server/qgsfcgiserverresponse.h b/src/server/qgsfcgiserverresponse.h
@@ -85,7 +85,7 @@ class QgsFcgiServerRequest: public QgsServerRequest
     virtual QByteArray data() const override;
 
     /**
-     * Return true if an error occured during initialization
+     * Return true if an error occurred during initialization
      */
     bool hasError() const { return mHasError; }
 
diff --git a/src/server/qgsserver.cpp b/src/server/qgsserver.cpp
@@ -30,7 +30,7 @@
 #include "qgsproject.h"
 #include "qgsproviderregistry.h"
 #include "qgslogger.h"
-#include "qgswmsserver.h"
+//#include "qgswmsserver.h"
 #include "qgswfsserver.h"
 #include "qgswcsserver.h"
 #include "qgsmapserviceexception.h"
@@ -41,6 +41,7 @@
 #include "qgsserverrequest.h"
 #include "qgsbufferserverresponse.h"
 #include "qgsfilterresponsedecorator.h"
+#include "qgsservice.h"
 
 #include <QDomDocument>
 #include <QNetworkDiskCache>
@@ -387,7 +388,7 @@ void QgsServer::handleRequest( QgsServerRequest& request, QgsServerResponse& res
   // Call  requestReady() method (if enabled)
   theResponse.start();
 
-  QMap<QString, QString> parameterMap = theRequestHandler.parameterMap();
+  QMap<QString, QString> parameterMap = request.parameters();
   printRequestParameters( parameterMap, logLevel );
 
   const QgsAccessControl* accessControl = sServerInterface->accessControls();
@@ -401,20 +402,22 @@ void QgsServer::handleRequest( QgsServerRequest& request, QgsServerResponse& res
 #endif
 
   //Service parameter
-  QString serviceString = theRequestHandler.parameter( QStringLiteral( "SERVICE" ) );
+  QString serviceString = parameterMap.value( QStringLiteral( "SERVICE" ) );
 
   if ( serviceString.isEmpty() )
   {
     // SERVICE not mandatory for WMS 1.3.0 GetMap & GetFeatureInfo
-    QString requestString = theRequestHandler.parameter( QStringLiteral( "REQUEST" ) );
+    QString requestString = parameterMap.value( QStringLiteral( "REQUEST" ) );
     if ( requestString == QLatin1String( "GetMap" ) || requestString == QLatin1String( "GetFeatureInfo" ) )
     {
       serviceString = QStringLiteral( "WMS" );
     }
   }
 
+  QString versionString = parameterMap.value( QStringLiteral( "VERSION" ) );
+
   //possibility for client to suggest a download filename
-  QString outputFileName = theRequestHandler.parameter( QStringLiteral( "FILE_NAME" ) );
+  QString outputFileName = parameterMap.value( QStringLiteral( "FILE_NAME" ) );
   if ( !outputFileName.isEmpty() )
   {
     theRequestHandler.setHeader( QStringLiteral( "Content-Disposition" ), "attachment; filename=\"" + outputFileName + "\"" );
@@ -423,7 +426,14 @@ void QgsServer::handleRequest( QgsServerRequest& request, QgsServerResponse& res
   // Enter core services main switch
   if ( !theRequestHandler.exceptionRaised() )
   {
-    if ( serviceString == QLatin1String( "WCS" ) )
+    // Lookup for service
+
+    QgsService* service = sServiceRegistry.getService( serviceString, versionString );
+    if ( service )
+    {
+      service->executeRequest( request, theResponse );
+    }
+    else if ( serviceString == QLatin1String( "WCS" ) )
     {
       QgsWCSProjectParser* p = QgsConfigCache::instance()->wcsConfiguration(
                                  configFilePath
@@ -467,6 +477,7 @@ void QgsServer::handleRequest( QgsServerRequest& request, QgsServerResponse& res
         wfsServer.executeRequest();
       }
     }
+    /*
     else if ( serviceString == QLatin1String( "WMS" ) )
     {
       QgsWmsConfigParser* p = QgsConfigCache::instance()->wmsConfiguration(
@@ -490,6 +501,7 @@ void QgsServer::handleRequest( QgsServerRequest& request, QgsServerResponse& res
         wmsServer.executeRequest();
       }
     }
+    */
     else
     {
       theRequestHandler.setServiceException( QgsMapServiceException( QStringLiteral( "Service configuration error" ), QStringLiteral( "Service unknown or unsupported" ) ) );
diff --git a/src/server/qgsserver.h b/src/server/qgsserver.h
@@ -130,7 +130,6 @@ class SERVER_EXPORT QgsServer
 #endif
     //! Initialization must run once for all servers
     static bool sInitialised;
-    static bool sCaptureOutput;
 
     //! service registry
     static QgsServiceRegistry sServiceRegistry;
diff --git a/src/server/qgsservicenativeloader.cpp b/src/server/qgsservicenativeloader.cpp
@@ -98,7 +98,6 @@ QgsServiceModule* QgsServiceNativeLoader::loadNativeModule( const QString& locat
   qDebug() << QString( "Loading native module %1" ).arg( location );
   if ( !lib.load() )
   {
-    qDebug() <<  QString( "Failed to load library %1: %2" ).arg( lib.fileName(), lib.errorString() );
     QgsMessageLog::logMessage( QString( "Failed to load library %1: %2" ).arg( lib.fileName(), lib.errorString() ) );
     return nullptr;
   }
diff --git a/src/server/qgsserviceregistry.cpp b/src/server/qgsserviceregistry.cpp
@@ -75,6 +75,9 @@ namespace
     return false;
   }
 
+// Check that two versions are c
+
+
 } // namespace
 
 QgsServiceRegistry::QgsServiceRegistry()
@@ -104,7 +107,9 @@ QgsService* QgsServiceRegistry::getService( const QString& name, const QString&
     }
     else
     {
-      QgsMessageLog::logMessage( QString( "Service %1 %2 not found" ).arg( name, version ) );
+      // Return the dofault version
+      QgsMessageLog::logMessage( QString( "Service %1 %2 not found, returning default" ).arg( name, version ) );
+      service = mServices[v->second].get();
     }
   }
   else
@@ -131,8 +136,17 @@ void QgsServiceRegistry::registerService( QgsService* service )
   mServices.insert( key, std::shared_ptr<QgsService>( service ) );
 
   // Check the default version
-  // and replace with te new one if it has a higher version
+  // The first inserted service of a given name
+  // is the default one.
+  // this will ensure that native services are always
+  // the defaults.
   VersionTable::const_iterator v = mVersions.constFind( name );
+  if ( v == mVersions.constEnd() )
+  {
+    // Insert the service as the default one
+    mVersions.insert( name, VersionTable::mapped_type( version, key ) );
+  }
+  /*
   if ( v != mVersions.constEnd() )
   {
     if ( isVersionGreater( version, v->first ) )
@@ -145,7 +159,8 @@ void QgsServiceRegistry::registerService( QgsService* service )
   {
     // Insert the service as the default one
     mVersions.insert( name, VersionTable::mapped_type( version, key ) );
-  }
+  }*/
+
 }
 
 int QgsServiceRegistry::unregisterService( const QString& name, const QString& version )
diff --git a/src/server/services/wms/qgswms.cpp b/src/server/services/wms/qgswms.cpp
@@ -61,8 +61,21 @@ namespace QgsWms
       {
         Q_UNUSED( project );
 
-        // Get the request
         QgsServerRequest::Parameters params = request.parameters();
+        QString versionString = params.value( "VERSION" );
+        if ( versionString.isEmpty() )
+        {
+          //WMTVER needs to be supported by WMS 1.1.1 for backwards compatibility with WMS 1.0.0
+          versionString = params.value( "WMTVER" );
+        }
+
+        // Set the default version
+        if ( versionString.isEmpty() )
+        {
+          versionString = mVersion;
+        }
+
+        // Get the request
         QString req = params.value( QStringLiteral( "REQUEST" ) );
         if ( req.isEmpty() )
         {
@@ -72,66 +85,59 @@ namespace QgsWms
         }
 
         if (( QSTR_COMPARE( mVersion, "1.1.1" ) && QSTR_COMPARE( req, "capabilities" ) )
-            || QSTR_COMPARE( req, "GetCapabilites" ) )
+            || QSTR_COMPARE( req, "GetCapabilities" ) )
         {
-          //TODO GetCapabilities
-          writeGetCapabilities( mServerIface, mVersion, request, response, false );
+          writeGetCapabilities( mServerIface, versionString, request, response, false );
         }
         else if QSTR_COMPARE( req, "GetProjectSettings" )
         {
-          //Ensure that we are supporting 1.3.0
-          if ( mVersion.compare( "1.3.0" ) != 0 )
-          {
-            writeError( response, QStringLiteral( "OperationNotSupported" ),
-                        QStringLiteral( "GetProjectSettings is not supported" ) );
-            return;
-          }
-          writeGetCapabilities( mServerIface, mVersion, request, response, true );
-          // TODO GetProjectSettings
+          //getProjectSettings extends WMS 1.3.0 capabilities
+          versionString = QStringLiteral( "1.3.0" );
+          writeGetCapabilities( mServerIface, versionString, request, response, true );
         }
         else if QSTR_COMPARE( req, "GetMap" )
         {
           QString format = params.value( QStringLiteral( "FORMAT" ) );
           if QSTR_COMPARE( format, "application/dxf" )
           {
-            writeAsDxf( mServerIface, mVersion, request, response );
+            writeAsDxf( mServerIface, versionString, request, response );
           }
           else
           {
-            writeGetMap( mServerIface, mVersion, request, response );
+            writeGetMap( mServerIface, versionString, request, response );
           }
         }
         else if QSTR_COMPARE( req, "GetFeatureInfo" )
         {
-          writeGetFeatureInfo( mServerIface, mVersion, request, response );
+          writeGetFeatureInfo( mServerIface, versionString, request, response );
         }
         else if QSTR_COMPARE( req, "GetContext" )
         {
-          writeGetContext( mServerIface, mVersion, request, response );
+          writeGetContext( mServerIface, versionString, request, response );
         }
         else if QSTR_COMPARE( req, "GetSchemaExtension" )
         {
-          writeGetSchemaExtension( mServerIface, mVersion, request, response );
+          writeGetSchemaExtension( mServerIface, versionString, request, response );
         }
         else if QSTR_COMPARE( req, "GetStyle" )
         {
-          writeGetStyle( mServerIface, mVersion, request, response );
+          writeGetStyle( mServerIface, versionString, request, response );
         }
         else if QSTR_COMPARE( req, "GetStyles" )
         {
-          writeGetStyles( mServerIface, mVersion, request, response );
+          writeGetStyles( mServerIface, versionString, request, response );
         }
         else if QSTR_COMPARE( req, "DescribeLayer" )
         {
-          writeDescribeLayer( mServerIface, mVersion, request, response );
+          writeDescribeLayer( mServerIface, versionString, request, response );
         }
         else if ( QSTR_COMPARE( req, "GetLegendGraphic" ) || QSTR_COMPARE( req, "GetLegendGraphics" ) )
         {
-          writeGetLegendGraphics( mServerIface, mVersion, request, response );
+          writeGetLegendGraphics( mServerIface, versionString, request, response );
         }
         else if QSTR_COMPARE( req, "GetPrint" )
         {
-          writeDescribeLayer( mServerIface, mVersion, request, response );
+          writeGetPrint( mServerIface, versionString, request, response );
         }
         else
         {
@@ -159,7 +165,6 @@ class QgsWmsModule: public QgsServiceModule
     {
       QgsDebugMsg( "WMSModule::registerSelf called" );
       registry.registerService( new  QgsWms::Service( "1.3.0", serverIface ) );
-      registry.registerService( new  QgsWms::Service( "1.1.1", serverIface ) );
     }
 };
 
diff --git a/src/server/services/wms/qgswmsgetcapabilities.cpp b/src/server/services/wms/qgswmsgetcapabilities.cpp
@@ -76,7 +76,7 @@ namespace QgsWms
       QgsMessageLog::logMessage( QStringLiteral( "Found capabilities document in cache" ) );
     }
 
-    response.setHeader( QStringLiteral( "Contente-Type" ), QStringLiteral( "text/xml; charset=utf-8" ) );
+    response.setHeader( QStringLiteral( "Content-Type" ), QStringLiteral( "text/xml; charset=utf-8" ) );
     response.write( capabilitiesDocument->toByteArray() );
   }
 
diff --git a/src/server/services/wms/qgswmsgetfeatureinfo.cpp b/src/server/services/wms/qgswmsgetfeatureinfo.cpp
@@ -151,7 +151,7 @@ namespace QgsWms
       return;
     }
 
-    response.setHeader( QStringLiteral( "Content-Type" ), infoFormat );
+    response.setHeader( QStringLiteral( "Content-Type" ), infoFormat + QStringLiteral( "; charset=utf-8" ) );
     response.write( ba );
   }
 
diff --git a/src/server/services/wms/qgswmsutils.cpp b/src/server/services/wms/qgswmsutils.cpp
@@ -38,7 +38,16 @@ namespace QgsWms
   QgsWmsConfigParser* getConfigParser( QgsServerInterface* serverIface )
   {
     QString configFilePath = serverIface->configFilePath();
-    return QgsConfigCache::instance()->wmsConfiguration( configFilePath, serverIface->accessControls() );
+
+    QgsWmsConfigParser* parser  = QgsConfigCache::instance()->wmsConfiguration( configFilePath, serverIface->accessControls() );
+    if ( !parser )
+    {
+      throw QgsMapServiceException(
+        QStringLiteral( "WMS configuration error" ),
+        QStringLiteral( "There was an error reading the project file or the SLD configuration" ) );
+
+    }
+    return parser;
   }
 
   // Output a wms standard error
diff --git a/tests/src/python/test_qgsserver_services.py b/tests/src/python/test_qgsserver_services.py
@@ -100,8 +100,8 @@ def test_register(self):
     def test_0_version_registration(self):
 
         reg     = QgsServiceRegistry()
-        myserv1 = MyService("TEST", "1.0", "Hello")
-        myserv2 = MyService("TEST", "1.1", "Hello")
+        myserv1 = MyService("TEST", "1.1", "Hello")
+        myserv2 = MyService("TEST", "1.0", "Hello")
    
         reg.registerService( myserv1 )
         reg.registerService( myserv2)
@@ -111,7 +111,13 @@ def test_0_version_registration(self):
         self.assertEqual(service.version(), "1.1")
 
         service = reg.getService("TEST", "2.0")
-        self.assertIsNone(service)
+        self.assertIsNotNone(service)
+        self.assertEqual(service.version(), "1.1")
+
+        service = reg.getService("TEST", "1.0")
+        self.assertIsNotNone(service)
+        self.assertEqual(service.version(), "1.0")
+
 
     def test_1_unregister_services(self):
 
@@ -124,17 +130,17 @@ def test_1_unregister_services(self):
         reg.registerService(serv2)
         reg.registerService(serv3)
 
-        # Check we get the highest version
+        # Check we get the default version
         service = reg.getService("TEST")
-        self.assertEqual( service.version(), "1.0c" )
+        self.assertEqual( service.version(), "1.0a" )
         
         # Remove one service
-        removed = reg.unregisterService("TEST", "1.0c")
+        removed = reg.unregisterService("TEST", "1.0a")
         self.assertEqual( removed, 1 )
 
         # Check that we get the highest version
         service = reg.getService("TEST")
-        self.assertEqual( service.version(), "1.0b" )
+        self.assertEqual( service.version(), "1.0c" )
         
          # Remove all services
         removed = reg.unregisterService("TEST")

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,6 @@ QgsServiceModule* QgsServiceNativeLoader::loadNativeModule( const QString& locat`
`98`	`98`	`qDebug() << QString( "Loading native module %1" ).arg( location );`
`99`	`99`	`if ( !lib.load() )`
`100`	`100`	`{`
`101`		`- qDebug() << QString( "Failed to load library %1: %2" ).arg( lib.fileName(), lib.errorString() );`
`102`	`101`	`QgsMessageLog::logMessage( QString( "Failed to load library %1: %2" ).arg( lib.fileName(), lib.errorString() ) );`
`103`	`102`	`return nullptr;`
`104`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,9 @@ namespace`
`75`	`75`	`return false;`
`76`	`76`	`}`
`77`	`77`
	`78`	`+// Check that two versions are c`
	`79`	`+`
	`80`	`+`
`78`	`81`	`} // namespace`
`79`	`82`
`80`	`83`	`QgsServiceRegistry::QgsServiceRegistry()`
`@@ -104,7 +107,9 @@ QgsService* QgsServiceRegistry::getService( const QString& name, const QString&`
`104`	`107`	`}`
`105`	`108`	`else`
`106`	`109`	`{`
`107`		`- QgsMessageLog::logMessage( QString( "Service %1 %2 not found" ).arg( name, version ) );`
	`110`	`+ // Return the dofault version`
	`111`	`+ QgsMessageLog::logMessage( QString( "Service %1 %2 not found, returning default" ).arg( name, version ) );`
	`112`	`+ service = mServices[v->second].get();`
`108`	`113`	`}`
`109`	`114`	`}`
`110`	`115`	`else`
`@@ -131,8 +136,17 @@ void QgsServiceRegistry::registerService( QgsService* service )`
`131`	`136`	`mServices.insert( key, std::shared_ptr<QgsService>( service ) );`
`132`	`137`
`133`	`138`	`// Check the default version`
`134`		`- // and replace with te new one if it has a higher version`
	`139`	`+ // The first inserted service of a given name`
	`140`	`+ // is the default one.`
	`141`	`+ // this will ensure that native services are always`
	`142`	`+ // the defaults.`
`135`	`143`	`VersionTable::const_iterator v = mVersions.constFind( name );`
	`144`	`+ if ( v == mVersions.constEnd() )`
	`145`	`+ {`
	`146`	`+ // Insert the service as the default one`
	`147`	`+ mVersions.insert( name, VersionTable::mapped_type( version, key ) );`
	`148`	`+ }`
	`149`	`+ /*`
`136`	`150`	`if ( v != mVersions.constEnd() )`
`137`	`151`	`{`
`138`	`152`	`if ( isVersionGreater( version, v->first ) )`
`@@ -145,7 +159,8 @@ void QgsServiceRegistry::registerService( QgsService* service )`
`145`	`159`	`{`
`146`	`160`	`// Insert the service as the default one`
`147`	`161`	`mVersions.insert( name, VersionTable::mapped_type( version, key ) );`
`148`		`- }`
	`162`	`+ }*/`
	`163`	`+`
`149`	`164`	`}`
`150`	`165`
`151`	`166`	`int QgsServiceRegistry::unregisterService( const QString& name, const QString& version )`
Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,21 @@ namespace QgsWms`
`61`	`61`	`{`
`62`	`62`	`Q_UNUSED( project );`
`63`	`63`
`64`		`- // Get the request`
`65`	`64`	`QgsServerRequest::Parameters params = request.parameters();`
	`65`	`+ QString versionString = params.value( "VERSION" );`
	`66`	`+ if ( versionString.isEmpty() )`
	`67`	`+ {`
	`68`	`+ //WMTVER needs to be supported by WMS 1.1.1 for backwards compatibility with WMS 1.0.0`
	`69`	`+ versionString = params.value( "WMTVER" );`
	`70`	`+ }`
	`71`	`+`
	`72`	`+ // Set the default version`
	`73`	`+ if ( versionString.isEmpty() )`
	`74`	`+ {`
	`75`	`+ versionString = mVersion;`
	`76`	`+ }`
	`77`	`+`
	`78`	`+ // Get the request`
`66`	`79`	`QString req = params.value( QStringLiteral( "REQUEST" ) );`
`67`	`80`	`if ( req.isEmpty() )`
`68`	`81`	`{`
`@@ -72,66 +85,59 @@ namespace QgsWms`
`72`	`85`	`}`
`73`	`86`
`74`	`87`	`if (( QSTR_COMPARE( mVersion, "1.1.1" ) && QSTR_COMPARE( req, "capabilities" ) )`
`75`		`- \|\| QSTR_COMPARE( req, "GetCapabilites" ) )`
	`88`	`+ \|\| QSTR_COMPARE( req, "GetCapabilities" ) )`
`76`	`89`	`{`
`77`		`- //TODO GetCapabilities`
`78`		`- writeGetCapabilities( mServerIface, mVersion, request, response, false );`
	`90`	`+ writeGetCapabilities( mServerIface, versionString, request, response, false );`
`79`	`91`	`}`
`80`	`92`	`else if QSTR_COMPARE( req, "GetProjectSettings" )`
`81`	`93`	`{`
`82`		`- //Ensure that we are supporting 1.3.0`
`83`		`- if ( mVersion.compare( "1.3.0" ) != 0 )`
`84`		`- {`
`85`		`- writeError( response, QStringLiteral( "OperationNotSupported" ),`
`86`		`- QStringLiteral( "GetProjectSettings is not supported" ) );`
`87`		`- return;`
`88`		`- }`
`89`		`- writeGetCapabilities( mServerIface, mVersion, request, response, true );`
`90`		`- // TODO GetProjectSettings`
	`94`	`+ //getProjectSettings extends WMS 1.3.0 capabilities`
	`95`	`+ versionString = QStringLiteral( "1.3.0" );`
	`96`	`+ writeGetCapabilities( mServerIface, versionString, request, response, true );`
`91`	`97`	`}`
`92`	`98`	`else if QSTR_COMPARE( req, "GetMap" )`
`93`	`99`	`{`
`94`	`100`	`QString format = params.value( QStringLiteral( "FORMAT" ) );`
`95`	`101`	`if QSTR_COMPARE( format, "application/dxf" )`
`96`	`102`	`{`
`97`		`- writeAsDxf( mServerIface, mVersion, request, response );`
	`103`	`+ writeAsDxf( mServerIface, versionString, request, response );`
`98`	`104`	`}`
`99`	`105`	`else`
`100`	`106`	`{`
`101`		`- writeGetMap( mServerIface, mVersion, request, response );`
	`107`	`+ writeGetMap( mServerIface, versionString, request, response );`
`102`	`108`	`}`
`103`	`109`	`}`
`104`	`110`	`else if QSTR_COMPARE( req, "GetFeatureInfo" )`
`105`	`111`	`{`
`106`		`- writeGetFeatureInfo( mServerIface, mVersion, request, response );`
	`112`	`+ writeGetFeatureInfo( mServerIface, versionString, request, response );`
`107`	`113`	`}`
`108`	`114`	`else if QSTR_COMPARE( req, "GetContext" )`
`109`	`115`	`{`
`110`		`- writeGetContext( mServerIface, mVersion, request, response );`
	`116`	`+ writeGetContext( mServerIface, versionString, request, response );`
`111`	`117`	`}`
`112`	`118`	`else if QSTR_COMPARE( req, "GetSchemaExtension" )`
`113`	`119`	`{`
`114`		`- writeGetSchemaExtension( mServerIface, mVersion, request, response );`
	`120`	`+ writeGetSchemaExtension( mServerIface, versionString, request, response );`
`115`	`121`	`}`
`116`	`122`	`else if QSTR_COMPARE( req, "GetStyle" )`
`117`	`123`	`{`
`118`		`- writeGetStyle( mServerIface, mVersion, request, response );`
	`124`	`+ writeGetStyle( mServerIface, versionString, request, response );`
`119`	`125`	`}`
`120`	`126`	`else if QSTR_COMPARE( req, "GetStyles" )`
`121`	`127`	`{`
`122`		`- writeGetStyles( mServerIface, mVersion, request, response );`
	`128`	`+ writeGetStyles( mServerIface, versionString, request, response );`
`123`	`129`	`}`
`124`	`130`	`else if QSTR_COMPARE( req, "DescribeLayer" )`
`125`	`131`	`{`
`126`		`- writeDescribeLayer( mServerIface, mVersion, request, response );`
	`132`	`+ writeDescribeLayer( mServerIface, versionString, request, response );`
`127`	`133`	`}`
`128`	`134`	`else if ( QSTR_COMPARE( req, "GetLegendGraphic" ) \|\| QSTR_COMPARE( req, "GetLegendGraphics" ) )`
`129`	`135`	`{`
`130`		`- writeGetLegendGraphics( mServerIface, mVersion, request, response );`
	`136`	`+ writeGetLegendGraphics( mServerIface, versionString, request, response );`
`131`	`137`	`}`
`132`	`138`	`else if QSTR_COMPARE( req, "GetPrint" )`
`133`	`139`	`{`
`134`		`- writeDescribeLayer( mServerIface, mVersion, request, response );`
	`140`	`+ writeGetPrint( mServerIface, versionString, request, response );`
`135`	`141`	`}`
`136`	`142`	`else`
`137`	`143`	`{`
`@@ -159,7 +165,6 @@ class QgsWmsModule: public QgsServiceModule`
`159`	`165`	`{`
`160`	`166`	`QgsDebugMsg( "WMSModule::registerSelf called" );`
`161`	`167`	`registry.registerService( new QgsWms::Service( "1.3.0", serverIface ) );`
`162`		`- registry.registerService( new QgsWms::Service( "1.1.1", serverIface ) );`
`163`	`168`	`}`
`164`	`169`	`};`
`165`	`170`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ namespace QgsWms`
`76`	`76`	`QgsMessageLog::logMessage( QStringLiteral( "Found capabilities document in cache" ) );`
`77`	`77`	`}`
`78`	`78`
`79`		`- response.setHeader( QStringLiteral( "Contente-Type" ), QStringLiteral( "text/xml; charset=utf-8" ) );`
	`79`	`+ response.setHeader( QStringLiteral( "Content-Type" ), QStringLiteral( "text/xml; charset=utf-8" ) );`
`80`	`80`	`response.write( capabilitiesDocument->toByteArray() );`
`81`	`81`	`}`
`82`	`82`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ namespace QgsWms`
`151`	`151`	`return;`
`152`	`152`	`}`
`153`	`153`
`154`		`- response.setHeader( QStringLiteral( "Content-Type" ), infoFormat );`
	`154`	`+ response.setHeader( QStringLiteral( "Content-Type" ), infoFormat + QStringLiteral( "; charset=utf-8" ) );`
`155`	`155`	`response.write( ba );`
`156`	`156`	`}`
`157`	`157`