--- c:\BASE\httpd-2.0.46\modules\experimental\cache_util.c	Mon Feb 03 09:31:36 2003
+++ c:\httpd-2.0.46\modules\experimental\cache_util.c	Tue Jul 08 10:45:56 2003
@@ -259,15 +292,14 @@
                                                       cc_cresp,
                                                       "proxy-revalidate", NULL))))
         maxstale = 0;
-    /* handle expiration */
+    /* handle expiration */    
     if ((-1 < smaxage && age < (smaxage - minfresh)) ||
         (-1 < maxage && age < (maxage + maxstale - minfresh)) ||
-        (info->expire != APR_DATE_BAD && age < (apr_time_sec(info->expire - info->date) + maxstale - minfresh))) {
+        (-1 == maxage && info->expire != APR_DATE_BAD && age < (apr_time_sec(info->expire - info->date) + maxstale - minfresh))) {
         /* it's fresh darlings... */
         /* set age header on response */
         apr_table_set(r->headers_out, "Age",
                       apr_psprintf(r->pool, "%lu", (unsigned long)age));
-
         /* add warning if maxstale overrode freshness calculation */
         if (!((-1 < smaxage && age < smaxage) ||
               (-1 < maxage && age < maxage) ||