3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-27 15:41:05 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4456 from djolemanojlovic/fix_4106

Browse Source 
Problem: Handshake timeout error with ZMTP_2_0
This commit is contained in:
Luca Boccassi 2022-11-11 15:14:39 +01:00 committed by GitHub
commit 3ff3c6cdf3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
RELICENSE/djolemanojlovic.md Normal file
View File

@ -0,0 +1,16 @@
# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
This is a statement by Đorđije Manojlović
that grants permission to relicense its copyrights in the libzmq C++
library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
Open Source Initiative approved license chosen by the current ZeroMQ
BDFL (Benevolent Dictator for Life).
A portion of the commits made by the Github handle "djolemanojlovic", with
commit author "Đorđije Manojlović <djordjije.manojlovic@omicronenergy.com>",
are copyright of Đorđije Manojlović.
This document hereby grants the libzmq project team to relicense libzmq,
including all past, present and future contributions of the author listed above.
Đorđije Manojlović
2022/11/11

8
src/stream_engine_base.cpp
View File

@ -255,8 +255,14 @@ bool zmq::stream_engine_base_t::in_event_internal ()
// Switch into the normal message flow. // Switch into the normal message flow.
_handshaking = false; _handshaking = false;
if (_mechanism == NULL && _has_handshake_stage) if (_mechanism == NULL && _has_handshake_stage) {
_session->engine_ready (); _session->engine_ready ();
if (_has_handshake_timer) {
cancel_timer (handshake_timer_id);
_has_handshake_timer = false;
}
}
} else } else
return false; return false;
} }