serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-24 03:05:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

trim possible line terminators from message

Browse source
This commit is contained in:
Austin 2015-11-03 13:37:32 -08:00
parent abc7c6a148
commit 34c369155c
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
middleware/websocket/websocket.go
View file

@ -5,6 +5,7 @@ package websocket
import ( import (
"bufio" "bufio"
"bytes"
"io" "io"
"net" "net"
"net/http" "net/http"
@ -224,7 +225,7 @@ func pumpStdout(conn *websocket.Conn, stdout io.Reader, done chan struct{}) {
s := bufio.NewScanner(stdout) s := bufio.NewScanner(stdout)
for s.Scan() { for s.Scan() {
conn.SetWriteDeadline(time.Now().Add(writeWait)) conn.SetWriteDeadline(time.Now().Add(writeWait))
if err := conn.WriteMessage(websocket.TextMessage, s.Bytes()); err != nil { if err := conn.WriteMessage(websocket.TextMessage, bytes.TrimSpace(s.Bytes())); err != nil {
break break
} }
} }