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

* Merging revisions r48898,r48899,r48900,r48901 from trunk:

Browse Source 
------------------------------------------------------------------------
    r48898 | michael | 2021-03-07 19:58:23 +0100 (Sun, 07 Mar 2021) | 1 line
    
    * Fix bug ID #0038580: Empty text for startsstr
    ------------------------------------------------------------------------
    r48899 | michael | 2021-03-07 20:00:26 +0100 (Sun, 07 Mar 2021) | 1 line
    
    * Fix bug #38330: reset line number on execute
    ------------------------------------------------------------------------
    r48900 | michael | 2021-03-07 20:02:54 +0100 (Sun, 07 Mar 2021) | 1 line
    
    * Fix bug #38330: reset line number on execute (1-based)
    ------------------------------------------------------------------------
    r48901 | michael | 2021-03-07 20:04:55 +0100 (Sun, 07 Mar 2021) | 1 line
    
    * Wrong delimiter used for samesite cookie value
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@48933 -
This commit is contained in:
michael 2021-03-10 12:50:19 +00:00
parent 08dc64ec0d
commit 8f12e787fa
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/fcl-db/src/base/sqlscript.pp
View File

@ -284,6 +284,7 @@ begin
FUseDollarString:=AValue; FUseDollarString:=AValue;
RecalcSeps; RecalcSeps;
end; end;
function TCustomSQLScript.GetLine: Integer; function TCustomSQLScript.GetLine: Integer;
begin begin
Result:=FLine - 1; Result:=FLine - 1;
@ -507,6 +508,7 @@ begin
FIsSkipping:=False; FIsSkipping:=False;
FSkipStackIndex:=0; FSkipStackIndex:=0;
Faborted:=False; Faborted:=False;
FLine:=1;
DefaultDirectives; DefaultDirectives;
Repeat Repeat
NextStatement(); NextStatement();

2
packages/fcl-web/src/base/httpdefs.pp
View File

@ -2347,7 +2347,7 @@ begin
if FSecure then if FSecure then
AddToResult(SCookieSecure); AddToResult(SCookieSecure);
if FSameSite<>ssEmpty then if FSameSite<>ssEmpty then
AddToResult(SCookieSameSite+': '+SSameSiteValues[FSameSite]); AddToResult(SCookieSameSite+'='+SSameSiteValues[FSameSite]);
except except
{$ifdef cgidebug} {$ifdef cgidebug}
On E : Exception do On E : Exception do

2
packages/rtl-objpas/src/inc/strutils.pp
View File

@ -1053,7 +1053,7 @@ begin
if (Length(AText) >= Length(ASubText)) and (ASubText <> '') then if (Length(AText) >= Length(ASubText)) and (ASubText <> '') then
Result := StrLComp(PChar(ASubText), PChar(AText), Length(ASubText)) = 0 Result := StrLComp(PChar(ASubText), PChar(AText), Length(ASubText)) = 0
else else
Result := False; Result := (AsubText='');
end; end;