extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2024-11-21 23:53:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into interstitial_chrome

Browse Source
This commit is contained in:
Michael Quigley 2024-07-29 14:05:25 -04:00
commit b249707f77
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -4,6 +4,8 @@
FIX: Fix for setting the `zrok_interstitial` cookie on Chrome-based browsers. FIX: Fix for setting the `zrok_interstitial` cookie on Chrome-based browsers.
FIX: Fix for `store.IsAccountGrantedSkipInterstitial` to respect the `deleted` flag.
FIX: When an error occurs connecting to the proxied endpoint, the `proxy` backend should return HTTP status `502` (https://github.com/openziti/zrok/issues/703) FIX: When an error occurs connecting to the proxied endpoint, the `proxy` backend should return HTTP status `502` (https://github.com/openziti/zrok/issues/703)
## v0.4.36 ## v0.4.36

2
controller/store/skipInterstitialGrant.go
View File

@ -6,7 +6,7 @@ import (
) )
func (str *Store) IsAccountGrantedSkipInterstitial(acctId int, trx *sqlx.Tx) (bool, error) { func (str *Store) IsAccountGrantedSkipInterstitial(acctId int, trx *sqlx.Tx) (bool, error) {
stmt, err := trx.Prepare("select count(0) from skip_interstitial_grants where account_id = $1") stmt, err := trx.Prepare("select count(0) from skip_interstitial_grants where account_id = $1 and not deleted")
if err != nil { if err != nil {
return false, errors.Wrap(err, "error preparing skip_interstitial_grants select statement") return false, errors.Wrap(err, "error preparing skip_interstitial_grants select statement")
} }