From 3993d9546652bdfee8bb843eb7c6ed274e7dabc6 Mon Sep 17 00:00:00 2001
From: Gogs <vashstorm@gmail.com>
Date: Wed, 23 Mar 2016 11:56:06 +0800
Subject: [PATCH] fix conn.go

---
 src/frp/utils/conn/conn.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/frp/utils/conn/conn.go b/src/frp/utils/conn/conn.go
index 50501d4e..133b7080 100644
--- a/src/frp/utils/conn/conn.go
+++ b/src/frp/utils/conn/conn.go
@@ -190,7 +190,6 @@ func PipeDecryptoReader(r net.Conn, w net.Conn, key string) {
 			return
 		}
 
-		// res = append(res, '\n')
 		_, err = w.Write(res)
 		if err != nil {
 			log.Error("net.Conn Write error, [%v]", err)
@@ -213,14 +212,15 @@ func PipeEncryptoWriter(r net.Conn, w net.Conn, key string) {
 	log.Debug("PipeEncryptoWriter")
 
 	nreader := bufio.NewReader(r)
+	buf := make([]byte, 10*1024)
 
 	for {
-		buf, err := nreader.ReadBytes('\n')
+		n, err := nreader.Read(buf)
 		if err != nil {
 			log.Error("Conn ReadLine error, [%v]", err)
 			return
 		}
-		res, err := laes.Encrypto(buf)
+		res, err := laes.Encrypto(buf[:n])
 		if err != nil {
 			log.Error("Encrypto error, [%v]", err)
 			return