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

Timestamp:

Oct 2, 2012, 2:52:20 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: V balíčku CoolWeb některé seznamy změněny z typu TStringList na TListString.

File:

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

trunk/Packages/CoolWeb/WebServer/UHTTPServer.pas

@@ -13 +13 @@
   EEmptyHTTPHandler = class(Exception);
 
-  TQueryParameterList = class(TStringList)
+  TQueryParameterList = class(TDictionaryStringString)
     procedure Parse(Text: string);
     function Syntetize: string;
@@ -20 +20 @@
   { TCookieList }
 
-  TCookieList = class(TStringList)
+  TCookieList = class(TDictionaryStringString)
     procedure Parse(Text: string);
     function Syntetize: string;
@@ -148 +148 @@
     WriteString('<h5>Request HTTP headers</h5>');
     for I := 0 to Request.Headers.Count - 1 do begin;
-      WriteString(Request.Headers.Items[I].Value + '<br/>');
+      with Request.Headers.Items[I] do
+        WriteString(Key + ': ' + Value + '<br/>');
+    end;
+
+    WriteString('<h5>Request HTTP GET</h5>');
+    for I := 0 to Request.Query.Count - 1 do begin
+      with Request.Query.Items[I] do
+      WriteString(Key + ': ' + Value + '<br/>');
     end;
 
     WriteString('<h5>Request HTTP cookies</h5>');
-    for I := 0 to Request.Cookies.Count - 1 do begin;
-      WriteString(Request.Cookies.Strings[I] + '<br/>');
+    for I := 0 to Request.Cookies.Count - 1 do begin
+      with Request.Cookies.Items[I] do
+      WriteString(Key + ': ' + Value + '<br/>');
     end;
 
     //WriteString('Session id: ' + SessionId);
     WriteString('<h5>Session variables</h5>');
-    for I := 0 to Session.Count - 1 do begin;
-      WriteString(Session.Strings[I] + '<br/>');
+    for I := 0 to Session.Count - 1 do begin
+      with Session do
+      WriteString(Names[I] + ': ' + ValueFromIndex[I] + '<br/>');
     end;
 
     WriteString('<h5>Request HTTP POST</h5>');
-    for I := 0 to Request.Post.Count - 1 do begin;
-      WriteString(Request.Post.Strings[I] + '<br/>');
+    for I := 0 to Request.Post.Count - 1 do begin
+      with Request.Post.Items[I] do
+      WriteString(Key + ': ' + Value + '<br/>');
     end;
 
@@ -173 +183 @@
     WriteString('<h5>Response HTTP headers</h5>');
     with Response.Content do
-    for I := 0 to Response.Headers.Count - 1 do begin;
-      WriteString(Response.Headers.Items[I].Value + '<br/>');
+    for I := 0 to Response.Headers.Count - 1 do begin
+      with Response.Headers.Items[I] do
+      WriteString(Key + ': ' + Value + '<br/>');
     end;
 
     WriteString('<h5>Response HTTP cookies</h5>');
     for I := 0 to Response.Cookies.Count - 1 do begin;
-      WriteString(Response.Cookies.Strings[I] + '<br/>');
+      with Response.Cookies.Items[I] do
+      WriteString(Key + ': ' + Value + '<br/>');
     end;
   end;
@@ -352 +364 @@
       Pair.Explode(Parts[I], '=', StrToStr);
       if Pair.Count >= 2 then
-        Values[Pair[0]] := Pair[1];
+        Add(Pair[0], Pair[1]);
     end;
 
@@ -367 +379 @@
   Result := '';
   for I := 0 to Count - 1 do
-    Result := Result + '&amp;' + Names[I] + '=' + ValueFromIndex[I];
+    Result := Result + '&amp;' + Keys[I] + '=' + Items[I].Value;
   Result := Copy(Result, 6, Length(Result));
 end;
@@ -387 +399 @@
       Pair.Explode(Parts[I], '=', StrToStr);
       if Pair.Count >= 2 then
-        Values[Trim(Pair[0])] := Trim(Pair[1]);
+        Add(Trim(Pair[0]), Trim(Pair[1]));
     end;
   finally
@@ -401 +413 @@
   Result := '';
   for I := 0 to Count - 1 do
-    Result := Result + '; ' + Names[I] + '=' + ValueFromIndex[I];
+    Result := Result + '; ' + Keys[I] + '=' + Items[I].Value;
   Result := Copy(Result, 2, Length(Result));
 end;
@@ -447 +459 @@
 destructor THTTPHandlerData.Destroy;
 begin
-  Request.Free;
-  Response.Free;
-  Session.Free;
-  inherited Destroy;
+  FreeAndNil(Request);
+  FreeAndNil(Response);
+  FreeAndNil(Session);
+  inherited;
 end;