aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl_internal.hrl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-12-04 09:54:30 +0100
committerIngela Anderton Andin <[email protected]>2018-12-04 09:58:53 +0100
commit6ce31fab75e8768001366607b8be52df2809749d (patch)
treec3f52d36713b70be59241c7f937703476aaec03e /lib/ssl/src/ssl_internal.hrl
parent715a743bf25ab6e3ae51da59abdc4249a4bed833 (diff)
parentc44f975ac30e652ae08b878edf22bac3b6a1c8a2 (diff)
downloadotp-6ce31fab75e8768001366607b8be52df2809749d.tar.gz
otp-6ce31fab75e8768001366607b8be52df2809749d.tar.bz2
otp-6ce31fab75e8768001366607b8be52df2809749d.zip
Merge branch 'maint'
Conflicts: lib/ssl/src/dtls_connection.erl lib/ssl/src/ssl_connection.erl lib/ssl/src/tls_connection.erl
Diffstat (limited to 'lib/ssl/src/ssl_internal.hrl')
-rw-r--r--lib/ssl/src/ssl_internal.hrl1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl
index 48798799f7..a079c6a796 100644
--- a/lib/ssl/src/ssl_internal.hrl
+++ b/lib/ssl/src/ssl_internal.hrl
@@ -61,6 +61,7 @@
-define(CDR_MAGIC, "GIOP").
-define(CDR_HDR_SIZE, 12).
+-define(INTERNAL_ACTIVE_N, 100).
-define(DEFAULT_TIMEOUT, 5000).
-define(NO_DIST_POINT, "http://dummy/no_distribution_point").