use decoderfcdatetime

riderkick · Feb 7, 2018 · a41b1bf · a41b1bf
1 parent f53e055
commit a41b1bf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git 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
@@ -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;