svn commit: r570093 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS modules/metadata/mod_expires.c

[ni...@apache.org]

Author: niq
Date: Mon Aug 27 05:54:29 2007
New Revision: 570093

URL: http://svn.apache.org/viewvc?rev=570093&view=rev
Log:
Backport mod_expires fix, and delete outdated comment from STATUS

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/metadata/mod_expires.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=570093&r1=570092&r2=570093&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Mon Aug 27 05:54:29 2007
@@ -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

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=570093&r1=570092&r2=570093&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Mon Aug 27 05:54:29 2007
@@ -157,10 +157,6 @@
       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 @@
       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]

Modified: httpd/httpd/branches/2.2.x/modules/metadata/mod_expires.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/metadata/mod_expires.c?rev=570093&r1=570092&r2=570093&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/metadata/mod_expires.c (original)
+++ httpd/httpd/branches/2.2.x/modules/metadata/mod_expires.c Mon Aug 27 05:54:29 2007
@@ -321,6 +321,9 @@
     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;
     }