MapServer · jmckenna · Jun 2, 2026 · May 7, 2026 · May 7, 2026 · Jun 1, 2026
diff --git a/conf.py b/conf.py
@@ -94,7 +94,7 @@ def __getattr__(cls, name):
 # The short X.Y version.
 version = '8.6'
 # The full version, including alpha/beta/rc tags.
-release = '8.6.3'
+release = '8.6.4'
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 #language = None
@@ -246,6 +246,24 @@ def __getattr__(cls, name):
 # this can be set as a sphinx-build option using `-A BRANCH=main`
 html_context = {'branch': release}
 
+# linkcheck options
+# -----------------
+
+linkcheck_exclude_documents = [
+    r'.*/changelog/.*', 
+    r'.*/rfc/.*', 
+    r'.*/announce/.*',
+    r'.*/announcements/.*'
+]
+
+linkcheck_ignore = [
+    r'https?://localhost(?:\:\d+)?(?:/.*)?$',
+    r'https?://127\.0\.0\.1(?:\:\d+)?(?:/.*)?$',
+    r'https?://myserver(?:\:\d+)?(?:/.*)?$',
+    r'https?://server(?:\:\d+)?(?:/.*)?$',
+    r'https?://example.com(?:\:\d+)?(?:/.*)?$'
+]
+
 # Options for LaTeX output
 # ------------------------
 

diff --git a/en/MIGRATION_GUIDE.txt b/en/MIGRATION_GUIDE.txt
@@ -22,6 +22,11 @@ MapServer Migration Guide
 MapServer 8.4 to 8.6 Migration
 ==============================
 
