Cascaded WMS: do not issue a useless GetLegendGraphic to the cascaded…

… server when doing a GetFeatureInfo request
MapServer · Apr 24, 2018 · 2b9d022 · 2b9d022
1 parent 563b175
commit 2b9d022
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/mapwmslayer.c b/mapwmslayer.c
@@ -1452,15 +1452,16 @@ int msWMSLayerExecuteRequest(mapObj *map, int nOWSLayers, int nClickX, int nClic
   /* Generate the http request */
   for (i=0; i<map->numlayers; i++) {
     if (GET_LAYER(map,map->layerorder[i])->status == MS_ON) {
-      if (type == WMS_GETFEATUREINFO &&
-          msPrepareWMSLayerRequest(map->layerorder[i], map, GET_LAYER(map,map->layerorder[i]),
+      if (type == WMS_GETFEATUREINFO ) {
+        if( msPrepareWMSLayerRequest(map->layerorder[i], map, GET_LAYER(map,map->layerorder[i]),
                                    WMS_GETFEATUREINFO,
                                    MS_WMS, &sLastWMSParams,
                                    nClickX, nClickY, nFeatureCount, pszInfoFormat,
                                    pasReqInfo, &numReq) == MS_FAILURE) {
-        msFreeWmsParamsObj(&sLastWMSParams);
-        msFree(pasReqInfo);
-        return MS_FAILURE;
+          msFreeWmsParamsObj(&sLastWMSParams);
+          msFree(pasReqInfo);
+          return MS_FAILURE;
+        }
       } else if (msPrepareWMSLayerRequest(map->layerorder[i], map, GET_LAYER(map,map->layerorder[i]),
                                           WMS_GETLEGENDGRAPHIC,
                                           MS_WMS, &sLastWMSParams,