diff options
| author | michael <michael@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2021-03-10 12:50:19 +0000 |
|---|---|---|
| committer | michael <michael@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2021-03-10 12:50:19 +0000 |
| commit | f41f9033b86f11d2ca3875a26b342261e6046c94 (patch) | |
| tree | b57871983e0f2066eedc8852c70990fd2b0f129a | |
| parent | d38a6e41c51bb1283ff7b2e4ea9daf2daf42db1a (diff) | |
| download | fpc-f41f9033b86f11d2ca3875a26b342261e6046c94.tar.gz | |
* 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: https://svn.freepascal.org/svn/fpc/branches/fixes_3_2@48933 3ad0048d-3df7-0310-abae-a5850022a9f2
| -rw-r--r-- | packages/fcl-db/src/base/sqlscript.pp | 2 | ||||
| -rw-r--r-- | packages/fcl-web/src/base/httpdefs.pp | 2 | ||||
| -rw-r--r-- | packages/rtl-objpas/src/inc/strutils.pp | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/packages/fcl-db/src/base/sqlscript.pp b/packages/fcl-db/src/base/sqlscript.pp index 2a08e276e5..afc1944705 100644 --- a/packages/fcl-db/src/base/sqlscript.pp +++ b/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(); diff --git a/packages/fcl-web/src/base/httpdefs.pp b/packages/fcl-web/src/base/httpdefs.pp index e2886c79b6..c5ed8944c9 100644 --- a/packages/fcl-web/src/base/httpdefs.pp +++ b/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 diff --git a/packages/rtl-objpas/src/inc/strutils.pp b/packages/rtl-objpas/src/inc/strutils.pp index a84075f9b7..76592e4e05 100644 --- a/packages/rtl-objpas/src/inc/strutils.pp +++ b/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; |