Commit 488c2d0c authored by Juan Lang's avatar Juan Lang Committed by Alexandre Julliard

wininet: Support the Cache-Control max-age directive for setting url cache entry expiration.

parent 2d323430
...@@ -3761,16 +3761,74 @@ static void HTTP_ProcessExpires(http_request_t *request) ...@@ -3761,16 +3761,74 @@ static void HTTP_ProcessExpires(http_request_t *request)
BOOL expirationFound = FALSE; BOOL expirationFound = FALSE;
int headerIndex; int headerIndex;
headerIndex = HTTP_GetCustomHeaderIndex(request, szExpires, 0, FALSE); /* Look for a Cache-Control header with a max-age directive, as it takes
* precedence over the Expires header.
*/
headerIndex = HTTP_GetCustomHeaderIndex(request, szCache_Control, 0, FALSE);
if (headerIndex != -1) if (headerIndex != -1)
{ {
LPHTTPHEADERW expiresHeader = &request->custHeaders[headerIndex]; LPHTTPHEADERW ccHeader = &request->custHeaders[headerIndex];
FILETIME ft; LPWSTR ptr;
if (HTTP_ParseDate(expiresHeader->lpszValue, &ft)) for (ptr = ccHeader->lpszValue; ptr && *ptr; )
{ {
expirationFound = TRUE; LPWSTR comma = strchrW(ptr, ','), end, equal;
request->expires = ft;
if (comma)
end = comma;
else
end = ptr + strlenW(ptr);
for (equal = end - 1; equal > ptr && *equal != '='; equal--)
;
if (*equal == '=')
{
static const WCHAR max_age[] = {
'm','a','x','-','a','g','e',0 };
if (!strncmpiW(ptr, max_age, equal - ptr - 1))
{
LPWSTR nextPtr;
unsigned long age;
age = strtoulW(equal + 1, &nextPtr, 10);
if (nextPtr > equal + 1)
{
LARGE_INTEGER ft;
NtQuerySystemTime( &ft );
/* Age is in seconds, FILETIME resolution is in
* 100 nanosecond intervals.
*/
ft.QuadPart += age * (ULONGLONG)1000000;
request->expires.dwLowDateTime = ft.u.LowPart;
request->expires.dwHighDateTime = ft.u.HighPart;
expirationFound = TRUE;
}
}
}
if (comma)
{
ptr = comma + 1;
while (isspaceW(*ptr))
ptr++;
}
else
ptr = NULL;
}
}
if (!expirationFound)
{
headerIndex = HTTP_GetCustomHeaderIndex(request, szExpires, 0, FALSE);
if (headerIndex != -1)
{
LPHTTPHEADERW expiresHeader = &request->custHeaders[headerIndex];
FILETIME ft;
if (HTTP_ParseDate(expiresHeader->lpszValue, &ft))
{
expirationFound = TRUE;
request->expires = ft;
}
} }
} }
if (!expirationFound) if (!expirationFound)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment