Changeset 130 for trunk/Packages/CoolWeb/WebServer/UHTTPServer.pas

Timestamp:

Mar 18, 2022, 1:32:32 PM (3 years ago)

Author:

chronos

Message:

• Modified: Build with Lazarus 2.2.0.
• Modified: Code cleanup.

File:

• trunk/Packages/CoolWeb/WebServer/UHTTPServer.pas (modified) (11 diffs)

trunk/Packages/CoolWeb/WebServer/UHTTPServer.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, UTCPServer, UCommon, UMemoryStreamEx, UMIMEType,
+  Classes, SysUtils, UCommon, UMemoryStreamEx, UMIMEType,
   Synautil, SpecializedList, SpecializedDictionary, Syncobjs;
 
@@ -120 +120 @@
 procedure HTTPExceptionHide(Obj: TObject; Addr: Pointer; FrameCount: Longint; Frames: PPointer);
 
-
 resourcestring
   SEmptyHTTPHandler = 'No handler defined for HTTP server.';
   SFileNotFound = 'File %s not found.';
   SPageNotFound = 'Page %s not found.';
+
 
 implementation
@@ -212 +212 @@
 procedure THTTPServer.Run;
 begin
-
 end;
 
@@ -278 +277 @@
 destructor THTTPResponse.Destroy;
 begin
-  Content.Free;
-  Headers.Free;
-  Cookies.Free;
-  inherited Destroy;
+  FreeAndNil(Content);
+  FreeAndNil(Headers);
+  FreeAndNil(Cookies);
+  inherited;
 end;
 
@@ -339 +338 @@
 destructor THTTPRequest.Destroy;
 begin
-  Content.Free;
-  Post.Free;
-  Query.Free;
-  Path.Free;
-  Headers.Free;
-  Cookies.Free;
-  inherited Destroy;
+  FreeAndNil(Content);
+  FreeAndNil(Post);
+  FreeAndNil(Query);
+  FreeAndNil(Path);
+  FreeAndNil(Headers);
+  FreeAndNil(Cookies);
+  inherited;
 end;
 
@@ -366 +365 @@
         Add(Pair[0], Pair[1]);
     end;
-
   finally
     Parts.Free;
@@ -436 +434 @@
 destructor THTTPSessionStorage.Destroy;
 begin
-  inherited Destroy;
+  inherited;
 end;
 
@@ -470 +468 @@
 var
   Message: string;
-  i: LongInt;
+  I: LongInt;
   hstdout: ^Text;
 begin
@@ -483 +481 @@
    end
   else
-    Writeln(hstdout^, 'Exception object ', Obj.ClassName, ' is not of class Exception.<br/>');
-  Writeln(hstdout^, BackTraceStrFunc(Addr) + '<br/>');
+    WriteLn(hstdout^, 'Exception object ', Obj.ClassName, ' is not of class Exception.<br/>');
+  WriteLn(hstdout^, BackTraceStrFunc(Addr) + '<br/>');
   if (FrameCount > 0) then
     begin
-      for i := 0 to FrameCount - 1 do
+      for I := 0 to FrameCount - 1 do
         if I < Length(TArrayOfPointer(Frames)) then
-          Writeln(hstdout^, BackTraceStrFunc(TArrayOfPointer(Frames)[i]) + '<br/>');
-    end;
-  Writeln(hstdout^, '');
+          WriteLn(hstdout^, BackTraceStrFunc(TArrayOfPointer(Frames)[I]) + '<br/>');
+    end;
+  WriteLn(hstdout^, '');
 end;
 
@@ -499 +497 @@
 var
   Message: string;
-  i: LongInt;
+  I: LongInt;
   hstdout: ^Text;
   hstderr: ^Text;
@@ -508 +506 @@
   WriteLn(hstdout^);
   WriteLn(hstdout^, 'Error occured during page generation.');
-  Writeln(hstderr^, 'An unhandled exception occurred at $', HexStr(PtrUInt(Addr), SizeOf(PtrUInt) * 2), ' :');
+  WriteLn(hstderr^, 'An unhandled exception occurred at $', HexStr(PtrUInt(Addr), SizeOf(PtrUInt) * 2), ' :');
   if Obj is exception then
    begin
      Message := Exception(Obj).ClassName + ' : ' + Exception(Obj).Message;
-     Writeln(hstderr^, Message);
+     WriteLn(hstderr^, Message);
    end
   else
-    Writeln(hstderr^, 'Exception object ', Obj.ClassName, ' is not of class Exception.');
-  Writeln(hstderr^, BackTraceStrFunc(Addr));
+    WriteLn(hstderr^, 'Exception object ', Obj.ClassName, ' is not of class Exception.');
+  WriteLn(hstderr^, BackTraceStrFunc(Addr));
   if (FrameCount > 0) then
     begin
-      for i := 0 to FrameCount - 1 do
+      for I := 0 to FrameCount - 1 do
         if I < Length(TArrayOfPointer(Frames)) then
-          Writeln(hstderr^, BackTraceStrFunc(TArrayOfPointer(Frames)[i]));
-    end;
-  Writeln(hstderr^, '');
+          WriteLn(hstderr^, BackTraceStrFunc(TArrayOfPointer(Frames)[I]));
+    end;
+  WriteLn(hstderr^, '');
 end;