From: Nick Kew <niq@apache.org>
Date: Mon, 27 Aug 2007 12:54:29 +0000 (+0000)
Subject: Backport mod_expires fix, and delete outdated comment from STATUS
X-Git-Tag: 2.2.6~109
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f419dd4199a49e745532cdd149fd23574159b6ef;p=thirdparty%2Fapache%2Fhttpd.git

Backport mod_expires fix, and delete outdated comment from STATUS


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@570093 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 2dcaa43ca19..ddb17f5822a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.6
 
+  *) mod_expires: don't crash on bad configuration data
+     PR 43213 [Julien Perez <julien.perez epsylonia.net>]
+
   *) mod_dbd: Introduce configuration groups to allow inheritance by virtual
      hosts of database configurations from the main server.  Determine the
      minimal set of distinct configurations and share connection pools
diff --git a/STATUS b/STATUS
index 61a7c3ee216..f12b15ed9af 100644
--- a/STATUS
+++ b/STATUS
@@ -157,10 +157,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       Backport version for 2.2.x of patch:
          Trunk version of patch works
       +1: rpluem, jim
-      -0.5: niq - This (ProxySet) needs documenting. 
-            Reviewing it 'blind' lacks appeal.
-            jim: ProxySet is now documented... Nick can you
-            review your vote?
 
     * mod_proxy: Allow optional name=value options within <Proxy section line.
       Additional arguments are allowed only for 'standard' url's, meaning that
@@ -212,11 +208,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       http://svn.apache.org/viewvc?view=rev&revision=565671
       +1: niq
 
-    * mod_expires: Don't crash on bad configuration data
-      PR: 43213
-      http://svn.apache.org/viewvc?view=rev&revision=569622
-      +1: niq, rpluem, jim
- 
     * log core: ensure we use a special pool for stderr logging, so that
       the stderr channel remains valid from the time plog is destroyed,
       until the time the open_logs hook is called again.  [William Rowe]
diff --git a/modules/metadata/mod_expires.c b/modules/metadata/mod_expires.c
index caf9b2b70c3..984ee9312a7 100644
--- a/modules/metadata/mod_expires.c
+++ b/modules/metadata/mod_expires.c
@@ -321,6 +321,9 @@ static const char *set_expiresbytype(cmd_parms *cmd, void *in_dir_config,
     const char *check;
 
     check = ap_strrchr_c(mime, '/');
+    if (check == NULL) {
+        return "Invalid mimetype: should contain a slash";
+    }
     if ((strlen(++check) == 1) && (*check == '*')) {
         dir_config->wildcards = 1;
     }