mod_expires: Don't report an Internal Server error if ExpiresDefault

is used and has not been set in the httpd.conf file. PR: 23748, 24459

Submitted: Liam Quinn  <liam htmlhelp.com>
Reviewed: Paul J. Reder

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

diff --git a/CHANGES b/CHANGES
index b8703b81062a5d110183b94b9f5b596871dc7102..d3bc1a0e45f32f1987d99c07b515f4744a76295c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) mod_expires: Don't report an Internal Server error if ExpiresDefault
+     is used and has not been set in the httpd.conf file. PR: 23748, 24459
+     [Liam Quinn  <liam htmlhelp.com>]
+
   *) mod_logio: Account for some bytes handed to the network layer prior to
      dropped connections.  [Jeff Trawick]
 

diff --git a/modules/metadata/mod_expires.c b/modules/metadata/mod_expires.c
index 47530a34c9d0faa65030a3b5ad65512bd2da9189..d7445ad634563e9f76839b38279fae8aaa0a2d47 100644 (file)
--- a/modules/metadata/mod_expires.c
+++ b/modules/metadata/mod_expires.c
@@ -548,7 +548,8 @@ static apr_status_t expires_filter(ap_filter_t *f,
                 expiry = conf->expiresdefault;
             }
         }
-        if (expiry != NULL) {
+        /* != '\0' covers the case where ExpiresDefault is not user defined. */
+        if (expiry != NULL && expiry[0] != '\0') {
             set_expiration_fields(r, expiry, t);
         }
     }