Skip to content

Commit d16e238

Browse files
authored
Update PROJ_DATA and MS_MAP_BAD_PATTERN (#1020)
1 parent 4782246 commit d16e238

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

en/installation/iis.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ copied in:
187187
# MS_MAP_PATTERN "^(C:)?\/MapServer\/apps\/((?!\.{2})[_A-Za-z0-9\-\.]+\/{1})*([_A-Za-z0-9\-\.]+\.(map))$"
188188

189189
# path to the Proj4 projection files
190-
PROJ_LIB "C:/MapServer/bin/proj7/SHARE"
190+
PROJ_DATA "C:/MapServer/bin/proj9/SHARE"
191191

192192
# point to the certs file for HTTPS access to OWS servers
193193
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
244244
MAP
245245
EXTENT -180 -90 180 90
246246
# Set the path to where the map projections are stored
247-
CONFIG "PROJ_LIB" "C:\MapServer\bin\proj\SHARE"
247+
CONFIG "PROJ_DATA" "C:\MapServer\bin\proj\SHARE"
248248
NAME "TestMap"
249249
WEB
250250
METADATA
@@ -442,9 +442,9 @@ Common error messages and how to resolve them are listed below.
442442

443443
msLoadMap(): Unable to access file. (C:/MapServer/apps/test/test.map)
444444

445-
+ 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
445+
+ 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
446446
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...`.
447-
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.
447+
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.
448448
*Note on one installation this message was shown as forward slashes rather than backslashes were used.*
449449

450450
.. code-block:: bat

en/mapfile/config.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ A full sample config file is shown below:
121121
#
122122
# MS_MAP_NO_PATH "1"
123123
MS_MAP_PATTERN "^/opt/mapserver" ## required when referencing mapfiles by path
124-
# MS_MAP_BAD_PATTERN "[/\\]{2}|[/\\]?\\.+[/\\]|,"
124+
# MS_MAP_BAD_PATTERN "[/\\\\]{2}|[/\\\\]?\\.+[/\\\\]|,"
125125

126126
#
127127
# Global Log/Debug Setup

en/ogc/wms_server.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2201,7 +2201,7 @@ to return HTTP 4xx or 5xx status codes in case of error.
22012201
#
22022202
# MS_MAP_NO_PATH "1"
22032203
MS_MAP_PATTERN "^/opt/mapserver" ## required when referencing mapfiles by path
2204-
# MS_MAP_BAD_PATTERN "[/\\]{2}|[/\\]?\\.+[/\\]|,"
2204+
# MS_MAP_BAD_PATTERN "[/\\\\]{2}|[/\\\\]?\\.+[/\\\\]|,"
22052205

22062206
# Enable HTTP status code 4xx and 5xx in case of errors on WMS requests
22072207
MS_WMS_ERROR_STATUS_CODE "ON"

en/optimization/environment_variables.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ MS_MAP_BAD_PATTERN
178178
*MS_MAP_BAD_PATTERN* of:
179179
::
180180

181-
[/\\]{2}|[/\\]?\\.+[/\\]|,
181+
[/\\\\]{2}|[/\\\\]?\\.+[/\\\\]|,
182182

183183
which will therefore not allow "/../" or "//" in the map value.
184184

en/optimization/limit_mapfile_access.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ generated. By default all MapServer installations (since 7.6.3) set a
5252
hardcoded value for *MS_MAP_BAD_PATTERN* of:
5353
::
5454

55-
[/\\]{2}|[/\\]?\\.+[/\\]|,
55+
[/\\\\]{2}|[/\\\\]?\\.+[/\\\\]|,
5656

5757
which will therefore not allow "/../" or "//" in the map value.
5858

0 commit comments

Comments
 (0)