Skip to content

Commit b27407e

Browse files
author
misu
committed
mod: no need to change line feed
1 parent cd973fd commit b27407e

File tree

2 files changed

+1
-19
lines changed

2 files changed

+1
-19
lines changed

compression.go

+1-12
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ var (
3535
func decompressNoContextTakeover(r io.Reader) io.ReadCloser {
3636
fr, _ := flateReaderPool.Get().(io.ReadCloser)
3737
fr.(flate.Resetter).Reset(io.MultiReader(r, strings.NewReader(tail)), nil)
38-
return &flateReadWrapper{fr: fr}
38+
return &flateReadWrapper{fr}
3939
}
4040

4141
func isValidCompressionLevel(level int) bool {
@@ -100,7 +100,6 @@ func (w *flateWriteWrapper) Write(p []byte) (int, error) {
100100
if w.fw == nil {
101101
return 0, errWriteClosed
102102
}
103-
104103
return w.fw.Write(p)
105104
}
106105

@@ -109,22 +108,17 @@ func (w *flateWriteWrapper) Close() error {
109108
return errWriteClosed
110109
}
111110
err1 := w.fw.Flush()
112-
113111
w.p.Put(w.fw)
114112
w.fw = nil
115-
116113
if w.tw.p != [4]byte{0, 0, 0xff, 0xff} {
117114
return errors.New("websocket: internal error, unexpected bytes at end of flate stream")
118115
}
119-
120116
w.tw.p = [4]byte{}
121117
w.tw.n = 0
122-
123118
err2 := w.tw.w.Close()
124119
if err1 != nil {
125120
return err1
126121
}
127-
128122
return err2
129123
}
130124

@@ -136,16 +130,13 @@ func (r *flateReadWrapper) Read(p []byte) (int, error) {
136130
if r.fr == nil {
137131
return 0, io.ErrClosedPipe
138132
}
139-
140133
n, err := r.fr.Read(p)
141-
142134
if err == io.EOF {
143135
// Preemptively place the reader back in the pool. This helps with
144136
// scenarios where the application does not call NextReader() soon after
145137
// this final read.
146138
r.Close()
147139
}
148-
149140
return n, err
150141
}
151142

@@ -154,9 +145,7 @@ func (r *flateReadWrapper) Close() error {
154145
return io.ErrClosedPipe
155146
}
156147
err := r.fr.Close()
157-
158148
flateReaderPool.Put(r.fr)
159-
160149
r.fr = nil
161150
return err
162151
}

conn.go

-7
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,6 @@ func newConnBRW(conn net.Conn, isServer bool, readBufferSize, writeBufferSize in
333333
enableWriteCompression: true,
334334
compressionLevel: defaultCompressionLevel,
335335
}
336-
337336
c.SetCloseHandler(nil)
338337
c.SetPingHandler(nil)
339338
c.SetPongHandler(nil)
@@ -755,7 +754,6 @@ func (c *Conn) WriteMessage(messageType int, data []byte) error {
755754
if _, err = w.Write(data); err != nil {
756755
return err
757756
}
758-
759757
return w.Close()
760758
}
761759

@@ -952,7 +950,6 @@ func (c *Conn) NextReader() (messageType int, r io.Reader, err error) {
952950
if c.readDecompress {
953951
c.reader = c.newDecompressionReader(c.reader)
954952
}
955-
956953
return frameType, c.reader, nil
957954
}
958955
}
@@ -979,11 +976,9 @@ func (r *messageReader) Read(b []byte) (int, error) {
979976
for c.readErr == nil {
980977

981978
if c.readRemaining > 0 {
982-
// Determine the size of the data to be read.
983979
if int64(len(b)) > c.readRemaining {
984980
b = b[:c.readRemaining]
985981
}
986-
987982
n, err := c.br.Read(b)
988983
c.readErr = hideTempErr(err)
989984
if c.isServer {
@@ -993,7 +988,6 @@ func (r *messageReader) Read(b []byte) (int, error) {
993988
if c.readRemaining > 0 && c.readErr == io.EOF {
994989
c.readErr = errUnexpectedEOF
995990
}
996-
997991
return n, c.readErr
998992
}
999993

@@ -1031,7 +1025,6 @@ func (c *Conn) ReadMessage() (messageType int, p []byte, err error) {
10311025
return messageType, nil, err
10321026
}
10331027
p, err = ioutil.ReadAll(r)
1034-
10351028
return messageType, p, err
10361029
}
10371030

0 commit comments

Comments
 (0)