From: Paul J. Reder <rederpj@apache.org>
Date: Tue, 25 Nov 2003 17:23:31 +0000 (+0000)
Subject: Merge this fix from 2.1-dev:
X-Git-Tag: 2.0.49~344
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=82e593cdc408ee9397a43fe5bbc8adb09c1e8df5;p=thirdparty%2Fapache%2Fhttpd.git

Merge this fix from 2.1-dev:

*) mod_expires: Initialize ExpiresDefault to NULL instead of "" to
   avoid reporting an Internal Server error if it is used without
   having been set in the httpd.conf file. PR: 23748, 24459

   Reviewed by: Andre Malo and Jeff Trawick.


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

diff --git a/CHANGES b/CHANGES
index 64ff5ae4c64..f400e00ee00 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,10 @@
 Changes with Apache 2.0.49
 
+  *) mod_expires: Initialize ExpiresDefault to NULL instead of "" to
+     avoid reporting an Internal Server error if it is used without
+     having been set in the httpd.conf file. PR: 23748, 24459
+     [Andre Malo, Liam Quinn  <liam htmlhelp.com>]
+
   *) mod_autoindex: Don't omit the <tr> start tag if the SuppressIcon
      option is set. PR 21668.  [Jesse Tie-Ten-Quee <highos highos.com>]
 
diff --git a/STATUS b/STATUS
index ddcce02de00..882da9e4e4c 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/11/25 15:39:52 $]
+Last modified at [$Date: 2003/11/25 17:23:30 $]
 
 Release:
 
@@ -74,13 +74,6 @@ PATCHES TO BACKPORT FROM 2.1
   [ please place file names and revisions from HEAD here, so it is easy to
     identify exactly what the proposed changes are! ]
 
-    * mod_expires: Initialize ExpiresDefault to NULL instead of "" to
-      avoid reporting an Internal Server error if it is used without
-      having been set in the httpd.conf file. PR: 23748, 24459
-      http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/metadata/mod_expires.c.diff?r1=1.46&r2=1.47
-      http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/metadata/mod_expires.c.diff?r1=1.47&r2=1.48
-      +1: rederpj, nd, trawick
-
     * Make Win32 MPM honor MaxMemFree for transaction pools
       server/mpm/winnt/child.c: r1.17
       server/mpm/winnt/mpm.h: r1.14
diff --git a/modules/metadata/mod_expires.c b/modules/metadata/mod_expires.c
index 1b5691fec8b..1585926bcaf 100644
--- a/modules/metadata/mod_expires.c
+++ b/modules/metadata/mod_expires.c
@@ -227,7 +227,7 @@ static void *create_dir_expires_config(apr_pool_t *p, char *dummy)
     expires_dir_config *new =
     (expires_dir_config *) apr_pcalloc(p, sizeof(expires_dir_config));
     new->active = ACTIVE_DONTCARE;
-    new->expiresdefault = "";
+    new->expiresdefault = NULL;
     new->expiresbytype = apr_table_make(p, 4);
     return (void *) new;
 }
@@ -404,7 +404,7 @@ static void *merge_expires_dir_configs(apr_pool_t *p, void *basev, void *addv)
         new->active = add->active;
     }
 
-    if (add->expiresdefault[0] != '\0') {
+    if (add->expiresdefault != NULL) {
         new->expiresdefault = add->expiresdefault;
     }
     else {