Changeset 138 for trunk/Packages/CoolWeb/WebServer/UHTTPServerTCP.pas

Timestamp:

Sep 9, 2022, 8:20:25 PM (2 years ago)

Author:

chronos

Message:

• Modified: Removed TemplateGenerics package. Generics usage replaced by standard Generics.Collections.

File:

• trunk/Packages/CoolWeb/WebServer/UHTTPServerTCP.pas (modified) (7 diffs)

trunk/Packages/CoolWeb/WebServer/UHTTPServerTCP.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, UHTTPServer, UTCPServer, SpecializedList, SynaUtil;
+  Classes, SysUtils, UHTTPServer, UTCPServer, SynaUtil, Generics.Collections,
+  UGenerics;
 
 type
@@ -42 +43 @@
   I: Integer;
   ContentLength: Integer;
+  Value: string;
+  Item: TPair<string, string>;
 begin
   with TTCPClientThread(Sender), Socket do begin
@@ -60 +63 @@
           WriteLn(IntToStr(Id) + ' ' + Line);
           if (LineIndex = 0) then begin
-            LineParts.Explode(Line, ' ', StrToStr);
+            LineParts.Explode(' ', Line);
             if (LineParts.Count >= 3) then begin
               Request.Method := LineParts[0];
               if Pos('?', LineParts[1]) > 0 then begin
                 Request.Query.Parse(Copy(LineParts[1], Pos('?', LineParts[1]) + 1, Length(LineParts[1])));
-                Request.Path.Explode(Copy(LineParts[1], 1, Pos('?', LineParts[1]) - 1), '/', StrToStr);
+                Request.Path.Explode('/', Copy(LineParts[1], 1, Pos('?', LineParts[1]) - 1));
               end else begin
-                Request.Path.Explode(LineParts[1], '/', StrToStr);
+                Request.Path.Explode('/', LineParts[1]);
                 Request.Query.Clear;
               end;
@@ -75 +78 @@
             end;
           end else begin
-            LineParts.Explode(Line, ' ', StrToStr, 2);
+            LineParts.Explode(' ', Line, 2);
             if (LineParts.Count = 2) and (LineParts[0][Length(LineParts[0])] = ':') then begin
               LineParts[0] := Copy(LineParts[0], 1, Length(LineParts[0]) - 1);
               Request.Headers.Add(LineParts[0], LineParts[1]);
-              //WriteLn(Line);
             end;
           end;
@@ -86 +88 @@
 
         if Request.Method = 'POST' then begin
-          ContentLength := StrToInt(Request.Headers.Values['Content-Length']);
+          if Request.Headers.TryGetValue('Content-Length', Value) then
+            ContentLength := StrToInt(Value);
           SetLength(Line, ContentLength);
           RecvBufferEx(PByte(Line), ContentLength, 1000);
@@ -96 +99 @@
 
     // Process cookies
-    if Request.Headers.SearchKey('Cookie') <> -1 then
-      Request.Cookies.Parse(Request.Headers.Values['Cookie']);
+    if Request.Headers.TryGetValue('Cookie', Value) then
+      Request.Cookies.Parse(Value);
 
     // Load session variables
@@ -120 +123 @@
 
       // Handle cookies
-      for I := 0 to Cookies.Count - 1 do
-        Headers.Add('Set-Cookie', Cookies.Keys[I] + '=' + Cookies.Items[I].Value);
+      for Item in Cookies do
+        Headers.Add('Set-Cookie', Item.Key + '=' + Item.Value);
         // + ';path=/;expires=' + RFC822DateTime(Now);
 
       // Send headers
-      for I := 0 to Headers.Count - 1 do begin
+      for Item in Headers do begin
         //WriteLn(Headers.Keys[I] + ': ' + Headers.Items[I].Value + #13#10);
-        SendString(Headers.Keys[I] + ': ' + Headers.Items[I].Value + #13#10);
+        SendString(Item.Key + ': ' + Item.Value + #13#10);
       end;
       SendString(#13#10);