Merge branch 'branch-6-2'

MapServer · Aug 30, 2012 · 3c03546 · 3c03546
2 parents b1565a1 + 175c6c1
commit 3c03546
Show file tree

Hide file tree

Showing 9 changed files with 1,351 additions and 1,325 deletions.
diff --git a/HISTORY.TXT b/HISTORY.TXT
@@ -14,6 +14,10 @@ For a complete change history, please see the Git log comments.
 Current Version (git master, 6.3-dev, future 6.4):
 --------------------------------------------------
 
+- 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

diff --git a/mapows.h b/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