File tree 2 files changed +6
-3
lines changed
2 files changed +6
-3
lines changed Original file line number Diff line number Diff line change @@ -700,6 +700,7 @@ namespace ix
700
700
if (_readyState != ReadyState::CLOSING)
701
701
{
702
702
// send back the CLOSE frame
703
+ setReadyState (ReadyState::CLOSING);
703
704
sendCloseFrame (code, reason);
704
705
705
706
wakeUpFromPoll (SelectInterrupt::kCloseRequest );
@@ -1072,7 +1073,10 @@ namespace ix
1072
1073
else if (ret <= 0 )
1073
1074
{
1074
1075
closeSocket ();
1075
- setReadyState (ReadyState::CLOSED);
1076
+ if (_readyState != ReadyState::CLOSING)
1077
+ {
1078
+ setReadyState (ReadyState::CLOSED);
1079
+ }
1076
1080
return false ;
1077
1081
}
1078
1082
else
Original file line number Diff line number Diff line change @@ -24,14 +24,13 @@ set (TEST_TARGET_NAMES
24
24
# IXWebSocketBroadcastTest ## FIXME was depending on cobra / take a broadcast server from ws
25
25
IXStrCaseCompareTest
26
26
IXExponentialBackoffTest
27
+ IXWebSocketCloseTest
27
28
)
28
29
29
30
# Some unittest don't work on windows yet
30
31
# Windows without TLS does not have hmac yet
31
32
if (UNIX )
32
33
list (APPEND TEST_TARGET_NAMES
33
- IXWebSocketCloseTest
34
-
35
34
# Fail on Windows in CI probably because the pathing is wrong and
36
35
# some resource files cannot be found
37
36
IXHttpServerTest
You can’t perform that action at this time.
0 commit comments