[SCM] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 6897e8652cdd90e6d27c330bd03d89e802fb3933
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Sep 1 17:35:32 2013 +0200

    Drop obsolete patch: mapows-contenttype.patch.

diff --git a/debian/changelog b/debian/changelog
index 2e389c1..5737efe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ mapserver (6.4.0~beta2-1) UNRELEASED; urgency=low
   * Drop patches:
     - fixmapscriptvars.patch (mapscriptvars no longer used)
     - php_segfault.patch (applied upstream)
+    - mapows-contenttype.patch (applied upstream)
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sun, 01 Sep 2013 14:14:54 +0200
 
diff --git a/debian/patches/mapows-contenttype.patch b/debian/patches/mapows-contenttype.patch
deleted file mode 100644
index 78ffcca..0000000
--- a/debian/patches/mapows-contenttype.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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 fe578cb..f7d70be 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-mapows-contenttype.patch
 hardening.patch
 shp2img-typo.patch
 ruby-shebang.patch

-- 
Packaging for MapServer