www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-07 04:02:58 +03:00
Code Activity

This evil little change modifies the interface to ap_parseHTTPdate()

Browse Source 
for no good reason.  It'll be backed out real soon.

Submitted by:	pthreads leftovers


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83772 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Roy T. Fielding
1999-08-26 14:53:24 +00:00
parent 1fa9e10844
commit c5a36ee6c2
4 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
modules/http/http_protocol.c
View File

@@ -425,10 +425,12 @@ API_EXPORT(int) ap_meets_conditions(request_rec *r)
*/
if_unmodified = ap_table_get(r->headers_in, "If-Unmodified-Since");
if (if_unmodified != NULL) {
time_t ius = ap_parseHTTPdate(if_unmodified);
if ((ius != BAD_DATE) && (mtime > ius)) {
return HTTP_PRECONDITION_FAILED;
/* ZZZ we are changing time funcs to AP time thread funcs.
and we need to check return values of ap_parseHTTPdate. */
time_t ius ;
if (ap_parseHTTPdate(if_unmodified, &ius) == 1
&& (mtime > ius)) {
return HTTP_PRECONDITION_FAILED;
}
}
}
@@ -478,9 +480,12 @@ API_EXPORT(int) ap_meets_conditions(request_rec *r)
else if ((r->method_number == M_GET)
&& ((if_modified_since =
ap_table_get(r->headers_in, "If-Modified-Since")) != NULL)) {
time_t ims = ap_parseHTTPdate(if_modified_since);
if ((ims >= mtime) && (ims <= r->request_time)) {
time_t ims;
if (ap_parseHTTPdate(if_modified_since, &ims) != 1) {
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING,
r->server, "bogus if-modified-since-header");
}
else if ((ims >= mtime) && (ims <= r->request_time)) {
return HTTP_NOT_MODIFIED;
}
}