Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
Actor Framework
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
Actor Framework
Commits
8d7a32a8
Commit
8d7a32a8
authored
Jul 15, 2020
by
Dominik Charousset
Committed by
Dominik Charousset
Jul 16, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Close socket if SSL session initialization fails
(cherry picked from commit
0f47d22e
)
parent
8d359374
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
1 deletion
+15
-1
CHANGELOG.md
CHANGELOG.md
+9
-0
libcaf_openssl/src/openssl/middleman_actor.cpp
libcaf_openssl/src/openssl/middleman_actor.cpp
+6
-1
No files found.
CHANGELOG.md
View file @
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
...
...
libcaf_openssl/src/openssl/middleman_actor.cpp
View file @
8d7a32a8
...
@@ -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
;
}
}
};
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment