From: Nick Kew <niq@apache.org>
Date: Mon, 19 Jul 2010 18:49:32 +0000 (+0000)
Subject: mod_include: recognise "text/html; parameters" as text/html
X-Git-Tag: 2.3.7~79
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f7669f768aed632a73dc735b7db4bcc62d659eac;p=apache

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 9e4bb8f8f2..70de85207c 100644
--- 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 25dcedbfb2..2931b46b01 100644
--- 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;
         }
     }