Changeset 33 for trunk/WebServer/UHTTPServerCGI.pas

Timestamp:

Sep 13, 2010, 11:20:24 AM (14 years ago)

Author:

george

Message:

• Přidáno: Druhá varianta projektu pro sestavení TCP serveru.
• Přidáno: Vlastní obsluha vyjímek a zobrazení ve HTTP tvaru.
• Opraveno: Zpracování session třídy THTTPSessionStorageMySQL.

Location:

trunk

Files:

• . (modified) (1 prop)
• WebServer/UHTTPServerCGI.pas (modified) (4 diffs)

trunk

@@ -2 +2 @@
 UConfig.pas
 bin
+lib

@@ -2 +2 @@
 UConfig.pas
 bin
+lib

trunk/WebServer/UHTTPServerCGI.pas

@@ -18 +18 @@
     constructor Create;
     destructor Destroy; override;
-    procedure SysInfo;
+    procedure ServerInfo(HandlerData: THTTPHandlerData); override;
   end;
 
@@ -50 +50 @@
 
     // Process cookies
-    if Request.Headers.IndexOfName('Cookie') <> -1 then
-      Request.Cookies.Parse(Request.Headers.Values['Cookie']);
+    if EnvVars.IndexOfName('HTTP_COOKIE') <> -1 then
+      Request.Cookies.Parse(EnvVars.Values['HTTP_COOKIE']);
 
     // Parse query string
@@ -64 +64 @@
         Length(EnvVars.Values['REQUEST_URI'])));
 
+    // Load session variables
+    if Assigned(SessionStorage) then
+      SessionStorage.Load(HandlerData);
+
     Response.Stream.Clear;
     Response.Headers.Values['Content-type'] := 'text/html';
 
+    // Execute content handler
     if Assigned(OnRequest) then OnRequest(HandlerData)
       else raise EEmptyHTTPHandler.Create(SEmptyHTTPHandler);
 
+     // Store session variables
+    if Assigned(SessionStorage) then
+      SessionStorage.Save(HandlerData);
+
     with Response do begin
+      // Generate cookies
+      for I := 0 to Cookies.Count - 1 do
+        Headers.Add('Set-Cookie' + Headers.NameValueSeparator + Cookies.Names[I] + '=' + Cookies.ValueFromIndex[I]);
+        // + ';path=/;expires=' + RFC822DateTime(Now);
+
       // Generate headers
       for I := 0 to Headers.Count - 1 do begin
         WriteLn(Headers.Names[I] + ': ' + Headers.ValueFromIndex[I]);
       end;
-
-      // Generate cookies
-      for I := 0 to Cookies.Count - 1 do
-        Headers.Add('Set-Cookie' + Headers.NameValueSeparator + Cookies.Names[I] + '=' + Cookies.ValueFromIndex[I]);
-        // + ';path=/;expires=' + RFC822DateTime(Now);
 
       WriteLn; // Empty line header separator
@@ -92 +101 @@
 end;
 
-procedure THTTPServerCGI.SysInfo;
+procedure THTTPServerCGI.ServerInfo(HandlerData: THTTPHandlerData);
 var
   I: Integer;
 begin
-(*  Output.Add('<h4>Environment variables:</h4>');
-  Output.Add('<table border="1">');
-  for I := 0 to EnvVars.Count - 1 do begin
-    Output.Add('<tr><td>' + EnvVars.Names[I] + '</td><td>' +
-      EnvVars.ValueFromIndex[I] + '</td></tr>');
+  inherited;
+  with HandlerData, Response.Stream do begin
+    WriteString('<h5>Environment variables:</h5>');
+    WriteString('<table border="1">');
+    for I := 0 to EnvVars.Count - 1 do begin
+      WriteString('<tr><td>' + EnvVars.Names[I] + '</td><td>' +
+        EnvVars.ValueFromIndex[I] + '</td></tr>');
+    end;
+    WriteString('</table>');
   end;
-  Output.Add('</table>');*)
 end;
 

@@ -2 +2 @@
 UConfig.pas
 bin
+lib