core:

Be less strict when checking whether Content-Type is set to "application/x-www-form-urlencoded"
when parsing POST data, or we risk losing data with an appended charset.

PR 53698
Reported by: Petter Berntsen < sluggr gmail.com >

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1372054 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 09061c2e36090b9eff193445aab8d5d9ad1727d1..3aa14a9205a7c8b504aac952c23a7f410c7e0b67 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,11 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) core: Be less strict when checking whether Content-Type is set to 
+     "application/x-www-form-urlencoded" when parsing POST data, 
+     or we risk losing data with an appended charset. PR 53698
+     [Petter Berntsen <sluggr gmail.com>]
+
   *) Windows: Fix SSL failures on windows with AcceptFilter https none.
      PR: 52476.  [Jeff Trawick]
 

diff --git a/server/util.c b/server/util.c
index fd9425c78953aa64f0cbccb50f36a6a33b573df3..b1eb35ce6097a1611989e81805b6e8ca6e1a0cae 100644 (file)
--- a/server/util.c
+++ b/server/util.c
@@ -2406,7 +2406,7 @@ AP_DECLARE(int) ap_parse_form_data(request_rec *r, ap_filter_t *f,
 
     /* sanity check - we only support forms for now */
     ct = apr_table_get(r->headers_in, "Content-Type");
-    if (!ct || strcmp("application/x-www-form-urlencoded", ct)) {
+    if (!ct || ap_strcmp_match(ct, "application/x-www-form-urlencoded*")) {
         return ap_discard_request_body(r);
     }