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

    ------------------------------------------------------------------------
    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 -

packages/fcl-db/src/base/sqlscript.pp

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

packages/fcl-web/src/base/httpdefs.pp

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

packages/rtl-objpas/src/inc/strutils.pp

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