[Git][debian-gis-team/mapserver][upstream] New upstream version 8.6.0~beta2

[Bas Couwenberg (@sebastic)]

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


Commits:
a925d98a by Bas Couwenberg at 2025-11-18T15:46:24+01:00
New upstream version 8.6.0~beta2
- - - - -


4 changed files:

- CITATION.cff
- CMakeLists.txt
- HISTORY.md
- src/mapserv-index.cpp


Changes:

=====================================
CITATION.cff
=====================================
@@ -1,8 +1,8 @@
 cff-version: 1.2.0
 title: MapServer
 message: If you use this software, please cite it using the metadata from this file.
-version: 8.6.0-beta1
-date-released: 2025-11-13
+version: 8.6.0-beta2
+date-released: 2025-11-18
 abstract: MapServer is an Open Source platform for publishing spatial data and interactive mapping applications to the web.
 type: software
 authors:


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


=====================================
HISTORY.md
=====================================
@@ -13,6 +13,11 @@ https://mapserver.org/development/changelog/
 
 The online Migration Guide can be found at https://mapserver.org/MIGRATION_GUIDE.html
 
+8.6.0-beta2 release (2025-11-18)
+--------------------------------
+
+- additional URL creation logic for generated index URLs (#7388)
+
 8.6.0-beta1 release (2025-11-13)
 --------------------------------
 


=====================================
src/mapserv-index.cpp
=====================================
@@ -62,8 +62,17 @@ std::string getOnlineResource(mapObj *map, cgiRequestObj *request,
     onlineResource = "./?";
   }
 
-  if (!onlineResource.empty() && onlineResource.back() != '?') {
-    onlineResource += '?';
+  if (!onlineResource.empty()) {
+    if (onlineResource.find('?') != std::string::npos) {
+      // URL already has a query string
+      char last = onlineResource.back();
+      if (last != '?' && last != '&') {
+        onlineResource += '&';
+      }
+    } else {
+      // no query string so append '?'
+      onlineResource += '?';
+    }
   }
 
   return onlineResource;
@@ -325,6 +334,11 @@ static json createMapSummary(mapObj *map, const char *key,
     onlineResource = "./"; // fallback
   }
 
+  // make sure the root URL end with a '/'
+  if (!onlineResource.empty() && onlineResource.back() != '/') {
+    onlineResource += '/';
+  }
+
   mapJson["service-desc"] =
       json::array({{{"href", onlineResource + std::string(key) + "/?f=json"},
                     {"title", key},



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

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/-/commit/a925d98a48602eb9c1abfff4b35cdff3a3a8cffc
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/20251118/e45e5717/attachment-0001.htm>