+- The 8.6.4 release includes fixes for two vulnerabilities, see the advisories:
+
+  - `OpenLayers viewer with WMS <https://github.com/MapServer/MapServer/security/advisories/GHSA-xqj6-vjqr-33vv>`__ advisory
+  - `PostGIS support <https://github.com/MapServer/MapServer/security/advisories/GHSA-xp29-8wp5-wc3p>`__ advisory
+
 - The 8.6.3 release includes a fix for a vulnerability in the SLD parser  
   (see MapServer's `Security Advisory <https://github.com/MapServer/MapServer/security/advisories/GHSA-4h8g-378q-r75m>`__)
 

diff --git a/en/announcements/announcements_archive.txt b/en/announcements/announcements_archive.txt
@@ -4,6 +4,26 @@
  MapServer Announcement Archives
 *****************************************************************************
 
+**2026-06-01 - MapServer 8.6.4 is released**
+
+.. important::  
+   Security release available
+
+The security release of MapServer 8.6.4 has been issued in order to fix
+two vulnerabilities. See the :ref:`changelog <changelog-8-6-4>` 
+for the list of changes. 
+You may also review the security advisories for this release:
+
+1. `OpenLayers viewer with WMS <https://github.com/MapServer/MapServer/security/advisories/GHSA-xqj6-vjqr-33vv>`__ advisory
+2. `PostGIS support <https://github.com/MapServer/MapServer/security/advisories/GHSA-xp29-8wp5-wc3p>`__ advisory
+
+You may also review MapServer's `Security Policy <https://github.com/MapServer/MapServer/blob/main/SECURITY.md>`__.
+As security for the 7.6 branch has ended, and branches 8.4, 8.2 & 8.0 are not supported, 
+all users are strongly encouraged to upgrade to the MapServer 8.6.4 release (see the 
+:ref:`Migration Guide <migration>`).
+
+Head to :ref:`download` to obtain a copy.
+
 **2026-05-07 - MapServer 8.6.3 is released**
 
 .. important::  

diff --git a/en/development/changelog/changelog-8-6.txt b/en/development/changelog/changelog-8-6.txt
@@ -7,6 +7,17 @@
 The summary of major changes for this release can be found in the `HISTORY.md <https://github.com/MapServer/MapServer/blob/branch-8-6/HISTORY.md>`__
 file from the source directory.
 
+.. _changelog-8-6-4:
+
+Changes from 8.6.3 to 8.6.4
+===========================
+
+* PostGIS: make sure identifier value is numeric when the declared type is numeric too ( `#7519 <https://github.com/MapServer/MapServer/issues/7519>`__ ) (Even Rouault) : `65f1b53 <https://github.com/MapServer/MapServer/commit/65f1b53c258df2abdf6ce1f437c29e75e9976247>`__
+* WMS OpenLayers output: properly escape mapserv_onlineresource ( `#7518 <https://github.com/MapServer/MapServer/issues/7518>`__ ) (Even Rouault) : `ff17ef1 <https://github.com/MapServer/MapServer/commit/ff17ef190caaeaa9002ac3d1c7969ec5315c345e>`__
+* cgiutil: fix handling of malformed percent-encoding ( `#7515 <https://github.com/MapServer/MapServer/issues/7515>`__ ) (Stefan Gloor) : `6364c71 <https://github.com/MapServer/MapServer/commit/6364c71bff48d669fd62866ad52e2b1292f23da9>`__
+* PostGIS: fix wfs_use_default_extent_for_getfeature=false and PROCESSING=NATIVE_FILTER ( `#7514 <https://github.com/MapServer/MapServer/issues/7514>`__ ) (Even Rouault) : `6bb14b2 <https://github.com/MapServer/MapServer/commit/6bb14b222fc17ac5d6e322faff85010e81104288>`__
+* Fix incorrect JSON error message output on Index Pages ( `#7513 <https://github.com/MapServer/MapServer/issues/7513>`__ ) (Seth Girvin) : `7f18840 <https://github.com/MapServer/MapServer/commit/7f188405d7a46291206911d853189cb4c09cb38f>`__
+
 .. _changelog-8-6-3:
 
 Changes from 8.6.2 to 8.6.3

diff --git a/en/development/documentation.txt b/en/development/documentation.txt
@@ -8,7 +8,7 @@
 :Contact: hobu.inc at gmail.com
 :Author:  Jeff McKenna
 :Contact: jmckenna at gatewaygeomatics.com
-:Last Updated: 2026-03-29
+:Last Updated: 2026-06-02
 
 .. contents:: Table of Contents
     :depth: 4

diff --git a/en/development/tests/autotest.txt b/en/development/tests/autotest.txt
@@ -8,7 +8,7 @@
 :Contact:      warmerdam at pobox.com
 :Author:       Jeff McKenna
 :Contact:      jmckenna at gatewaygeomatics.com
-:Last Updated: 2026-03-28
+:Last Updated: 2026-06-02
 
 .. contents:: Table of Contents
     :depth: 2
@@ -226,7 +226,7 @@ that fails, for image files, there is an attempt to compare the image checksums
 using the GDAL Python bindings.  If the GDAL Python bindings are not available
 this step is quietly skipped.
 
-If you install the PerceptualDiff program (http://pdiff.sourceforge.net/) and
+If you install the PerceptualDiff program (https://pdiff.sourceforge.net/) and
 it is in the path, then msautotest will attempt to use it as a last fallback
 when comparing images. If images are found to be "perceptually" the same the
 test will pass with the message "result images perceptually match, though

diff --git a/en/development/translation.txt b/en/development/translation.txt
@@ -54,7 +54,7 @@ Starting with Transifex
 Subscribe to Transifex
 -----------------------
 
-You need to subscribe to Transifex before translating. Go to `Transifex subscribing page <https://www.transifex.com/signup/contributor/>`_ and create a new account.
+You need a Transifex account before translating. Go to `Open Source Transifex account page <https://app.transifex.com/signup/open-source/>`_ and create a new account.
 
 .. image:: ../images/documentation/tr_newaccount.png
 
@@ -64,9 +64,9 @@ Find the project
 ----------------
 There are several OSGeo projects hosted on Transifex, here are some of them:
 
-* `MapServer <https://www.transifex.com/organization/mapserver/dashboard>`_
-* `PostGIS <https://www.transifex.com/organization/postgis/dashboard>`_
-* `QGIS <https://www.transifex.com/organization/qgis/dashboard>`_
+* `MapServer <https://explore.transifex.com/mapserver/mapserver-doc/>`_
+* `GeoNetwork <https://explore.transifex.com/geonetwork/core-geonetwork/>`_
+* `QGIS <https://explore.transifex.com/qgis/QGIS/>`_
 
 You can find more in the Transifex website.
 

diff --git a/en/include/announcements.inc b/en/include/announcements.inc
@@ -1,3 +1,23 @@
+**2026-06-01 - MapServer 8.6.4 is released**
+
+.. important::  
+   Security release available
+
+The security release of MapServer 8.6.4 has been issued in order to fix
+two vulnerabilities. See the :ref:`changelog <changelog-8-6-4>` 
+for the list of changes. 
+You may also review the security advisories for this release:
+
+1. `OpenLayers viewer with WMS <https://github.com/MapServer/MapServer/security/advisories/GHSA-xqj6-vjqr-33vv>`__ advisory
+2. `PostGIS support <https://github.com/MapServer/MapServer/security/advisories/GHSA-xp29-8wp5-wc3p>`__ advisory
+
+You may also review MapServer's `Security Policy <https://github.com/MapServer/MapServer/blob/main/SECURITY.md>`__.
+As security for the 7.6 branch has ended, and branches 8.4, 8.2 & 8.0 are not supported, 
+all users are strongly encouraged to upgrade to the MapServer 8.6.4 release (see the 
+:ref:`Migration Guide <migration>`).
+
+Head to :ref:`download` to obtain a copy.
+
 **2026-05-07 - MapServer 8.6.3 is released**
 
 .. important::  

diff --git a/en/input/vector/ogr.txt b/en/input/vector/ogr.txt
@@ -9,7 +9,7 @@ OGR Vector Layers Through MapServer
 
 :Author:       Jeff McKenna
 :Contact:      jmckenna at gatewaygeomatics.com
-:Last Updated: 2026-03-29
+:Last Updated: 2026-06-02
 
 .. contents:: Table of Contents
     :depth: 3
@@ -75,11 +75,10 @@ Here is a list of some of the popular vector formats that are supported:
 - `ArcInfo E00 Coverages`_
 - Atlas BNA (see GDAL `extra-drivers <https://github.com/OSGeo/gdal-extra-drivers>`__)
 - `Comma Separated Value (.csv)`_
-- `DODS/OPeNDAP`_
+- DODS/OPeNDAP (see GDAL `extra-drivers <https://github.com/OSGeo/gdal-extra-drivers>`__)
 - `ESRI Personal GeoDatabase`_
 - `ESRI Shapefiles`_
-- `FMEObjects Gateway`_
-- `Géoconcept Export`_
+- FME (see GDAL `extra-drivers <https://github.com/OSGeo/gdal-extra-drivers>`__)
 - `GeoJSON`_
 - `GeoPackage`_
 - `GeoRSS`_
@@ -88,18 +87,16 @@ Here is a list of some of the popular vector formats that are supported:
 - `GRASS`_
 - `GPX`_
 - `Informix DataBlade`_
-- `INGRES`_
+- INGRES (see GDAL `extra-drivers <https://github.com/OSGeo/gdal-extra-drivers>`__)
 - `INTERLIS`_
 - `KML`_
 - `MapInfo files`_
 - `Memory`_
 - `Microstation DGN files`_
 - `MySQL`_
 - `ODBC`_
-- `OGDI Vectors`_
 - `Oracle Spatial`_
 - `PostgreSQL`_
-- `SDTS`_
 - `SQLite`_
 - `UK.NTF (National Transfer Format)`_
 - `US Census TIGER/Line`_
@@ -1017,33 +1014,27 @@ SISTEMA INFORMATIVO TERRITORIALE ED AMBIENTALE ( http://www.geografia.toscana.it
 .. _`ArcInfo Binary Coverages`: https://gdal.org/drivers/vector/avcbin.html
 .. _`ArcInfo E00 Coverages`: https://gdal.org/drivers/vector/avce00.html
 .. _`Comma Separated Value (.csv)`: https://gdal.org/drivers/vector/csv.html
-.. _`DODS/OPeNDAP`: https://gdal.org/drivers/vector/dods.html
 .. _`DWG`: https://gdal.org/drivers/vector/dwg.html
 .. _`DXF`: https://gdal.org/drivers/vector/dxf.html
 .. _`ESRI Personal GeoDatabase`: https://gdal.org/drivers/vector/pgeo.html
 .. _`ESRI Shapefiles`: https://gdal.org/drivers/vector/shapefile.html
-.. _`FMEObjects Gateway`: https://gdal.org/drivers/vector/fme.html
 .. _`GML`: https://gdal.org/drivers/vector/gml.html
 .. _`GMT`: https://gdal.org/drivers/vector/gmt.html
-.. _`Géoconcept Export`: https://gdal.org/drivers/vector/geoconcept.html
 .. _`GeoJSON`: https://gdal.org/drivers/vector/geojson.html
 .. _`GeoPackage`: https://gdal.org/drivers/vector/gpkg.html
 .. _`GeoRSS`: https://gdal.org/drivers/vector/georss.html
 .. _`GPX`: https://gdal.org/drivers/vector/gpx.html
 .. _`GRASS`: https://gdal.org/drivers/vector/grass.html
 .. _`Informix DataBlade`: https://gdal.org/drivers/vector/idb.html
-.. _`INGRES`: https://gdal.org/drivers/vector/ingres.html
 .. _`INTERLIS`: https://gdal.org/drivers/vector/ili.html
 .. _`KML`: https://gdal.org/drivers/vector/kml.html
 .. _`MapInfo files`: https://gdal.org/drivers/vector/mitab.html
 .. _`Memory`: https://gdal.org/drivers/vector/memory.html
 .. _`Microstation DGN files`: https://gdal.org/drivers/vector/dgn.html
 .. _`MySQL`: https://gdal.org/drivers/vector/mysql.html
-.. _`OGDI Vectors`: https://gdal.org/drivers/vector/ogdi.html
 .. _`ODBC`: https://gdal.org/en/stable/drivers/vector/odbc.html
 .. _`Oracle Spatial`: https://gdal.org/en/stable/drivers/vector/oci.html
 .. _`PostgreSQL`: https://gdal.org/drivers/vector/pg.html
-.. _`SDTS`: https://gdal.org/drivers/vector/sdts.html
 .. _`SQLite`: https://gdal.org/drivers/vector/sqlite.html
 .. _`UK.NTF (National Transfer Format)`: https://gdal.org/drivers/vector/ntf.html
 .. _`US Census TIGER/Line`: https://gdal.org/drivers/vector/tiger.html

diff --git a/en/input/vector/postgis.txt b/en/input/vector/postgis.txt
@@ -6,7 +6,7 @@
 
 :Author:       Jeff McKenna
 :Contact:      jmckenna at gatewaygeomatics.com
-:Last Updated: 2022-04-25
+:Last Updated: 2026-06-02
 
 .. contents:: Table of Contents
     :depth: 3
@@ -422,7 +422,7 @@ Support for SQL/MM Curves
 PostGIS is able to store circular interpolated curves, as part of the
 SQL Multimedia Applications Spatial specification (read about the
 `SQL/MM specification
-<http://subs.emis.de/LNI/Proceedings/Proceedings26/GI-Proceedings.26-17.pdf>`__).
+<https://www.researchgate.net/publication/221323544_SQLMM_Spatial_-_The_Standard_to_Manage_Spatial_Data_in_a_Relational_Database_System>`__).
 
 For more information about PostGIS' support, see the *SQL-MM Part 3*
 section in the PostGIS documentation, such as `here

diff --git a/en/introduction.txt b/en/introduction.txt
@@ -10,7 +10,7 @@ An Introduction to MapServer
 :Contact: david.fawcett at moea.state.mn.us
 :Author: Howard Butler
 :Contact: hobu.inc at gmail.com
-:Last Updated: 2025-04-14
+:Last Updated: 2026-06-02
 
 .. contents::
     :depth: 3
@@ -965,8 +965,9 @@ Tutorial
 Test Suite (msautotest)
 ...............................................................................
 
-`msautotest <https://www.mapserver.org/development/tests/autotest.html/>`__ contains test mapfiles 
-and data for most MapServer functionality.
+The `msautotest <https://github.com/MapServer/MapServer/tree/main/msautotest>`__ 
+folder in the MapServer repository contains test mapfiles and data for most 
+MapServer functionality.
 
 
 Books 

diff --git a/en/mapfile/layer.txt b/en/mapfile/layer.txt
@@ -128,7 +128,7 @@ CONNECTION [string]
     .. WARNING::
        MapServer's native SDE driver was removed for the MapServer 7.0 release 
        (see `discussion <https://lists.osgeo.org/pipermail/mapserver-dev/2015-February/014349.html>`__).
-       SDE support can still be accessed through the `OGR driver <https://gdal.org/drivers/vector/sde.html>`__.    
+       GDAL's SDE driver was removed in the GDAL `3.2.0 release <https://github.com/OSGeo/gdal/blob/v3.2.0/gdal/NEWS>`__.    
 
     .. seealso::
 

diff --git a/en/optimization/environment_variables.txt b/en/optimization/environment_variables.txt
@@ -20,7 +20,7 @@ behavior or specify the location of some resources.
 .. TIP::
    In terms of GDAL, for a good list of GDAL's possible variables to use 
    (to help control data access in MapServer), see the 
-   the main `GDAL site <https://gdal.org/user/configoptions.html#list-of-configuration-options-and-where-they-apply>`__ 
+   the main `GDAL site <https://gdal.org/en/stable/user/configoptions.html#global-configuration-options>`__ 
    (you can also see the `old GDAL wiki <https://web.archive.org/web/20220324035447/https://trac.osgeo.org/gdal/wiki/ConfigOptions>`__).
 
 List of all possible MapServer Environment Variables

diff --git a/en/optimization/tileindex.txt b/en/optimization/tileindex.txt
@@ -10,7 +10,7 @@
 :Author: Jeff McKenna
 :Contact: jmckenna at gatewaygeomatics.com
 :Original Author: HostGIS
-:Last Updated: 2021-03-23
+:Last Updated: 2026-06-02
 
 .. contents:: Table of Contents
     :depth: 2
@@ -58,7 +58,7 @@ named *tileindex-tiger.shp*:
     ogrtindex tileindex-tiger.shp tiger/CA/*.shp tiger/NV/*.shp
 
 If your data files are in different subfolders, you can use the *--optfile* 
-switch for `vectors <https://gdal.org/programs/vector_common_options.html#cmdoption-optfile>`__ 
+switch for `vectors <https://gdal.org/en/stable/programs/vector_common_options.html#cmdoption-vector_common_options-optfile>`__ 
 or `rasters <https://gdal.org/programs/raster_common_options.html#raster-common-options-optfile>`__ 
 to pass a file list to ogrtindex/gdaltindex, such as:
 

diff --git a/en/tinyows/servertuning.txt b/en/tinyows/servertuning.txt
@@ -8,11 +8,11 @@ Server Tuning: How to speed up your TinyOWS server
 Tips and Tricks for PostgreSQL / PostGIS databases
 -----------------------------------------------------------------------------
  * Use Spatial Indexes on your geometry/geography columns
-   `PostGIS Spatial Indexes <http://postgis.refractions.net/docs/ch04.html#id2628096>`_.
+   `PostGIS Spatial Indexes <https://postgis.net/docs/using_postgis_dbmanagement.html#build-indexes>`_.
  * Index any column that could be used frequently as a filter
- * General `PostGIS Performance tips <http://postgis.refractions.net/docs/ch06.html>`_
- * General `PostgreSQL Performance tips <http://wiki.postgresql.org/wiki/Performance_Optimization>`_
- * `Even more tips on Tuning PostgreSQL <http://wiki.postgresql.org/wiki/Tuning_Your_PostgreSQL_Server>`_
+ * General `PostGIS Performance tips <https://postgis.net/docs/performance_tips.html>`_
+ * General `PostgreSQL Performance tips <https://wiki.postgresql.org/wiki/Performance_Optimization>`_
+ * `Even more tips on Tuning PostgreSQL <https://wiki.postgresql.org/wiki/Tuning_Your_PostgreSQL_Server>`_
 
 Tips and Tricks for Apache
 -----------------------------------------------------------------------------
@@ -64,7 +64,7 @@ Fast-CGI in MS4W
 
 HTTP GZip compression
 -----------------------------------------------------------------------------
-* In Apache, activate `mod_deflate <http://httpd.apache.org/docs/2.0/mod/mod_deflate.html>`_
+* In Apache, activate `mod_deflate <https://httpd.apache.org/docs/current/mod/mod_deflate.html>`_
 * Deflate basic configuration, (note we're including xml so gml and json):
 
     ::

diff --git a/en/tinyows/userdocumentation.txt b/en/tinyows/userdocumentation.txt
@@ -19,4 +19,4 @@ OpenLayersHowToTransactional
 LibxmlSchemaGmlBug
 
 == External documents ==
-  * (French) Utiliser TinyOWS comme serveur WFS-T: http://www.geotribu.net/node/264
+  * (French) `Utiliser TinyOWS comme serveur WFS-T <https://web.archive.org/web/20120519072836/http://www.geotribu.net/node/264>`__