[SCM] mapserver branch, wheezy, updated. upstream/6.0.1-35-g02769dd

[Bas Couwenberg]

The following commit has been merged in the wheezy branch:
commit 085279a1ce6af4e409e1f7068f1d51dc95b40834
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Jul 23 23:51:42 2013 +0200

    Cherry pick fix for strict Content-Type matching from v6.2.1.

diff --git a/debian/changelog b/debian/changelog
index 4b21a7e..bada3e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ mapserver (6.0.1-4) unstable; urgency=low
   [ Bas Couwenberg ]
   * Link executables with -ldl. Thanks Colin Watson for the patch.
     (closes: #709186)
+  * Cherry pick fix for strict Content-Type matching from v6.2.1:
+    https://github.com/faegi/mapserver/commit/426193cf5f6b34c97cceef2aca4649c604756cd0
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 14 Mar 2012 21:43:53 +0100
 
diff --git a/debian/patches/contenttype b/debian/patches/contenttype
new file mode 100644
index 0000000..9c5c4be
--- /dev/null
+++ b/debian/patches/contenttype
@@ -0,0 +1,21 @@
+Description: Fix parsing POST request when Content-Type has an encoding appended.
+Origin: https://github.com/faegi/mapserver/commit/426193cf5f6b34c97cceef2aca4649c604756cd0
+Bug: https://github.com/mapserver/mapserver/pull/4585
+Last-Update 2013-05-09
+--- a/cgiutil.c	2013-05-09 03:05:00.000000000 +0200
++++ b/cgiutil.c	2013-05-09 03:07:25.000000000 +0200
+@@ -166,8 +166,12 @@
+ 
+     /* if the content_type is application/x-www-form-urlencoded, 
+        we have to parse it like the QUERY_STRING variable */
+-    if(strcmp(request->contenttype, "application/x-www-form-urlencoded") == 0)   
+-    {
++    //if(strcmp(request->contenttype, "application/x-www-form-urlencoded") == 0) {
++    /*
++     * Cherry picked fix for strict Content-Type matching from:
++     * https://github.com/faegi/mapserver/commit/426193cf5f6b34c97cceef2aca4649c604756cd0
++     */
++    if(strncmp(request->contenttype, "application/x-www-form-urlencoded", strlen("application/x-www-form-urlencoded")) == 0) {
+       while( data_len > 0 && isspace(post_data[data_len-1]) )
+         post_data[--data_len] = '\0';
+ 
diff --git a/debian/patches/series b/debian/patches/series
index d6df403..38b6725 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 fixgeos
 php54
 multiarch-libgd
+contenttype

-- 
Packaging for MapServer