mod_include: recognise "text/html; parameters" as text/html

PR 49616
diagnosed by Andrey Chernov

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

diff --git a/CHANGES b/CHANGES
index 9e4bb8f8f23c8bc3ddbd82b4199f71ff1f8ff51f..70de85207c00b67d7feb01926ea7df0b8871ea92 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -26,6 +26,9 @@ Changes with Apache 2.3.7
 
   *) mod_rewrite: Remove superfluous EOL from rewrite logging. [Rainer Jung]
 
+  *) mod_include: recognise "text/html; parameters" as text/html
+     PR 49616 [Andrey Chernov <ache nagual.pp.ru>]
+
 Changes with Apache 2.3.6
 
   *) SECURITY: CVE-2009-3555 (cve.mitre.org)

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index 25dcedbfb2af6acea1831197a8444efa538ae13e..2931b46b017c1df3ed2871b75144d9b95d82ec68 100644 (file)
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -3096,7 +3096,7 @@ static int include_fixup(request_rec *r)
             return DECLINED;
         }
 
-        if (!r->content_type || strcmp(r->content_type, "text/html")) {
+        if (!r->content_type || strncmp(r->content_type, "text/html", 9)) {
             return DECLINED;
         }
     }