diff options
author | Ingela Anderton Andin <[email protected]> | 2018-11-06 09:35:45 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2018-11-06 09:35:45 +0100 |
commit | e7e3f59e5350bb39f57f0403f3c78443c58039b1 (patch) | |
tree | ba87b01ee86e26d0fef001b4aed4074edda5caa3 /lib/observer/src/cdv_html_wx.erl | |
parent | 8f4eb75f5a8d3f76d4e5e1c7d56024c727358ac7 (diff) | |
parent | e64822b68ec1f06481af5ea776273b6dbb526d63 (diff) | |
download | otp-e7e3f59e5350bb39f57f0403f3c78443c58039b1.tar.gz otp-e7e3f59e5350bb39f57f0403f3c78443c58039b1.tar.bz2 otp-e7e3f59e5350bb39f57f0403f3c78443c58039b1.zip |
Merge branch 'ingela/ssl/controlling-process-allowed-on-transport-accept-socket' into maint
* ingela/ssl/controlling-process-allowed-on-transport-accept-socket:
ssl: controlling_process should be allowed on transpor_accept sockets along with handshake
Diffstat (limited to 'lib/observer/src/cdv_html_wx.erl')
0 files changed, 0 insertions, 0 deletions