Commit 1034a2ae authored by Ben Laurie's avatar Ben Laurie
Browse files

Merging was bollocks. 


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

modules/metadata/mod_expires.c

+6 −3
Original line number Diff line number Diff line
@@ -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);