Attachment 7149 Details for Bug 21392 – if and only if maxage = -1 (NOT Specified), then Expires header is taken into account

[patch] if and only if maxage = -1 (NOT Specified), then Expires header is taken into account

fix for 21392.txt (text/plain), 1.15 KB, created by Srinivasa Ragavan on 2003-07-08 05:25:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Srinivasa Ragavan

Created: 2003-07-08 05:25:56 UTC

Size: 1.15 KB

patch

obsolete

>--- 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) ||

Actions: View | Diff

Attachments on bug 21392: 7149