aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2014-06-11 10:53:08 +0200
committerHenrik Nord <[email protected]>2014-06-11 10:53:08 +0200
commit9731b5a5f4f453209ee07c8aea3008958601223a (patch)
treef069bdf74bd29ecf2722adf991fd9d3cc3dea6a7
parent93b00b52194febe89beb09b137d44d424ed21f11 (diff)
parent7b93f5d8a224a0a076a420294c95a666a763ee60 (diff)
downloadotp-9731b5a5f4f453209ee07c8aea3008958601223a.tar.gz
otp-9731b5a5f4f453209ee07c8aea3008958601223a.tar.bz2
otp-9731b5a5f4f453209ee07c8aea3008958601223a.zip
Merge branch 'qrilka/ssl-seconds-in-24h' into maint
* qrilka/ssl-seconds-in-24h: ssl: Fix incorrect number of seconds in 24 hours
-rw-r--r--lib/ssl/src/ssl_manager.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_manager.erl b/lib/ssl/src/ssl_manager.erl
index 2bc5a90f68..66dfdf86a9 100644
--- a/lib/ssl/src/ssl_manager.erl
+++ b/lib/ssl/src/ssl_manager.erl
@@ -52,8 +52,8 @@
last_delay_timer = {undefined, undefined}%% Keep for testing purposes
}).
--define('24H_in_msec', 8640000).
--define('24H_in_sec', 8640).
+-define('24H_in_msec', 86400000).
+-define('24H_in_sec', 86400).
-define(GEN_UNIQUE_ID_MAX_TRIES, 10).
-define(SESSION_VALIDATION_INTERVAL, 60000).
-define(CLEAR_PEM_CACHE, 120000).