Pull request 2297: AG-20945-filter-storage
Squashed commit of the following: commit 2611fd57815910c035621879094ab954389f31b4 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Nov 1 16:29:06 2024 +0300 dnsforward: imp test commit 5efcfda937da2ce229ae1a3c57d7a4de35ee7caf Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Nov 1 15:54:18 2024 +0300 rulelist: imp docs, tests commit 7a759c46997ed69e931a0a7c4f25820c52660a3f Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Nov 1 14:36:08 2024 +0300 all: add filtering storage; upd golibs
This commit is contained in:
@@ -16,6 +16,7 @@ import (
|
||||
"github.com/AdguardTeam/golibs/httphdr"
|
||||
"github.com/AdguardTeam/golibs/log"
|
||||
"github.com/AdguardTeam/golibs/netutil"
|
||||
"github.com/AdguardTeam/golibs/netutil/urlutil"
|
||||
"github.com/NYTimes/gziphandler"
|
||||
)
|
||||
|
||||
@@ -376,7 +377,7 @@ func handleHTTPSRedirect(w http.ResponseWriter, r *http.Request) (proceed bool)
|
||||
//
|
||||
// See https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Origin.
|
||||
originURL := &url.URL{
|
||||
Scheme: aghhttp.SchemeHTTP,
|
||||
Scheme: urlutil.SchemeHTTP,
|
||||
Host: r.Host,
|
||||
}
|
||||
|
||||
@@ -395,7 +396,7 @@ func httpsURL(u *url.URL, host string, portHTTPS uint16) (redirectURL *url.URL)
|
||||
}
|
||||
|
||||
return &url.URL{
|
||||
Scheme: aghhttp.SchemeHTTPS,
|
||||
Scheme: urlutil.SchemeHTTPS,
|
||||
Host: hostPort,
|
||||
Path: u.Path,
|
||||
RawQuery: u.RawQuery,
|
||||
|
||||
Reference in New Issue
Block a user