Changeset 138 for trunk/Packages/CoolWeb/WebServer/UHTTPServerCGI.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/UHTTPServerCGI.pas (modified) (4 diffs)

trunk/Packages/CoolWeb/WebServer/UHTTPServerCGI.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, UHTTPServer, SpecializedList, IOStream;
+  Classes, SysUtils, UHTTPServer, IOStream, Generics.Collections;
 
 type
@@ -54 +54 @@
   Buffer: string;
   Count: Integer;
+  Item: TPair<string, string>;
 begin
   HandlerData := THTTPHandlerData.Create;
@@ -96 +97 @@
       EnvVars.Values['QUERY_STRING'] := Copy(EnvVars.Values['QUERY_STRING'], 1,
         Length(EnvVars.Values['QUERY_STRING']) - 1);
-    Request.Path.Explode(EnvVars.Values['QUERY_STRING'], '/', StrToStr);
+    Request.Path.Explode('/', EnvVars.Values['QUERY_STRING']);
     if Pos('?', EnvVars.Values['REQUEST_URI']) > 0 then begin
       Request.Query.Parse(Copy(EnvVars.Values['REQUEST_URI'],
@@ -129 +130 @@
     with Response do begin
       // Generate 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);
 
       // Generate headers
-      for I := 0 to Headers.Count - 1 do begin
-        WriteLn(Headers.Keys[I] + ': ' + Headers.Items[I].Value);
+      for Item in Headers do begin
+        WriteLn(Item.Key + ': ' + Item.Value);
       end;