Changeset 250 for Network/CoolWeb/WebServer/UHTTPSessionFile.pas

Timestamp:

Jun 13, 2011, 8:00:17 AM (13 years ago)

Author:

george

Message:

• Modified: Unit UCommon in CoolWeb package used form package Common as dependency.

File:

• Network/CoolWeb/WebServer/UHTTPSessionFile.pas (modified) (5 diffs)

Network/CoolWeb/WebServer/UHTTPSessionFile.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, UHTTPServer, syncobjs, synacode, UCommon;
+  Classes, SysUtils, UHTTPServer, syncobjs, synacode, UCommon, FileUtil;
 
 type
@@ -37 +37 @@
 implementation
 
+resourcestring
+  SCantCreateSessionStorageDirectory = 'Can''t create session storage directory.';
+
 procedure Register;
 begin
@@ -48 +51 @@
 begin
   Result := BinToHexString(SHA1(FloatToStr(Now)));
-  while FileExists(Directory + '/' + Result) do
+  while FileExistsUTF8(Directory + DirectorySeparator + Result) do
     Result := BinToHexString(SHA1(FloatToStr(Now)));
 end;
@@ -71 +74 @@
   try
     Lock.Acquire;
-    SessionFile := Directory + '/' + HandlerData.SessionId;
-    if FileExists(SessionFile) then
+    SessionFile := Directory + DirectorySeparator + HandlerData.SessionId;
+    if FileExistsUTF8(SessionFile) then
       HandlerData.Session.LoadFromFile(SessionFile)
       else HandlerData.SessionId := GetNewSessionId;
@@ -87 +90 @@
   try
     Lock.Acquire;
-    SessionFile := Directory + '/' + HandlerData.SessionId;
+    SessionFile := Directory + DirectorySeparator + HandlerData.SessionId;
     ForceDirectories(Directory);
-    if DirectoryExists(Directory) then begin
+    if DirectoryExistsUTF8(Directory) then begin
       DeleteFile(SessionFile);
       HandlerData.Session.SaveToFile(SessionFile)
-    end else raise Exception.Create('Can''t create session storage directory.');
+    end else raise Exception.Create(SCantCreateSessionStorageDirectory);
 
     HandlerData.Response.Cookies.Values[SessionIdCookieName] := HandlerData.SessionId;