paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-10 15:45:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Cleanup session-specific variables because the session-instance can be re-used, bug #13287

Browse Source 
git-svn-id: trunk@13022 -
This commit is contained in:
joost 2009-04-19 21:24:59 +00:00
parent 9f3b8511ba
commit 24ce200737
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
packages/fcl-web/src/websession.pp
View File

@ -57,6 +57,8 @@ Type
FSessionDir: String;
FTerminated :Boolean;
SID : String;
private
procedure FreeIniFile;
Protected
Procedure CheckSession;
Function GetSessionID : String; override;
@ -145,6 +147,13 @@ begin
Result:=SID;
end;
procedure TIniWebSession.FreeIniFile;
begin
If Cached and Assigned(FIniFile) then
TMemIniFile(FIniFile).UpdateFile;
FreeAndNil(FIniFile);
end;
Procedure TIniWebSession.CheckSession;
begin
@ -173,9 +182,9 @@ end;
destructor TIniWebSession.Destroy;
begin
If Cached and Assigned(FIniFile) then
TMemIniFile(FIniFile).UpdateFile;
FreeAndNil(FIniFile);
// In case an exception occured and UpdateResponse is not called,
// write the updates to disk and free FIniFile
FreeIniFile;
inherited Destroy;
end;
@ -192,8 +201,7 @@ end;
procedure TIniWebSession.UpdateResponse(AResponse: TResponse);
begin
// Do nothing. Init has done the job.
If Cached and Assigned(FIniFile) then
TMemIniFile(FIniFile).UpdateFile;
FreeIniFile;
end;
procedure TIniWebSession.InitSession(ARequest: TRequest; OnNewSession,OnExpired: TNotifyEvent);
@ -204,6 +212,14 @@ Var
S : String;
begin
{$ifdef cgidebug}SendMethodEnter('TIniWebSession.InitSession');{$endif}
// First initialize all session-dependent properties to their default, because
// in Apache-modules or fcgi programs the session-instance is re-used
SID := '';
FSessionStarted := False;
FTerminated := False;
// If a exception occured during a prior request FIniFile is still not freed
if assigned(FIniFile) then FreeIniFile;
If (SessionCookie='') then
SessionCookie:=SFPWebSession;
S:=ARequest.CookieFields.Values[SessionCookie];
@ -324,16 +340,10 @@ end;
procedure TSessionHTTPModule.CheckSession(ARequest : TRequest);
Var
S : TCustomSession;
begin
{$ifdef cgidebug}SendMethodEnter('SessionHTTPModule('+Name+').CheckSession');{$endif}
If CreateSession and Assigned(FSession) then
begin
S:=FSession;
FSession.InitSession(ARequest,FOnNewSession,FOnSessionExpired);
end;
{$ifdef cgidebug}SendMethodExit('SessionHTTPModule('+Name+').CheckSession');{$endif}
end;