Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/candidate-9.6.x'
Browse files Browse the repository at this point in the history
Signed-off-by: Jake Smith <[email protected]>
  • Loading branch information
jakesmith committed Apr 15, 2024
2 parents 7fc2f2e + 931ee83 commit d48ce3f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion system/mp/mpcomm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2380,7 +2380,7 @@ bool CMPConnectThread::handleAcceptedSocket(ISocket *_sock, unsigned timeoutMs,
// NB: min size is ConnectHdr.id for legacy clients, can thus distinguish old from new
try
{
traceSlowReadTms("MP: initial accept packet from", _sock, &connectHdr, sizeof(connectHdr.id), sizeof(connectHdr), rd, timeoutMs, CONFIRM_TIMEOUT_INTERVAL);
traceSlowReadTms("MP: initial accept packet from", sock, &connectHdr, sizeof(connectHdr.id), sizeof(connectHdr), rd, timeoutMs, CONFIRM_TIMEOUT_INTERVAL);
}
catch (IJSOCK_Exception *e)
{
Expand Down

0 comments on commit d48ce3f

Please sign in to comment.