2gW94/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2025-12-16 20:27:04 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix(dns): inheritance issue with disableCache (#5351)
Some checks failed
Build and Release for Windows 7 / check-assets (push) Has been cancelled
Details
Build and Release / check-assets (push) Has been cancelled
Details
Test / check-assets (push) Has been cancelled
Details
Build and Release for Windows 7 / build (win7-32, 386, windows) (push) Has been cancelled
Details
Build and Release for Windows 7 / build (win7-64, amd64, windows) (push) Has been cancelled
Details
Build and Release / build (386, freebsd, ) (push) Has been cancelled
Details
Build and Release / build (386, linux, ) (push) Has been cancelled
Details
Build and Release / build (386, openbsd, ) (push) Has been cancelled
Details
Build and Release / build (386, windows, ) (push) Has been cancelled
Details
Build and Release / build (amd64, android, android-amd64) (push) Has been cancelled
Details
Build and Release / build (amd64, darwin, ) (push) Has been cancelled
Details
Build and Release / build (amd64, freebsd, ) (push) Has been cancelled
Details
Build and Release / build (amd64, linux, ) (push) Has been cancelled
Details
Build and Release / build (amd64, openbsd, ) (push) Has been cancelled
Details
Build and Release / build (amd64, windows, ) (push) Has been cancelled
Details
Build and Release / build (arm, 5, linux) (push) Has been cancelled
Details
Build and Release / build (arm, 6, linux) (push) Has been cancelled
Details
Build and Release / build (arm, 7, freebsd) (push) Has been cancelled
Details
Build and Release / build (arm, 7, linux) (push) Has been cancelled
Details
Build and Release / build (arm, 7, openbsd) (push) Has been cancelled
Details
Build and Release / build (arm, 7, windows) (push) Has been cancelled
Details
Build and Release / build (arm64, android) (push) Has been cancelled
Details
Build and Release / build (arm64, darwin) (push) Has been cancelled
Details
Build and Release / build (arm64, freebsd) (push) Has been cancelled
Details
Build and Release / build (arm64, linux) (push) Has been cancelled
Details
Build and Release / build (arm64, openbsd) (push) Has been cancelled
Details
Build and Release / build (arm64, windows) (push) Has been cancelled
Details
Build and Release / build (loong64, linux) (push) Has been cancelled
Details
Build and Release / build (mips, linux) (push) Has been cancelled
Details
Build and Release / build (mips64, linux) (push) Has been cancelled
Details
Build and Release / build (mips64le, linux) (push) Has been cancelled
Details
Build and Release / build (mipsle, linux) (push) Has been cancelled
Details
Build and Release / build (ppc64, linux) (push) Has been cancelled
Details
Build and Release / build (ppc64le, linux) (push) Has been cancelled
Details
Build and Release / build (riscv64, linux) (push) Has been cancelled
Details
Build and Release / build (s390x, linux) (push) Has been cancelled
Details
Test / test (macos-latest) (push) Has been cancelled
Details
Test / test (ubuntu-latest) (push) Has been cancelled
Details
Test / test (windows-latest) (push) Has been cancelled
Details
Scheduled assets update / geodat (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Meow
2025-11-27 10:12:37 +08:00
committed by GitHub
parent 9d3401b6f0
commit ed5f7e7af5
5 changed files with 108 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
infra/conf/dns.go
View File

@@ -26,8 +26,8 @@ type NameServerConfig struct {
QueryStrategy string `json:"queryStrategy"`
Tag string `json:"tag"`
TimeoutMs uint64 `json:"timeoutMs"`
DisableCache bool `json:"disableCache"`
ServeStale bool `json:"serveStale"`
DisableCache *bool `json:"disableCache"`
ServeStale *bool `json:"serveStale"`
ServeExpiredTTL *uint32 `json:"serveExpiredTTL"`
FinalQuery bool `json:"finalQuery"`
UnexpectedIPs StringList `json:"unexpectedIPs"`
@@ -52,8 +52,8 @@ func (c *NameServerConfig) UnmarshalJSON(data []byte) error {
QueryStrategy string `json:"queryStrategy"`
Tag string `json:"tag"`
TimeoutMs uint64 `json:"timeoutMs"`
DisableCache bool `json:"disableCache"`
ServeStale bool `json:"serveStale"`
DisableCache *bool `json:"disableCache"`
ServeStale *bool `json:"serveStale"`
ServeExpiredTTL *uint32 `json:"serveExpiredTTL"`
FinalQuery bool `json:"finalQuery"`
UnexpectedIPs StringList `json:"unexpectedIPs"`

3
infra/conf/dns_test.go
View File

@@ -20,6 +20,7 @@ func TestDNSConfigParsing(t *testing.T) {
return config.Build()
}
}
expectedServeStale := true
expectedServeExpiredTTL := uint32(172800)
runMultiTestCase(t, []TestCase{
{
@@ -72,7 +73,7 @@ func TestDNSConfigParsing(t *testing.T) {
Size: 1,
},
},
ServeStale: true,
ServeStale: &expectedServeStale,
ServeExpiredTTL: &expectedServeExpiredTTL,
PolicyID: 1, // Servers with certain identical fields share this ID, incrementing starting from 1. See: Build PolicyID
},