Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 28 May 2001 15:49:19 -0000
Message-ID: <20010528154919.74923.qmail@apache.org>
From: ben@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/modules/metadata mod_expires.c

ben         01/05/28 08:49:19

  Modified:    modules/metadata mod_expires.c
  Log:
  Merging was bollocks.
  
  Revision  Changes    Path
  1.32      +6 -3      httpd-2.0/modules/metadata/mod_expires.c
  
  Index: mod_expires.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_expires.c,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- mod_expires.c	2001/02/16 04:26:41	1.31
  +++ mod_expires.c	2001/05/28 15:49:17	1.32
  @@ -402,11 +402,14 @@
       }
       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);