httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rede...@apache.org
Subject cvs commit: httpd-2.0/modules/metadata mod_expires.c
Date Fri, 21 Nov 2003 23:37:05 GMT
rederpj     2003/11/21 15:37:05

  Modified:    .        CHANGES
               modules/metadata mod_expires.c
  Log:
  mod_expires: Don't report an Internal Server error if ExpiresDefault
  is used and has not been set in the httpd.conf file. PR: 23748, 24459
  
  Submitted: Liam Quinn  <liam htmlhelp.com>
  Reviewed: Paul J. Reder
  
  Revision  Changes    Path
  1.1321    +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1320
  retrieving revision 1.1321
  diff -u -r1.1320 -r1.1321
  --- CHANGES	21 Nov 2003 15:02:04 -0000	1.1320
  +++ CHANGES	21 Nov 2003 23:37:05 -0000	1.1321
  @@ -2,6 +2,10 @@
   
     [Remove entries to the current 2.0 section below, when backported]
   
  +  *) mod_expires: Don't report an Internal Server error if ExpiresDefault
  +     is used and has not been set in the httpd.conf file. PR: 23748, 24459
  +     [Liam Quinn  <liam htmlhelp.com>]
  +
     *) mod_logio: Account for some bytes handed to the network layer prior to
        dropped connections.  [Jeff Trawick]
   
  
  
  
  1.47      +2 -1      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.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- mod_expires.c	2 Jun 2003 13:14:44 -0000	1.46
  +++ mod_expires.c	21 Nov 2003 23:37:05 -0000	1.47
  @@ -548,7 +548,8 @@
                   expiry = conf->expiresdefault;
               }
           }
  -        if (expiry != NULL) {
  +        /* != '\0' covers the case where ExpiresDefault is not user defined. */
  +        if (expiry != NULL && expiry[0] != '\0') {
               set_expiration_fields(r, expiry, t);
           }
       }
  
  
  

Mime
View raw message