/*
* Try to retrieve the SSL_SESSION from the inter-process cache
*/
- session = ssl_scache_retrieve(s, id, idlen);
+ session = ssl_scache_retrieve(s, id, idlen, conn->pool);
ssl_session_log(s, "GET", id, idlen,
session ? "FOUND" : "MISSED",
void ssl_scache_status_register(apr_pool_t *p);
void ssl_scache_kill(server_rec *);
BOOL ssl_scache_store(server_rec *, UCHAR *, int, time_t, SSL_SESSION *);
-SSL_SESSION *ssl_scache_retrieve(server_rec *, UCHAR *, int);
+SSL_SESSION *ssl_scache_retrieve(server_rec *, UCHAR *, int, apr_pool_t *);
void ssl_scache_remove(server_rec *, UCHAR *, int);
char *ssl_scache_id2sz(UCHAR *, int);
void ssl_scache_mc_init(server_rec *, apr_pool_t *);
void ssl_scache_mc_kill(server_rec *);
BOOL ssl_scache_mc_store(server_rec *, UCHAR *, int, time_t, SSL_SESSION *);
-SSL_SESSION *ssl_scache_mc_retrieve(server_rec *, UCHAR *, int);
+SSL_SESSION *ssl_scache_mc_retrieve(server_rec *, UCHAR *, int, apr_pool_t *);
void ssl_scache_mc_remove(server_rec *, UCHAR *, int);
void ssl_scache_mc_status(request_rec *r, int flags, apr_pool_t *pool);
#endif
return rv;
}
-SSL_SESSION *ssl_scache_retrieve(server_rec *s, UCHAR *id, int idlen)
+SSL_SESSION *ssl_scache_retrieve(server_rec *s, UCHAR *id, int idlen,
+ apr_pool_t *p)
{
SSLModConfigRec *mc = myModConfig(s);
SSL_SESSION *sess = NULL;
#endif
#ifdef HAVE_SSL_CACHE_MEMCACHE
else if (mc->nSessionCacheMode == SSL_SCMODE_MC)
- sess = ssl_scache_mc_retrieve(s, id, idlen);
+ sess = ssl_scache_mc_retrieve(s, id, idlen, p);
#endif
return sess;
}
return TRUE;
}
-SSL_SESSION *ssl_scache_mc_retrieve(server_rec *s, UCHAR *id, int idlen)
+SSL_SESSION *ssl_scache_mc_retrieve(server_rec *s, UCHAR *id, int idlen,
+ apr_pool_t *p)
{
SSL_SESSION *pSession;
MODSSL_D2I_SSL_SESSION_CONST unsigned char *pder;
return NULL;
}
- rv = apr_memcache_getp(memctxt, mc->pPool, strkey,
+ rv = apr_memcache_getp(memctxt, p, strkey,
(char**)&pder, &der_len, NULL);
if (rv == APR_NOTFOUND) {