Commit e7b3d8cc authored by Dominik Charousset's avatar Dominik Charousset

Merge branch 'integration/issue/1119'

parents 8d359374 8d7a32a8
...@@ -171,6 +171,14 @@ is based on [Keep a Changelog](https://keepachangelog.com). ...@@ -171,6 +171,14 @@ is based on [Keep a Changelog](https://keepachangelog.com).
actors that produce a signaling NaN trigger trap handlers before sending actors that produce a signaling NaN trigger trap handlers before sending
the result to another actor. the result to another actor.
## [0.17.6] - Unreleased
### Fixed
- Trying to connect to an actor published via the OpenSSL module with the I/O
module no longer hangs indefinitely (#1119). Instead, the OpenSSL module
immediately closes the socket if initializing the SSL session fails.
## [0.17.5] - 2020-05-13 ## [0.17.5] - 2020-05-13
### Added ### Added
...@@ -490,6 +498,7 @@ is based on [Keep a Changelog](https://keepachangelog.com). ...@@ -490,6 +498,7 @@ is based on [Keep a Changelog](https://keepachangelog.com).
- Configuring colored terminal output should now print colored output. - Configuring colored terminal output should now print colored output.
[0.18.0]: https://github.com/actor-framework/actor-framework/compare/0.17.3...master [0.18.0]: https://github.com/actor-framework/actor-framework/compare/0.17.3...master
[0.17.6]: https://github.com/actor-framework/actor-framework/compare/0.17.5...release/0.17
[0.17.5]: https://github.com/actor-framework/actor-framework/releases/0.17.5 [0.17.5]: https://github.com/actor-framework/actor-framework/releases/0.17.5
[0.17.4]: https://github.com/actor-framework/actor-framework/releases/0.17.4 [0.17.4]: https://github.com/actor-framework/actor-framework/releases/0.17.4
[0.17.3]: https://github.com/actor-framework/actor-framework/releases/0.17.3 [0.17.3]: https://github.com/actor-framework/actor-framework/releases/0.17.3
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include "caf/actor.hpp" #include "caf/actor.hpp"
#include "caf/actor_proxy.hpp" #include "caf/actor_proxy.hpp"
#include "caf/actor_system_config.hpp" #include "caf/actor_system_config.hpp"
#include "caf/detail/socket_guard.hpp"
#include "caf/logger.hpp" #include "caf/logger.hpp"
#include "caf/node_id.hpp" #include "caf/node_id.hpp"
#include "caf/sec.hpp" #include "caf/sec.hpp"
...@@ -224,6 +225,7 @@ public: ...@@ -224,6 +225,7 @@ public:
return false; return false;
auto& dm = acceptor_.backend(); auto& dm = acceptor_.backend();
auto fd = acceptor_.accepted_socket(); auto fd = acceptor_.accepted_socket();
detail::socket_guard sguard{fd};
io::network::nonblocking(fd, true); io::network::nonblocking(fd, true);
auto sssn = make_session(parent()->system(), fd, true); auto sssn = make_session(parent()->system(), fd, true);
if (sssn == nullptr) { if (sssn == nullptr) {
...@@ -233,7 +235,10 @@ public: ...@@ -233,7 +235,10 @@ public:
auto scrb = make_counted<scribe_impl>(dm, fd, std::move(sssn)); auto scrb = make_counted<scribe_impl>(dm, fd, std::move(sssn));
auto hdl = scrb->hdl(); auto hdl = scrb->hdl();
parent()->add_scribe(std::move(scrb)); parent()->add_scribe(std::move(scrb));
return doorman::new_connection(&dm, hdl); auto result = doorman::new_connection(&dm, hdl);
if (result)
sguard.release();
return result;
} }
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment