go/regolith
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Return only Bad Gateway errors to client

Browse Source
This commit is contained in:
Edgaru089 2025-03-27 22:02:56 +08:00
parent a7b2162433
commit 19a48ee7ed
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/http/server.go
View File

@ -28,6 +28,9 @@ func (s *Server) Serve(listener net.Listener) (err error) {
for { for {
conn, err := listener.Accept() conn, err := listener.Accept()
if err != nil { if err != nil {
if errors.Is(err, net.ErrClosed) {
return nil
}
return err return err
} }
@ -104,10 +107,6 @@ func (c *cached_conn) Read(b []byte) (int, error) {
return c.Conn.Read(b) return c.Conn.Read(b)
} }
type timeout interface {
Timeout() bool
}
// handle_connect returns until the connection is closed by // handle_connect returns until the connection is closed by
// the client, or errors. You don't need to close it again. // the client, or errors. You don't need to close it again.
func (s *Server) handle_connect(conn net.Conn, req *http.Request) { func (s *Server) handle_connect(conn net.Conn, req *http.Request) {
@ -133,12 +132,7 @@ func (s *Server) handle_connect(conn net.Conn, req *http.Request) {
// dial // dial
remote_conn, err := dialer.Dial("tcp", req_addr) remote_conn, err := dialer.Dial("tcp", req_addr)
if err != nil { if err != nil {
var op timeout simple_respond(conn, req, http.StatusBadGateway)
if errors.As(err, &op) && op.Timeout() {
simple_respond(conn, req, http.StatusGatewayTimeout)
} else {
simple_respond(conn, req, http.StatusBadGateway)
}
close_err = err close_err = err
return return
} }