[SCM] mapserver branch, master, updated. upstream/6.2.1-58-g2519c98

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 88a24c2f9259913913315ef2d294da32401b079f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jun 15 00:49:29 2013 +0200

    Add mapows-contenttype.patch to handle Content-Type headers with a charset appended.

diff --git a/debian/changelog b/debian/changelog
index 7e656da..7c4affa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ mapserver (6.2.1-3) UNRELEASED; urgency=low
   * shp2mysql was removed, no more perl in mapserver-bin.
   * Use --install-layout=deb for python setup.py.
   * Update configure arguments (several no longer supported).
+  * Add mapows-contenttype.patch to handle Content-Type headers with a
+    charset appended.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 14 Jun 2013 22:00:07 +0200
 
diff --git a/debian/patches/mapows-contenttype.patch b/debian/patches/mapows-contenttype.patch
new file mode 100644
index 0000000..78ffcca
--- /dev/null
+++ b/debian/patches/mapows-contenttype.patch
@@ -0,0 +1,16 @@
+Description: Handle Content-Type HTTP headers with a charset appended.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+Bug: https://github.com/mapserver/mapserver/pull/4663
+Applied-Upstream: 6.2.2, https://github.com/mapserver/mapserver/commit/72a9a19831c2e434e7beb0fc55acadbfdc26cfd1
+Last-Update: 2013-06-04
+--- a/mapows.c
++++ b/mapows.c
+@@ -95,7 +95,7 @@ static int msOWSPreParseRequest(cgiReque
+                                 owsRequestObj *ows_request)
+ {
+   /* decide if KVP or XML */
+-  if (request->type == MS_GET_REQUEST || (request->type == MS_POST_REQUEST && strcmp(request->contenttype, "application/x-www-form-urlencoded")==0)) {
++  if (request->type == MS_GET_REQUEST || (request->type == MS_POST_REQUEST && strncmp(request->contenttype, "application/x-www-form-urlencoded", strlen("application/x-www-form-urlencoded")) == 0)) {
+     int i;
+     /* parse KVP parameters service, version and request */
+     for (i = 0; i < request->NumParams; ++i) {
diff --git a/debian/patches/series b/debian/patches/series
index 73cca95..f4c9173 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 fixmapscriptvars.patch
 php_segfault
 debian-changes-6.2.1-1
+mapows-contenttype.patch

-- 
Mapserver