Merge pull request #3140 from sbrunner/fix-cache-host

sbrunner · web-flow · commit 7b883e2edd06 · 2016-07-18T10:40:30.000+02:00
Have a capabilities cache per hostname
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
@@ -159,6 +159,7 @@ void QgsWMSServer::executeRequest()
   {
     QStringList cacheKeyList;
     cacheKeyList << ( getProjectSettings ? "projectSettings" : version );
+    cacheKeyList << getenv( "SERVER_NAME" );
     bool cache = true;
 #ifdef HAVE_SERVER_PYTHON_PLUGINS
     cache = mAccessControl->fillCacheKey( cacheKeyList );

Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,7 @@ void QgsWMSServer::executeRequest()`
`159`	`159`	`{`
`160`	`160`	`QStringList cacheKeyList;`
`161`	`161`	`cacheKeyList << ( getProjectSettings ? "projectSettings" : version );`
	`162`	`+ cacheKeyList << getenv( "SERVER_NAME" );`
`162`	`163`	`bool cache = true;`
`163`	`164`	`#ifdef HAVE_SERVER_PYTHON_PLUGINS`
`164`	`165`	`cache = mAccessControl->fillCacheKey( cacheKeyList );`