From 5cb659e073b12817817df7c331c5c4dc3c278aa3 Mon Sep 17 00:00:00 2001
From: boyce <boyce@atbc.com>
Date: Tue, 29 Oct 2019 10:54:16 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E5=A2=9E=E5=8A=A0=E7=AE=A1=E9=81=93?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=EF=BC=8C=E5=8D=B3=E6=9C=AC=E5=9C=B0=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=E6=97=B6=EF=BC=8C=E5=8F=91=E7=94=9F=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E4=B8=8D=E6=96=AD=E5=BC=80=E8=BF=9E=E6=8E=A5=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e266c50ed635c5f3ad131289583c3aa92b5376e6.
---
 rpc/client.go | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/rpc/client.go b/rpc/client.go
index 4cef3e0..7865491 100644
--- a/rpc/client.go
+++ b/rpc/client.go
@@ -51,7 +51,6 @@ type Client struct {
 	pending  map[uint64]*Call
 	closing  bool // user has called Close
 	shutdown bool // server has told us to stop
-	bPipe    bool
 }
 
 // A ClientCodec implements writing of RPC requests and
@@ -152,9 +151,6 @@ func (client *Client) input() {
 			if err != nil {
 				call.Error = errors.New("reading body " + err.Error())
 			}
-			if client.bPipe {
-				err = nil
-			}
 			call.done()
 		}
 	}
@@ -203,19 +199,18 @@ func (call *Call) done() {
 // so no interlocking is required. However each half may be accessed
 // concurrently so the implementation of conn should protect against
 // concurrent reads or concurrent writes.
-func NewClient(conn io.ReadWriteCloser, isPipe bool) *Client {
+func NewClient(conn io.ReadWriteCloser) *Client {
 	encBuf := bufio.NewWriter(conn)
 	client := &gobClientCodec{conn, gob.NewDecoder(conn), gob.NewEncoder(encBuf), encBuf}
-	return NewClientWithCodec(client, isPipe)
+	return NewClientWithCodec(client)
 }
 
 // NewClientWithCodec is like NewClient but uses the specified
 // codec to encode requests and decode responses.
-func NewClientWithCodec(codec ClientCodec, isPipe bool) *Client {
+func NewClientWithCodec(codec ClientCodec) *Client {
 	client := &Client{
 		codec:   codec,
 		pending: make(map[uint64]*Call),
-		bPipe:   isPipe,
 	}
 	go client.input()
 	return client
@@ -274,7 +269,7 @@ func DialHTTPPath(network, address, path string) (*Client, error) {
 	// before switching to RPC protocol.
 	resp, err := http.ReadResponse(bufio.NewReader(conn), &http.Request{Method: "CONNECT"})
 	if err == nil && resp.Status == connected {
-		return NewClient(conn, false), nil
+		return NewClient(conn), nil
 	}
 	if err == nil {
 		err = errors.New("unexpected HTTP response: " + resp.Status)
@@ -296,7 +291,7 @@ func Dial(network, address string) (*Client, error) {
 	}
 	tcpconn, _ := conn.(*net.TCPConn)
 	tcpconn.SetNoDelay(true)
-	return NewClient(conn, false), nil
+	return NewClient(conn), nil
 }
 
 func DialTimeOut(network, address string, timeout time.Duration) (*Client, error) {
@@ -306,7 +301,7 @@ func DialTimeOut(network, address string, timeout time.Duration) (*Client, error
 	}
 	tcpconn, _ := conn.(*net.TCPConn)
 	tcpconn.SetNoDelay(true)
-	return NewClient(conn, false), nil
+	return NewClient(conn), nil
 }
 
 // Close calls the underlying codec's Close method. If the connection is already