Commit 67fa9268 authored by Cliff Woolley's avatar Cliff Woolley
Browse files

Fix if-modified-since on win32, I think. It should fix it in theory. 

Verification would be nice.  At least I know it still works on Unix.  ;)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95007 13f79535-47bb-0310-9956-ffa450edef68
parent e4c70781

CHANGES

+4 −0
Changes for CHANGES: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line 
Changes with Apache 2.0.37









  *) Fixed If-Modified-Since on Win32, which would give false positives









     because of the sub-second resolution of file timestamps on that









     platform.  [Cliff Woolley]

















  *) Reverse the hook ordering for mod_userdir and mod_alias so









     that Alias/ScriptAlias will override Userdir.  PR 8841









     [Joshua Slive]


































modules/http/http_protocol.c



+11
−5



























Changes for modules/http/http_protocol.c: 11 added lines, 5 removed lines.



Original line number
Diff line number
Diff line







@@ -290,7 +290,7 @@ AP_DECLARE(int) ap_meets_conditions(request_rec *r)







{









    const char *etag;









    const char *if_match, *if_modified_since, *if_unmodified, *if_nonematch;









    apr_time_t mtime;









    apr_int64_t mtime;



















    /* Check for conditional requests --- note that we only want to do









     * this if we are successful so far and we are not processing a










@@ -309,8 +309,11 @@ AP_DECLARE(int) ap_meets_conditions(request_rec *r)

















    etag = apr_table_get(r->headers_out, "ETag");



















    /* All of our comparisons must be in seconds, because that's the









     * highest time resolution the HTTP specification allows.









     */









    /* XXX: we should define a "time unset" constant */









    mtime = (r->mtime != 0) ? r->mtime : apr_time_now();









    mtime = ((r->mtime != 0) ? r->mtime : apr_time_now()) / APR_USEC_PER_SEC;



















    /* If an If-Match request-header field was given









     * AND the field value is not "*" (meaning match anything)










@@ -334,7 +337,7 @@ AP_DECLARE(int) ap_meets_conditions(request_rec *r)







        if (if_unmodified != NULL) {









            apr_time_t ius = apr_date_parse_http(if_unmodified);



















            if ((ius != APR_DATE_BAD) && (mtime > ius)) {









            if ((ius != APR_DATE_BAD) && (mtime > (ius / APR_USEC_PER_SEC))) {









                return HTTP_PRECONDITION_FAILED;









            }









        }










@@ -387,9 +390,12 @@ AP_DECLARE(int) ap_meets_conditions(request_rec *r)







             && ((if_modified_since =









                  apr_table_get(r->headers_in,









                                "If-Modified-Since")) != NULL)) {









        apr_time_t ims = apr_date_parse_http(if_modified_since);









        apr_int64_t ims, reqtime;



















        ims = apr_date_parse_http(if_modified_since) / APR_USEC_PER_SEC;









        reqtime = r->request_time / APR_USEC_PER_SEC;



















        if ((ims >= mtime) && (ims <= r->request_time)) {









        if ((ims >= mtime) && (ims <= reqtime)) {









            return HTTP_NOT_MODIFIED;









        }









    }