Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 25 Nov 2003 17:23:32 -0000
Message-ID: <20031125172332.49133.qmail@minotaur.apache.org>
From: rederpj@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/modules/metadata mod_expires.c

rederpj     2003/11/25 09:23:32

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               modules/metadata Tag: APACHE_2_0_BRANCH mod_expires.c
  Log:
  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.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.184 +5 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.183
  retrieving revision 1.988.2.184
  diff -u -r1.988.2.183 -r1.988.2.184
  --- CHANGES	21 Nov 2003 23:51:53 -0000	1.988.2.183
  +++ CHANGES	25 Nov 2003 17:23:30 -0000	1.988.2.184
  @@ -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>]
   
  
  
  
  1.751.2.563 +1 -8      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.562
  retrieving revision 1.751.2.563
  diff -u -r1.751.2.562 -r1.751.2.563
  --- STATUS	25 Nov 2003 15:39:52 -0000	1.751.2.562
  +++ STATUS	25 Nov 2003 17:23:30 -0000	1.751.2.563
  @@ -74,13 +74,6 @@
     [ 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
  
  
  
  No                   revision
  No                   revision
  1.39.2.5  +2 -2      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.39.2.4
  retrieving revision 1.39.2.5
  diff -u -r1.39.2.4 -r1.39.2.5
  --- mod_expires.c	31 May 2003 21:54:08 -0000	1.39.2.4
  +++ mod_expires.c	25 Nov 2003 17:23:31 -0000	1.39.2.5
  @@ -227,7 +227,7 @@
       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 @@
           new->active = add->active;
       }
   
  -    if (add->expiresdefault[0] != '\0') {
  +    if (add->expiresdefault != NULL) {
           new->expiresdefault = add->expiresdefault;
       }
       else {