From a41b1bfa59bde2c0ab7f1b0b4a05a3c9e8b226f3 Mon Sep 17 00:00:00 2001 From: riderkick Date: Wed, 7 Feb 2018 18:04:39 +0800 Subject: [PATCH] use decoderfcdatetime --- baseunits/httpsendthread.pas | 11 ++++------- baseunits/uBaseUnit.pas | 5 +---- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/baseunits/httpsendthread.pas b/baseunits/httpsendthread.pas index 2a98227a2..ae6f59c09 100644 --- a/baseunits/httpsendthread.pas +++ b/baseunits/httpsendthread.pas @@ -357,15 +357,12 @@ procedure THTTPSendThread.ParseCookiesExpires; s := Copy(s, p, Length(s)); s := SeparateLeft(SeparateRight(s,'='),';'); s := Trim(SeparateLeft(s, 'GMT')); - c := 0.0; - try - c := UniversalTimeToLocal(ScanDateTime(HTTPCookieExpiresFormat, s, HTTPFormatSettings)); - if (FCookiesExpires = 0.0) or (c < FCookiesExpires) then - FCookiesExpires := c; - except - end; + c := DecodeRfcDateTime(s); + if (FCookiesExpires = 0.0) or (c < FCookiesExpires) then + FCookiesExpires := c; end; end; + write end; function THTTPSendThread.InternalHTTPRequest(const Method, URL: String; diff --git a/baseunits/uBaseUnit.pas b/baseunits/uBaseUnit.pas index 823ce2b52..865c6e0af 100644 --- a/baseunits/uBaseUnit.pas +++ b/baseunits/uBaseUnit.pas @@ -3472,10 +3472,7 @@ function SaveImageStreamToFile(AHTTP: THTTPSend; Path, FileName: String): String s := Trim(AHTTP.Headers.Values['last-modified']); lastmodified := 0; if s <> '' then - try - lastmodified := DateTimeToFileDate(ScanDateTime(HTTPDateTimeFormatStr, s, FMDFormatSettings)); - except - end; + lastmodified := DateTimeToFileDate(DecodeRfcDateTime(s)); Result := SaveImageStreamToFile(AHTTP.Document, Path, FileName, lastmodified); end;