Merge branch 'master' of https://github.com/v1ray/v2ray-core

pub999 · May 30, 2017 · a703c30 · a703c30
2 parents cb33232 + 3d13bba
commit a703c30
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/proxy/vmess/inbound/inbound.go b/proxy/vmess/inbound/inbound.go
@@ -174,7 +174,9 @@ func transferResponse(timer signal.ActivityTimer, session *encoding.ServerSessio
 
 // Process implements proxy.Inbound.Process().
 func (v *Handler) Process(ctx context.Context, network net.Network, connection internet.Connection, dispatcher dispatcher.Interface) error {
-	common.Must(connection.SetReadDeadline(time.Now().Add(time.Second * 8)))
+	if err := connection.SetReadDeadline(time.Now().Add(time.Second * 8)); err != nil {
+		return err
+	}
 
 	reader := buf.NewBufferedReader(connection)