sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2836 from elpaso/bugfix-13291

Browse Source 
[bugfix][server] Fixes #13291
This commit is contained in:
Alessandro Pasotti 2016-02-25 08:29:53 +01:00
commit b0269beac4
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/server/qgsserver.cpp
View File

@ -59,7 +59,7 @@
// Default values are for C++, SIP bindings will override their
// options in in init()
QString QgsServer::sConfigFilePath = QString();
QString* QgsServer::sConfigFilePath = nullptr;
QgsCapabilitiesCache* QgsServer::sCapabilitiesCache = nullptr;
QgsMapRenderer* QgsServer::sMapRenderer = nullptr;
#ifdef HAVE_SERVER_PYTHON_PLUGINS
@ -403,10 +403,9 @@ bool QgsServer::init( int & argc, char ** argv )
defaultConfigFilePath = adminSLDFileInfo.absoluteFilePath();
}
}
if ( !defaultConfigFilePath.isEmpty() )
{
sConfigFilePath = defaultConfigFilePath;
}
// Store the config file path
sConfigFilePath = new QString( defaultConfigFilePath );
//create cache for capabilities XML
sCapabilitiesCache = new QgsCapabilitiesCache();
@ -514,7 +513,7 @@ QPair<QByteArray, QByteArray> QgsServer::handleRequest( const QString& queryStri
printRequestParameters( parameterMap, logLevel );
QMap<QString, QString>::const_iterator paramIt;
//Config file path
QString configFilePath = configPath( sConfigFilePath, parameterMap );
QString configFilePath = configPath( *sConfigFilePath, parameterMap );
#ifdef HAVE_SERVER_PYTHON_PLUGINS
sServerInterface->setConfigFilePath( configFilePath );
#endif

2
src/server/qgsserver.h
View File

@ -115,7 +115,7 @@ class SERVER_EXPORT QgsServer
static QString &serverName();
// Status
static QString sConfigFilePath;
static QString* sConfigFilePath;
static QgsCapabilitiesCache* sCapabilitiesCache;
static QgsMapRenderer* sMapRenderer;
#ifdef HAVE_SERVER_PYTHON_PLUGINS