From fc68548b82cf3a39d79e42bba92c0221f46fa7f7 Mon Sep 17 00:00:00 2001
From: sethg <sethg@geographika.co.uk>
Date: Mon, 12 May 2025 21:57:26 +0200
Subject: [PATCH] Update PROJ_DATA and MS_MAP_BAD_PATTERN

---
 en/installation/iis.txt                   | 8 ++++----
 en/mapfile/config.txt                     | 2 +-
 en/ogc/wms_server.txt                     | 2 +-
 en/optimization/environment_variables.txt | 2 +-
 en/optimization/limit_mapfile_access.txt  | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/en/installation/iis.txt b/en/installation/iis.txt
index 5b430d4c8aa..1b643d33e9a 100644
--- a/en/installation/iis.txt
+++ b/en/installation/iis.txt
@@ -187,7 +187,7 @@ copied in:
         # MS_MAP_PATTERN "^(C:)?\/MapServer\/apps\/((?!\.{2})[_A-Za-z0-9\-\.]+\/{1})*([_A-Za-z0-9\-\.]+\.(map))$"
         
         # path to the Proj4 projection files
-        PROJ_LIB "C:/MapServer/bin/proj7/SHARE" 
+        PROJ_DATA "C:/MapServer/bin/proj9/SHARE" 
         
         # point to the certs file for HTTPS access to OWS servers
         CURL_CA_BUNDLE "C:\MapServer\bin\curl\curl-ca-bundle.crt"
@@ -244,7 +244,7 @@ Now create a new `test.map` file in this folder and paste in the test Mapfile be
     MAP
         EXTENT -180 -90 180 90
         # Set the path to where the map projections are stored
-        CONFIG "PROJ_LIB" "C:\MapServer\bin\proj\SHARE"
+        CONFIG "PROJ_DATA" "C:\MapServer\bin\proj\SHARE"
         NAME "TestMap"
         WEB
           METADATA
@@ -442,9 +442,9 @@ Common error messages and how to resolve them are listed below.
 
     msLoadMap(): Unable to access file. (C:/MapServer/apps/test/test.map)
 
-+ MapServer projections are stored in ``C:\MapServer\bin\proj\SHARE`` (or ``C:\MapServer\bin\proj6\SHARE`` when using PROJ 6). When the projection is specified 
++ MapServer projections are stored in ``C:\MapServer\bin\proj\SHARE`` (or ``C:\MapServer\bin\proj9\SHARE`` when using PROJ 9). When the projection is specified 
   in the following form `"init=epsg:3857"`, MapServer will try to find this code in the `epsg` file, where it is listed as `<3857> +proj=merc +a=6378137...`. 
-  If you receive the error below then make sure the ``CONFIG "PROJ_LIB" "C:\MapServer\bin\proj\SHARE"`` setting is pointing to the correct path. 
+  If you receive the error below then make sure the ``CONFIG "PROJ_DATA" "C:\MapServer\bin\proj\SHARE"`` setting is pointing to the correct path. 
   *Note on one installation this message was shown as forward slashes rather than backslashes were used.*
 
   .. code-block:: bat
diff --git a/en/mapfile/config.txt b/en/mapfile/config.txt
index 41138acf945..6e7a4af8649 100644
--- a/en/mapfile/config.txt
+++ b/en/mapfile/config.txt
@@ -121,7 +121,7 @@ A full sample config file is shown below:
       #
       # MS_MAP_NO_PATH "1"
       MS_MAP_PATTERN "^/opt/mapserver" ## required when referencing mapfiles by path
-      # MS_MAP_BAD_PATTERN "[/\\]{2}|[/\\]?\\.+[/\\]|,"
+      # MS_MAP_BAD_PATTERN "[/\\\\]{2}|[/\\\\]?\\.+[/\\\\]|,"
       
       #
       # Global Log/Debug Setup
diff --git a/en/ogc/wms_server.txt b/en/ogc/wms_server.txt
index 87104a0c7e9..99d6271c63d 100644
--- a/en/ogc/wms_server.txt
+++ b/en/ogc/wms_server.txt
@@ -2201,7 +2201,7 @@ to return HTTP 4xx or 5xx status codes in case of error.
       #
       # MS_MAP_NO_PATH "1"
       MS_MAP_PATTERN "^/opt/mapserver" ## required when referencing mapfiles by path
-      # MS_MAP_BAD_PATTERN "[/\\]{2}|[/\\]?\\.+[/\\]|,"
+      # MS_MAP_BAD_PATTERN "[/\\\\]{2}|[/\\\\]?\\.+[/\\\\]|,"
 
       # Enable HTTP status code 4xx and 5xx in case of errors on WMS requests
       MS_WMS_ERROR_STATUS_CODE "ON"
diff --git a/en/optimization/environment_variables.txt b/en/optimization/environment_variables.txt
index 0e35297ab93..164f7988fbb 100644
--- a/en/optimization/environment_variables.txt
+++ b/en/optimization/environment_variables.txt
@@ -178,7 +178,7 @@ MS_MAP_BAD_PATTERN
    *MS_MAP_BAD_PATTERN* of:
    ::
 
-    [/\\]{2}|[/\\]?\\.+[/\\]|,
+    [/\\\\]{2}|[/\\\\]?\\.+[/\\\\]|,
   
    which will therefore not allow "/../" or "//" in the map value.
 
diff --git a/en/optimization/limit_mapfile_access.txt b/en/optimization/limit_mapfile_access.txt
index e2e7f97a9f8..de082806f29 100644
--- a/en/optimization/limit_mapfile_access.txt
+++ b/en/optimization/limit_mapfile_access.txt
@@ -52,7 +52,7 @@ generated.  By default all MapServer installations (since 7.6.3) set a
 hardcoded value for *MS_MAP_BAD_PATTERN* of:
 ::
 
-  [/\\]{2}|[/\\]?\\.+[/\\]|,
+  [/\\\\]{2}|[/\\\\]?\\.+[/\\\\]|,
   
 which will therefore not allow "/../" or "//" in the map value.