github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

Doc sync to code change

pull/238/head
Shelikhoo 2016-08-15 10:25:20 +08:00
parent 7259b3363b
commit d06c75f926
No known key found for this signature in database
GPG Key ID: 7791BDB0709ABD21
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
transport/internet/ws/wsconn.go
View File

@ -24,8 +24,6 @@ type wsconn struct {
func (ws *wsconn) Read(b []byte) (n int, err error) { func (ws *wsconn) Read(b []byte) (n int, err error) {
ws.rlock.Lock() ws.rlock.Lock()
//defer ws.rlock.Unlock()
//ws.checkifRWAfterClosing()
if ws.connClosing { if ws.connClosing {
return 0, io.EOF return 0, io.EOF
@ -90,7 +88,7 @@ func (ws *wsconn) Write(b []byte) (n int, err error) {
process can crash as websocket report "concurrent write to websocket connection" process can crash as websocket report "concurrent write to websocket connection"
even if lock is persent. even if lock is persent.
It is yet to know how to prevent this but a workaround is the only choice. This problem should have been resolved.
*/ */
defer func() { defer func() {
if r := recover(); r != nil { if r := recover(); r != nil {