mirror of
https://github.com/XTLS/Xray-core.git
synced 2025-06-28 23:02:03 +08:00
Compare commits
No commits in common. "e011b746dc8959df61996a7422b4dece965151c3" and "f38d3f786a47997533e4a2dd5283c63f0d4eefa0" have entirely different histories.
e011b746dc
...
f38d3f786a
1
.github/docker/Dockerfile
vendored
1
.github/docker/Dockerfile
vendored
@ -45,7 +45,6 @@ RUN mkdir -p /tmp/var/log/xray && touch \
|
||||
FROM gcr.io/distroless/static:nonroot
|
||||
|
||||
COPY --from=build --chown=0:0 --chmod=755 /src/xray /usr/local/bin/xray
|
||||
COPY --from=build --chown=0:0 --chmod=755 /tmp/empty /usr/local/share/xray
|
||||
COPY --from=build --chown=0:0 --chmod=644 /tmp/geodat/*.dat /usr/local/share/xray/
|
||||
COPY --from=build --chown=0:0 --chmod=755 /tmp/empty /usr/local/etc/xray
|
||||
COPY --from=build --chown=0:0 --chmod=644 /tmp/usr/local/etc/xray/*.json /usr/local/etc/xray/
|
||||
|
1
.github/docker/Dockerfile.usa
vendored
1
.github/docker/Dockerfile.usa
vendored
@ -54,7 +54,6 @@ RUN mkdir -p /tmp/var/log/xray && touch \
|
||||
FROM --platform=linux/amd64 gcr.io/distroless/static:nonroot
|
||||
|
||||
COPY --from=build --chown=0:0 --chmod=755 /src/xray /usr/local/bin/xray
|
||||
COPY --from=build --chown=0:0 --chmod=755 /tmp/empty /usr/local/share/xray
|
||||
COPY --from=build --chown=0:0 --chmod=644 /tmp/geodat/*.dat /usr/local/share/xray/
|
||||
COPY --from=build --chown=0:0 --chmod=755 /tmp/empty /usr/local/etc/xray
|
||||
COPY --from=build --chown=0:0 --chmod=644 /tmp/usr/local/etc/xray/*.json /usr/local/etc/xray/
|
||||
|
@ -125,8 +125,6 @@
|
||||
|
||||
[Code of Conduct](https://github.com/XTLS/Xray-core/blob/main/CODE_OF_CONDUCT.md)
|
||||
|
||||
[](https://deepwiki.com/XTLS/Xray-core)
|
||||
|
||||
## Credits
|
||||
|
||||
- [Xray-core v1.0.0](https://github.com/XTLS/Xray-core/releases/tag/v1.0.0) was forked from [v2fly-core 9a03cc5](https://github.com/v2fly/v2ray-core/commit/9a03cc5c98d04cc28320fcee26dbc236b3291256), and we have made & accumulated a huge number of enhancements over time, check [the release notes for each version](https://github.com/XTLS/Xray-core/releases).
|
||||
|
@ -286,13 +286,7 @@ func TestCommanderListHandlers(t *testing.T) {
|
||||
t.Error("unexpected nil response")
|
||||
}
|
||||
|
||||
if diff := cmp.Diff(
|
||||
inboundResp.Inbounds,
|
||||
clientConfig.Inbound,
|
||||
protocmp.Transform(),
|
||||
cmpopts.SortSlices(func(a, b *core.InboundHandlerConfig) bool {
|
||||
return a.Tag < b.Tag
|
||||
})); diff != "" {
|
||||
if diff := cmp.Diff(inboundResp.Inbounds, clientConfig.Inbound, protocmp.Transform()); diff != "" {
|
||||
t.Fatalf("inbound response doesn't match config (-want +got):\n%s", diff)
|
||||
}
|
||||
|
||||
@ -302,13 +296,7 @@ func TestCommanderListHandlers(t *testing.T) {
|
||||
t.Error("unexpected nil response")
|
||||
}
|
||||
|
||||
if diff := cmp.Diff(
|
||||
outboundResp.Outbounds,
|
||||
clientConfig.Outbound,
|
||||
protocmp.Transform(),
|
||||
cmpopts.SortSlices(func(a, b *core.InboundHandlerConfig) bool {
|
||||
return a.Tag < b.Tag
|
||||
})); diff != "" {
|
||||
if diff := cmp.Diff(outboundResp.Outbounds, clientConfig.Outbound, protocmp.Transform()); diff != "" {
|
||||
t.Fatalf("outbound response doesn't match config (-want +got):\n%s", diff)
|
||||
}
|
||||
}
|
||||
|
@ -72,7 +72,6 @@ func ListenTCP(ctx context.Context, address net.Address, port net.Port, streamSe
|
||||
}
|
||||
if config := reality.ConfigFromStreamSettings(streamSettings); config != nil {
|
||||
l.realityConfig = config.GetREALITYConfig()
|
||||
go goreality.DetectPostHandshakeRecordsLens(l.realityConfig)
|
||||
}
|
||||
|
||||
if tcpSettings.HeaderSettings != nil {
|
||||
|
Loading…
x
Reference in New Issue
Block a user