Merge branch 'branch-6-0' into branch-6-2

Conflicts:
	mapwcs.h
	mapwcs20.c

Author: Schpidi

HISTORY.TXT

@@ -16,6 +16,8 @@ Current Version (future 6.2.0-beta2, GIT branch-6-2):
 
 - Fix segfault in queryByFilter function in PHP/MapScript
 
+- Adjusted WCS 2.0 to WCS Core 2.0.1 and GMLCOV 1.0.1 corrigenda (#4003)
+
 - Adjusted mediatype to multipart/related in WCS 2.0 (#4003)
 
 - Fix symbolObj.getImage seg fault in PHP/MapScript

mapows.h

@@ -144,6 +144,7 @@ MS_DLL_EXPORT int msOWSParseRequestMetadata(const char *metadata, const char *re
 #define OWS_1_1_2   0x010102
 #define OWS_1_3_0   0x010300
 #define OWS_2_0_0   0x020000
+#define OWS_2_0_1   0x020001
 #define OWS_VERSION_MAXLEN   20  /* Buffer size for msOWSGetVersionString() */
 #define OWS_VERSION_NOTSET    -1
 #define OWS_VERSION_BADFORMAT -2