Commit b6d01325 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r708902 from trunk: 

Avoid time traveling :)

Reviewed by: jim


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

STATUS

+0 −8
Changes for STATUS: 0 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -113,14 +113,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
        Trunk version of patch works

     +1: rpluem, jim, pgollucci



   * mod_expires: Do not sets negative max-age / Expires header in the past.

     PR 39774 [Jim Jagielski]

     Trunk version of patch:

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

     Backport version for 2.2.x of patch:

        Trunk version of patch works

     +1: rpluem, jim, pgollucci





PATCHES PROPOSED TO BACKPORT FROM TRUNK:

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

modules/metadata/mod_expires.c

+3 −0
Changes for modules/metadata/mod_expires.c: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -430,6 +430,9 @@ static int set_expiration_fields(request_rec *r, const char *code, 
    }



    expires = base + additional;

    if (expires < r->request_time) {

        expires = r->request_time;

    }

    apr_table_mergen(t, "Cache-Control",

                     apr_psprintf(r->pool, "max-age=%" APR_TIME_T_FMT,

                                  apr_time_sec(expires - r->request_time)));