[Git][debian-gis-team/mapserver][upstream] New upstream version 7.6.0

[Bas Couwenberg]

Bas Couwenberg pushed to branch upstream at Debian GIS Project / mapserver


Commits:
3275b44b by Bas Couwenberg at 2020-05-08T17:34:25+02:00
New upstream version 7.6.0
- - - - -


3 changed files:

- CMakeLists.txt
- HISTORY.TXT
- mapwmslayer.c


Changes:

=====================================
CMakeLists.txt
=====================================
@@ -18,7 +18,7 @@ include(CheckCSourceCompiles)
 set (MapServer_VERSION_MAJOR 7)
 set (MapServer_VERSION_MINOR 6)
 set (MapServer_VERSION_REVISION 0)
-set (MapServer_VERSION_SUFFIX "-rc4")
+set (MapServer_VERSION_SUFFIX "")
 
 # Set C++ version
 # Make CMAKE_CXX_STANDARD available as cache option overridable by user


=====================================
HISTORY.TXT
=====================================
@@ -12,6 +12,11 @@ For a complete change history, please see the Git log comments.  For more
 details about recent point releases, please see the online changelog at:
 http://mapserver.org/development/changelog/
 
+7.6.0 release (2020-05-08)
+--------------------------
+
+- for essential WMS client layers set EXCEPTIONS to XML by default (#6066)
+
 7.6.0-rc4 release (2020-05-04)
 ------------------------------
 


=====================================
mapwmslayer.c
=====================================
@@ -428,7 +428,9 @@ msBuildWMSLayerURL(mapObj *map, layerObj *lp, int nRequestType,
   int nVersion=OWS_VERSION_NOTSET;
   int bUseStrictAxisOrder = MS_FALSE; /* this is the assumption up to 1.1.0 */
   int bFlipAxisOrder = MS_FALSE;
-
+  const char *pszTmp;
+  int bIsEssential = MS_FALSE;
+  
   if (lp->connectiontype != MS_WMS) {
     msSetError(MS_WMSCONNERR, "Call supported only for CONNECTIONTYPE WMS",
                "msBuildWMSLayerURL()");
@@ -779,6 +781,20 @@ msBuildWMSLayerURL(mapObj *map, layerObj *lp, int nRequestType,
    *   QUERY_LAYERS (for queryable layers only)
    * ------------------------------------------------------------------ */
 
+  /* ------------------------------------------------------------------
+   * Sometimes a requested layer is essential for the map, so if the
+   * request fails or an error is delivered, the map has not to be drawn
+   * ------------------------------------------------------------------ */
+  if ((pszTmp = msOWSLookupMetadata(&(lp->metadata),
+                                    "MO", "essential")) != NULL) {
+    if( strcasecmp(pszTmp,"true") == 0
+        || strcasecmp(pszTmp,"on") == 0
+        || strcasecmp(pszTmp,"yes") == 0 )
+      bIsEssential = MS_TRUE;
+    else
+      bIsEssential = atoi(pszTmp);       
+  }
+
   if (nRequestType == WMS_GETFEATUREINFO) {
     char szBuf[100] = "";
 
@@ -874,11 +890,17 @@ msBuildWMSLayerURL(mapObj *map, layerObj *lp, int nRequestType,
 
     pszExceptionsParam = msOWSLookupMetadata(&(lp->metadata),
                          "MO", "exceptions_format");
-    if (pszExceptionsParam == NULL) {
-      if (nVersion >= OWS_1_1_0 && nVersion < OWS_1_3_0)
-        pszExceptionsParam = "application/vnd.ogc.se_inimage";
-      else
-        pszExceptionsParam = "INIMAGE";
+
+    if (!bIsEssential) {
+      if (pszExceptionsParam == NULL) {
+        if (nVersion >= OWS_1_1_0 && nVersion < OWS_1_3_0)
+          pszExceptionsParam = "application/vnd.ogc.se_inimage";
+        else
+          pszExceptionsParam = "INIMAGE";
+      }
+    } else {
+      /* if layer is essential, do not emit EXCEPTIONS parameter (defaults to XML) */
+      pszExceptionsParam = NULL;
     }
 
     msSetWMSParamString(psWMSParams, "REQUEST", pszRequestParam, MS_FALSE, nVersion);
@@ -894,7 +916,9 @@ msBuildWMSLayerURL(mapObj *map, layerObj *lp, int nRequestType,
                bbox.minx, bbox.miny, bbox.maxx, bbox.maxy);
     }
     msSetWMSParamString(psWMSParams, "BBOX",    szBuf, MS_TRUE, nVersion);
-    msSetWMSParamString(psWMSParams, "EXCEPTIONS",  pszExceptionsParam, MS_FALSE, nVersion);
+    if( pszExceptionsParam ) {
+      msSetWMSParamString(psWMSParams, "EXCEPTIONS",  pszExceptionsParam, MS_FALSE, nVersion);
+    }
   }
 
   free(pszEPSG);
@@ -1279,16 +1303,20 @@ int msDrawWMSLayerLow(int nLayerId, httpRequestObj *pasReqInfo,
   int numclasses;
   char *mem_filename = NULL;
   const char *pszTmp;
-  int bIsEssential;
+  int bIsEssential = MS_FALSE;
 
   /* ------------------------------------------------------------------
    * Sometimes a requested layer is essential for the map, so if the
    * request fails or an error is delivered, the map has not to be drawn
    * ------------------------------------------------------------------ */
-  bIsEssential = MS_FALSE;
   if ((pszTmp = msOWSLookupMetadata(&(lp->metadata),
                                     "MO", "essential")) != NULL) {
-    bIsEssential = atoi(pszTmp);
+    if( strcasecmp(pszTmp,"true") == 0
+        || strcasecmp(pszTmp,"on") == 0
+        || strcasecmp(pszTmp,"yes") == 0 )
+      bIsEssential = MS_TRUE;
+    else
+      bIsEssential = atoi(pszTmp);      
   }
 
   /* ------------------------------------------------------------------



View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/-/commit/3275b44bef266a6edebba8344cd86b8591a69138

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/-/commit/3275b44bef266a6edebba8344cd86b8591a69138
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20200508/2bda6f32/attachment-0001.html>