Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 23 Feb 2002 19:44:31 -0000
Message-ID: <20020223194431.14512.qmail@icarus.apache.org>
From: stoddard@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/modules/experimental mod_cache.c

stoddard    02/02/23 11:44:31

  Modified:    modules/experimental mod_cache.c
  Log:
  Fix problem with expiry date being set in the past.
  
  Revision  Changes    Path
  1.30      +2 -6      httpd-2.0/modules/experimental/mod_cache.c
  
  Index: mod_cache.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_cache.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- mod_cache.c	23 Feb 2002 19:31:02 -0000	1.29
  +++ mod_cache.c	23 Feb 2002 19:44:31 -0000	1.30
  @@ -685,15 +685,12 @@
       }
       info->lastmod = lastmod;
   
  -    /* so we now have the expiry date */
       /* if no expiry date then
        *   if lastmod
        *      expiry date = now + min((date - lastmod) * factor, maxexpire)
        *   else
        *      expire date = now + defaultexpire
        */
  -    ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
  -                 "cache: Expiry date is %ld", (long)exp);
       if (exp == APR_DATE_BAD) {
           if (lastmod != APR_DATE_BAD) {
               apr_time_t x = (apr_time_t) ((date - lastmod) * conf->factor);
  @@ -701,10 +698,9 @@
                   x = conf->maxex;
               exp = now + x;
           }
  -        else
  +        else {
               exp = now + conf->defex;
  -        ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
  -                     "cache: Expiry date calculated %ld", (long)exp);
  +        }
       }
       info->expire = exp;