Commit b606898d authored by Ruediger Pluem's avatar Ruediger Pluem
Browse files

Merge r411464 from trunk: 

* info->expire and info->date are in microseconds. So convert the difference
  to seconds before comparing it to age which is in seconds.

PR: 39713
Submitted by: Owen Taylor <otaylor redhat.com>
Reviewed by: rpluem, jim, jfclere


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@720171 13f79535-47bb-0310-9956-ffa450edef68
parent 004a250c

CHANGES

+4 −0
Changes for CHANGES: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.2.11



  *) mod_cache: Convert age of cached object to seconds before comparing it to

     age supplied by the request when checking whether to send a Warning

     header for a stale response. PR 39713. [Owen Taylor <otaylor redhat.com>]



  *) Build: Correctly set SSL_LIBS during openssl detection if pkgconfig is

     not available. PR 46018 [Ruediger Pluem]

STATUS

+0 −8
Changes for STATUS: 0 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -86,14 +86,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



    * mod_cache: Convert age of cached object to seconds before comparing it to

      age supplied by the request when checking whether to send a Warning

      header for a stale response. PR 39713.

      Trunk version of patch:

         http://svn.apache.org/viewvc?rev=411464&view=rev

      Backport version for 2.2.x of patch:

         Trunk version of patch works

      +1: rpluem, jim, jfclere



PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

modules/cache/cache_util.c

+1 −1
Changes for modules/cache/cache_util.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ CACHE_DECLARE(int) ap_cache_check_freshness(cache_handle_t *h, 
        if (!(((smaxage != -1) && age < smaxage) ||

              ((maxage != -1) && age < maxage) ||

              (info->expire != APR_DATE_BAD &&

               (info->expire - info->date) > age))) {

               (apr_time_sec(info->expire - info->date)) > age))) {

            /* make sure we don't stomp on a previous warning */

            if ((warn_head == NULL) ||

                ((warn_head != NULL) && (ap_strstr_c(warn_head, "110") == NULL))) {