Changeset 96 for trunk/Packages/CoolWeb/WebServer

Timestamp:

Oct 2, 2012, 9:22:02 AM (12 years ago)

Author:

chronos

Message:

• Opraveno: Neuvolňovaly se správně registrované stránky.

Location:

trunk

Files:

• . (modified) (1 prop)
• Packages/CoolWeb/WebServer/UHTTPServer.pas (modified) (4 diffs)
• Packages/CoolWeb/WebServer/UHTTPServerTCP.pas (modified) (3 diffs)
• Packages/CoolWeb/WebServer/UWebApp.pas (modified) (2 diffs)

trunk

@@ -5 +5 @@
 backup
 ZdechovNET.lps
+heaptrclog.trc

@@ -5 +5 @@
 backup
 ZdechovNET.lps
+heaptrclog.trc

trunk/Packages/CoolWeb/WebServer/UHTTPServer.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, UTCPServer, UCommon, UMemoryStreamEx, UMIMEType,
-  Synautil, SpecializedList, SpecializedDictionary;
+  Synautil, SpecializedList, SpecializedDictionary, Syncobjs;
 
 type
@@ -102 +102 @@
     procedure SetShowExceptions(const AValue: Boolean);
   public
+    Lock: TCriticalSection;
     procedure Run; virtual;
     procedure ErrorResponse(HandlerData: THTTPHandlerData);
@@ -228 +229 @@
 begin
   inherited;
+  Lock := TCriticalSection.Create;
   ShowExceptions := False;
   DocumentRoot := './';
@@ -234 +236 @@
 destructor THTTPServer.Destroy;
 begin
-  inherited Destroy;
+  FreeAndNil(Lock);
+  inherited;
 end;
 

trunk/Packages/CoolWeb/WebServer/UHTTPServerTCP.pas

@@ -44 +44 @@
 begin
   with TTCPClientThread(Sender), Socket do begin
-    WriteLn('Used thrads ' + IntToStr(Parent.ThreadPool.UsedCount) + '. Client connected from ' + GetRemoteSinIP);
+    WriteLn('Thread ' + IntToStr(Id) + ' from ' + IntToStr(Parent.ThreadPool.UsedCount) + '. Client connected from ' + GetRemoteSinIP);
 
     HandlerData := THTTPHandlerData.Create;
@@ -58 +58 @@
         repeat
           Line := RecvString(10000);
+          WriteLn(IntToStr(Id) + ' ' + Line);
           if (LineIndex = 0) then begin
             LineParts.Explode(Line, ' ', StrToStr);
@@ -115 +116 @@
       // Send headers
       for I := 0 to Headers.Count - 1 do begin
-        WriteLn(Headers.Keys[I] + ': ' + Headers.Items[I].Value + #13#10);
+        //WriteLn(Headers.Keys[I] + ': ' + Headers.Items[I].Value + #13#10);
         SendString(Headers.Keys[I] + ': ' + Headers.Items[I].Value + #13#10);
       end;

trunk/Packages/CoolWeb/WebServer/UWebApp.pas

@@ -12 +12 @@
   THTTPServerType = (stCGI, stTCP, stTurboPower);
 
+  { TRegistredPage }
+
   TRegistredPage = class
     Name: string;
     Page: TWebPage;
+    destructor Destroy; override;
   end;
 
@@ -65 +68 @@
 end;
 
+{ TRegistredPage }
+
+destructor TRegistredPage.Destroy;
+begin
+  if Assigned(Page) then FreeAndNil(Page);
+end;
+
 
 { TPageList }

@@ -5 +5 @@
 backup
 ZdechovNET.lps
+heaptrclog.trc