From: Ben Laurie <ben@apache.org>
Date: Mon, 28 May 2001 15:49:17 +0000 (+0000)
Subject: Merging was bollocks.
X-Git-Tag: 2.0.19~169
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75c38c984e1d9b28c299726a2ddcda214cddce49;p=thirdparty%2Fapache%2Fhttpd.git

Merging was bollocks.


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

diff --git a/modules/metadata/mod_expires.c b/modules/metadata/mod_expires.c
index 068c03cf2ed..ce53f5ec6d7 100644
--- a/modules/metadata/mod_expires.c
+++ b/modules/metadata/mod_expires.c
@@ -402,11 +402,14 @@ static void *merge_expires_dir_configs(apr_pool_t *p, void *basev, void *addv)
     }
     else {
         new->active = add->active;
-    };
+    }
 
-    if (add->expiresdefault != '\0') {
+    if (add->expiresdefault[0] != '\0') {
         new->expiresdefault = add->expiresdefault;
-    };
+    }
+    else {
+	new->expiresdefault = base->expiresdefault;
+    }
 
     new->expiresbytype = apr_table_overlay(p, add->expiresbytype,
                                         base->expiresbytype);