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 068c03cf2ed54a222917e1e8ac3a2c2b09321417..ce53f5ec6d7868bcbd38f7dab7e686c341c8d705 100644 (file)
--- 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);