Changeset 87 for branches/DirectWeb/UHTTPServer.pas

Timestamp:

Dec 17, 2009, 9:36:15 AM (14 years ago)

Author:

george

Message:

• Přidáno: Podpora pro ukládání serverových proměnných HTTP sezení.
• Upraveno: U funkce Explode lze nyní omezit počet výsledných částí řetězce.

Location:

branches/DirectWeb

Files:

• . (modified) (1 prop)
• UHTTPServer.pas (modified) (6 diffs)

branches/DirectWeb

@@ -3 +3 @@
 WoWHostingWebServer
 Config.xml
+Session

@@ -3 +3 @@
 WoWHostingWebServer
 Config.xml
+Session

branches/DirectWeb/UHTTPServer.pas

@@ -59 +59 @@
     procedure Add(AName: string; AHandler: TRequestEvent);
     function IndexOfName(AName: string): TRequestHandler;
+  end;
+
+  { THTTPSession }
+
+  THTTPSession = class
+    Variables: TStringList;
+    procedure Load(Request: THTTPRequest); virtual;
+    procedure Save(Response: THTTPResponse); virtual;
+    constructor Create; virtual;
+    destructor Destroy; override;
   end;
 
@@ -73 +83 @@
     MaxConnection: Integer;
     RequestHandlerList: TRequestHandlerList;
+    SessionHandler: THTTPSession;
     procedure FileResponse(Request: THTTPRequest;
       Response: THTTPResponse);
@@ -103 +114 @@
     repeat
       Line := RecvString(10000);
-      LineParts := Explode(' ', Line);
-      if (LineIndex = 0) and (Length(LineParts) >= 3) then begin
-        Request.Method := LineParts[0];
-        if Pos('?', LineParts[1]) > 0 then begin
-          Request.Path := Copy(LineParts[1], 1, Pos('?', LineParts[1]) - 1);
-          Request.Query.Parse(Copy(LineParts[1], Pos('?', LineParts[1]) + 1, Length(LineParts[1])));
-        end else Request.Path := LineParts[1];
-      end else
-      if (Length(LineParts) >= 2) and (LineParts[0][Length(LineParts[0])] = ':') then begin
-        LineParts[0] := Copy(LineParts[0], 1, Length(LineParts[0]) - 1);
-        Request.Headers.Values[LineParts[0]] := LineParts[1];
+      if (LineIndex = 0) then begin
+        LineParts := Explode(' ', Line);
+        if (Length(LineParts) >= 3) then begin
+          Request.Method := LineParts[0];
+          if Pos('?', LineParts[1]) > 0 then begin
+            Request.Path := Copy(LineParts[1], 1, Pos('?', LineParts[1]) - 1);
+            Request.Query.Parse(Copy(LineParts[1], Pos('?', LineParts[1]) + 1, Length(LineParts[1])));
+          end else Request.Path := LineParts[1];
+        end;
+      end else begin
+        LineParts := Explode(' ', Line, 2);
+        if (Length(LineParts) = 2) and (LineParts[0][Length(LineParts[0])] = ':') then begin
+          LineParts[0] := Copy(LineParts[0], 1, Length(LineParts[0]) - 1);
+          Request.Headers.Values[LineParts[0]] := LineParts[1];
+          WriteLn(Line);
+        end;
       end;
       Inc(LineIndex);
     until Line = '';
 
-    // Parse cookies
-    if Request.Cookies.IndexOfName('Cookie') <> -1 then
-    Request.Cookies.Parse(Request.Headers.Values['Cookie']);
+    // Process cookies
+    if Request.Headers.IndexOfName('Cookie') <> -1 then
+      Request.Cookies.Parse(Request.Headers.Values['Cookie']);
+
+    // Process session
+    if Assigned(SessionHandler) then
+      SessionHandler.Load(Request);
 
     Response.Stream.Clear;
@@ -130 +150 @@
     if Assigned(RequestHandler) then RequestHandler.Handler(Request, Response)
       else ErrorResponse(Request, Response);
+
+    if Assigned(SessionHandler) then
+      SessionHandler.Save(Response);
 
     with Response do begin
@@ -139 +162 @@
       // Handle cookies
       for I := 0 to Cookies.Count - 1 do
-        Headers.Values['Set-Cookie'] := Cookies.Names[I] + '=' + Cookies.ValueFromIndex[I];
+        Headers.Add('Set-Cookie' + Headers.NameValueSeparator + Cookies.Names[I] + '=' + Cookies.ValueFromIndex[I]);
         // + ';path=/;expires=' + RFC822DateTime(Now);
 
       // Send headers
-      for I := 0 to Headers.Count - 1 do
+      for I := 0 to Headers.Count - 1 do begin
+        WriteLn(Headers.Names[I] + ': ' + Headers.ValueFromIndex[I] + #13#10);
         SendString(Headers.Names[I] + ': ' + Headers.ValueFromIndex[I] + #13#10);
+      end;
       SendString(#13#10);
       SendBuffer(Stream.Memory, Stream.Size);
@@ -304 +329 @@
 end;
 
+{ THTTPSession }
+
+procedure THTTPSession.Load(Request: THTTPRequest);
+begin
+
+end;
+
+procedure THTTPSession.Save(Response: THTTPResponse);
+begin
+
+end;
+
+constructor THTTPSession.Create;
+begin
+  Variables := TStringList.Create;
+end;
+
+destructor THTTPSession.Destroy;
+begin
+  Variables.Destroy;
+  inherited Destroy;
+end;
+
 end.
 

@@ -3 +3 @@
 WoWHostingWebServer
 Config.xml
+Session