mirror of
https://github.com/XTLS/Xray-core.git
synced 2024-11-12 19:54:45 +00:00
Add WaitReadCloser to make H2 real 0-RTT
This commit is contained in:
parent
7b54255cc1
commit
6526e74d49
|
@ -3,6 +3,7 @@ package http
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
gotls "crypto/tls"
|
gotls "crypto/tls"
|
||||||
|
"io"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
"sync"
|
"sync"
|
||||||
|
@ -166,23 +167,70 @@ func Dial(ctx context.Context, dest net.Destination, streamSettings *internet.Me
|
||||||
// Disable any compression method from server.
|
// Disable any compression method from server.
|
||||||
request.Header.Set("Accept-Encoding", "identity")
|
request.Header.Set("Accept-Encoding", "identity")
|
||||||
|
|
||||||
response, err := client.Do(request)
|
wrc := &WaitReadCloser{Wait: make(chan struct{})}
|
||||||
if err != nil {
|
go func() {
|
||||||
return nil, newError("failed to dial to ", dest).Base(err).AtWarning()
|
response, err := client.Do(request)
|
||||||
}
|
if err != nil {
|
||||||
if response.StatusCode != 200 {
|
newError("failed to dial to ", dest).Base(err).AtWarning().WriteToLog(session.ExportIDToError(ctx))
|
||||||
return nil, newError("unexpected status", response.StatusCode).AtWarning()
|
wrc.Close()
|
||||||
}
|
return
|
||||||
|
}
|
||||||
|
if response.StatusCode != 200 {
|
||||||
|
newError("unexpected status", response.StatusCode).AtWarning().WriteToLog(session.ExportIDToError(ctx))
|
||||||
|
wrc.Close()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
wrc.Set(response.Body)
|
||||||
|
}()
|
||||||
|
|
||||||
bwriter := buf.NewBufferedWriter(pwriter)
|
bwriter := buf.NewBufferedWriter(pwriter)
|
||||||
common.Must(bwriter.SetBuffered(false))
|
common.Must(bwriter.SetBuffered(false))
|
||||||
return cnc.NewConnection(
|
return cnc.NewConnection(
|
||||||
cnc.ConnectionOutput(response.Body),
|
cnc.ConnectionOutput(wrc),
|
||||||
cnc.ConnectionInput(bwriter),
|
cnc.ConnectionInput(bwriter),
|
||||||
cnc.ConnectionOnClose(common.ChainedClosable{breader, bwriter, response.Body}),
|
cnc.ConnectionOnClose(common.ChainedClosable{breader, bwriter, wrc}),
|
||||||
), nil
|
), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
common.Must(internet.RegisterTransportDialer(protocolName, Dial))
|
common.Must(internet.RegisterTransportDialer(protocolName, Dial))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type WaitReadCloser struct {
|
||||||
|
Wait chan struct{}
|
||||||
|
io.ReadCloser
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w *WaitReadCloser) Set(rc io.ReadCloser) {
|
||||||
|
w.ReadCloser = rc
|
||||||
|
defer func() {
|
||||||
|
if err := recover(); err != nil {
|
||||||
|
rc.Close()
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
close(w.Wait)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w *WaitReadCloser) Read(b []byte) (int, error) {
|
||||||
|
if w.ReadCloser == nil {
|
||||||
|
if <-w.Wait; w.ReadCloser == nil {
|
||||||
|
return 0, io.ErrClosedPipe
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return w.ReadCloser.Read(b)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w *WaitReadCloser) Close() error {
|
||||||
|
if w.ReadCloser != nil {
|
||||||
|
return w.ReadCloser.Close()
|
||||||
|
}
|
||||||
|
defer func() {
|
||||||
|
if err := recover(); err != nil {
|
||||||
|
if w.ReadCloser != nil {
|
||||||
|
w.ReadCloser.Close()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
close(w.Wait)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue