Commit e440398a authored by Guenter Knauf's avatar Guenter Knauf
Browse files

Fixed mod_expires: Expires time shouldn't be in the past. 

r1002205 in test framework needs to be reverted now since this is fixed.
Author: rjung, reviewed by: wrowe, sf.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1004974 13f79535-47bb-0310-9956-ffa450edef68
parent 1ee1e272

STATUS

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

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



  * mod_expires: Expires time shouldn't be in the past

    Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=708902

    2.2.x patch: http://svn.apache.org/viewvc?view=revision&revision=713142

    Backport: http://people.apache.org/~rjung/patches/expires-in-the-past-2_0.patch

    Revert r1002205 in test framework, once this is fixed.

    +1: rjung, wrowe, sf



PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ please place SVN revisions from trunk here, so it is easy to

    identify exactly what the proposed changes are!  Add all new

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
@@ -427,6 +427,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)));