Merge pull request #5515 from pblottiere/server_bugfix_plusspace

pblottiere · web-flow · commit 022f6cfd2121 · 2017-11-09T15:01:40.000Z
[server][bugfix] Fixes #17401 by replacing '+' symbol by space
diff --git a/src/server/qgsserverrequest.cpp b/src/server/qgsserverrequest.cpp
@@ -79,7 +79,11 @@ QMap<QString, QString> QgsServerRequest::parameters() const
     QList<pair_t> items = query.queryItems( QUrl::FullyDecoded );
     Q_FOREACH ( const pair_t &pair, items )
     {
-      mParams.insert( pair.first.toUpper(), pair.second );
+      // prepare the value
+      QString value = pair.second;
+      value.replace( "+", " " );
+
+      mParams.insert( pair.first.toUpper(), value );
     }
     mDecoded = true;
   }
diff --git a/tests/src/python/test_qgsserver_wms.py b/tests/src/python/test_qgsserver_wms.py
@@ -207,6 +207,16 @@ def test_getfeatureinfo(self):
                                  'FEATURE_COUNT=10&FILTER_GEOM=POLYGON((8.2035381 44.901459,8.2035562 44.901459,8.2035562 44.901418,8.2035381 44.901418,8.2035381 44.901459))',
                                  'wms_getfeatureinfo_invalid_query_layers')
 
+        # Test feature info request with '+' instead of ' ' in layers and
+        # query_layers parameters
+        self.wms_request_compare('GetFeatureInfo',
+                                 '&layers=testlayer+%C3%A8%C3%A9&styles=&' +
+                                 'info_format=text%2Fxml&transparent=true&' +
+                                 'width=600&height=400&srs=EPSG%3A3857&bbox=913190.6389747962%2C' +
+                                 '5606005.488876367%2C913235.426296057%2C5606035.347090538&' +
+                                 'query_layers=testlayer+%C3%A8%C3%A9&X=190&Y=320',
+                                 'wms_getfeatureinfo-text-xml')
+
     def test_describelayer(self):
         # Test DescribeLayer
         self.wms_request_compare('DescribeLayer',

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,11 @@ QMap<QString, QString> QgsServerRequest::parameters() const`
`79`	`79`	`QList<pair_t> items = query.queryItems( QUrl::FullyDecoded );`
`80`	`80`	`Q_FOREACH ( const pair_t &pair, items )`
`81`	`81`	`{`
`82`		`- mParams.insert( pair.first.toUpper(), pair.second );`
	`82`	`+ // prepare the value`
	`83`	`+ QString value = pair.second;`
	`84`	`+ value.replace( "+", " " );`
	`85`	`+`
	`86`	`+ mParams.insert( pair.first.toUpper(), value );`
`83`	`87`	`}`
`84`	`88`	`mDecoded = true;`
`85`	`89`	`}`