[server] Keep default version in case of invalid VERSION parameter

pblottiere · pblottiere · commit db4a2dda9f46 · 2018-05-15T09:07:21.000+01:00
diff --git a/src/server/services/wms/qgswms.cpp b/src/server/services/wms/qgswms.cpp
@@ -67,7 +67,8 @@ namespace QgsWms
         }
 
         // Set the default version
-        if ( versionString.isEmpty() )
+        const bool valid = versionString.compare( "1.1.1" ) == 0 || versionString.compare( "1.3.0" ) == 0;
+        if ( versionString.isEmpty() || !valid )
         {
           versionString = mVersion;
         }

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,8 @@ namespace QgsWms`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`// Set the default version`
`70`		`- if ( versionString.isEmpty() )`
	`70`	`+ const bool valid = versionString.compare( "1.1.1" ) == 0 \|\| versionString.compare( "1.3.0" ) == 0;`
	`71`	`+ if ( versionString.isEmpty() \|\| !valid )`
`71`	`72`	`{`
`72`	`73`	`versionString = mVersion;`
`73`	`74`	`}`