diff options
| author | Yann Ylavic <ylavic@apache.org> | 2018-06-13 09:54:16 +0000 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2018-06-13 09:54:16 +0000 |
| commit | e6c090ea5a29117f867f2cff06bd99602ce9b356 (patch) | |
| tree | 9cded041211c437d2a929cfa7da6b8d316d5681a /modules/session | |
| parent | ebe2160d0da10bfb63e5a2f2b108dcfd6747cad4 (diff) | |
| download | httpd-e6c090ea5a29117f867f2cff06bd99602ce9b356.tar.gz | |
Follow up to r1833368: share openssl between modules.
Both libapr[-util], the core PRNG, mod_ssl, mod_crypto and mod_session_crypto
can use the same crypto library (e.g. openssl), use the new APR crypto loading
API so that they can work together and initialize/terminate the lib either once
for all or on demand and reusable by the others.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1833452 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/session')
| -rw-r--r-- | modules/session/mod_session_crypto.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/session/mod_session_crypto.c b/modules/session/mod_session_crypto.c index be7e7b1807..a948b2ced9 100644 --- a/modules/session/mod_session_crypto.c +++ b/modules/session/mod_session_crypto.c @@ -569,7 +569,7 @@ static int session_crypto_init(apr_pool_t *p, apr_pool_t *plog, apr_status_t rv; rv = apr_crypto_init(p); - if (APR_SUCCESS != rv) { + if (APR_SUCCESS != rv && APR_EREINIT != rv) { ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO(01843) "APR crypto could not be initialised"); return rv; |