From b36853caf148377580a0a181357f5107d9d71355 Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Tue, 11 Mar 2014 13:47:11 +0000 Subject: [PATCH] Support Last-Modified behind proxies which return UTC instead of GMT. The standard states that GMT must be used, but that UTC is equivalent. Still parse UTC as otherwise this causes problems for pkg(8). It will refetch the repository every time 'pkg update' or other remote operations are used behind these proxies. RFC2616: "All HTTP date/time stamps MUST be represented in Greenwich Mean Time (GMT), without exception. For the purposes of HTTP, GMT is exactly equal to UTC (Coordinated Universal Time)."" Approved by: bapt (mentor) Reviewed by: des, peter Sponsored by: EMC / Isilon Storage Division MFC after: 1 week --- lib/libfetch/http.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/libfetch/http.c b/lib/libfetch/http.c index b2feedbcd0bf..cbbb8a8d351f 100644 --- a/lib/libfetch/http.c +++ b/lib/libfetch/http.c @@ -876,6 +876,12 @@ http_parse_mtime(const char *p, time_t *mtime) strncpy(locale, setlocale(LC_TIME, NULL), sizeof(locale)); setlocale(LC_TIME, "C"); r = strptime(p, "%a, %d %b %Y %H:%M:%S GMT", &tm); + /* + * Some proxies use UTC in response, but it should still be + * parsed. RFC2616 states GMT and UTC are exactly equal for HTTP. + */ + if (r == NULL) + r = strptime(p, "%a, %d %b %Y %H:%M:%S UTC", &tm); /* XXX should add support for date-2 and date-3 */ setlocale(LC_TIME, locale); if (r == NULL)