www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

SSL_SESSION_id2sz() is somewhat expensive, make sure we only call it

Browse Source 
if SSLLogLevel >= info


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93898 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Doug MacEachern
2002-03-13 06:12:24 +00:00
parent 5de4869446
commit ccaced8c5d
1 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
modules/ssl/ssl_engine_kernel.c
View File

@@ -1605,12 +1605,14 @@ int ssl_callback_NewSessionCacheEntry(SSL *ssl, SSL_SESSION *session)
/* /*
* Log this cache operation * Log this cache operation
*/ */
ssl_log(s, SSL_LOG_TRACE, if (sc->nLogLevel >= SSL_LOG_TRACE) {
"Inter-Process Session Cache: " ssl_log(s, SSL_LOG_TRACE,
"request=SET status=%s id=%s timeout=%ds (session caching)", "Inter-Process Session Cache: "
(rc == TRUE ? "OK" : "BAD"), "request=SET status=%s id=%s timeout=%ds (session caching)",
SSL_SESSION_id2sz(session_id, session_id_length), (rc == TRUE ? "OK" : "BAD"),
(timeout - time(NULL))); SSL_SESSION_id2sz(session_id, session_id_length),
(timeout - time(NULL)));
}
/* /*
* return 0 which means to OpenSSL that the session is still * return 0 which means to OpenSSL that the session is still
@@ -1633,6 +1635,7 @@ SSL_SESSION *ssl_callback_GetSessionCacheEntry(SSL *ssl,
/* Get Apache context back through OpenSSL context */ /* Get Apache context back through OpenSSL context */
conn_rec *conn = (conn_rec *)SSL_get_app_data(ssl); conn_rec *conn = (conn_rec *)SSL_get_app_data(ssl);
server_rec *s = conn->base_server; server_rec *s = conn->base_server;
SSLSrvConfigRec *sc = mySrvConfig(s);
SSL_SESSION *session; SSL_SESSION *session;
/* /*
@@ -1643,16 +1646,15 @@ SSL_SESSION *ssl_callback_GetSessionCacheEntry(SSL *ssl,
/* /*
* Log this cache operation * Log this cache operation
*/ */
if (session) { if (sc->nLogLevel >= SSL_LOG_TRACE) {
const char *status = session ? "FOUND" : "MISSED";
const char *re = session ? "reuse" : "renewal";
ssl_log(s, SSL_LOG_TRACE, "Inter-Process Session Cache: " ssl_log(s, SSL_LOG_TRACE, "Inter-Process Session Cache: "
"request=GET status=FOUND id=%s (session reuse)", "request=GET status=%s id=%s (session %s)",
SSL_SESSION_id2sz(id, idlen)); status, SSL_SESSION_id2sz(id, idlen), re);
}
else {
ssl_log(s, SSL_LOG_TRACE, "Inter-Process Session Cache: "
"request=GET status=MISSED id=%s (session renewal)",
SSL_SESSION_id2sz(id, idlen));
} }
/* /*
* Return NULL or the retrieved SSL_SESSION. But indicate (by * Return NULL or the retrieved SSL_SESSION. But indicate (by
* setting do_copy to 0) that the reference count on the * setting do_copy to 0) that the reference count on the
@@ -1674,6 +1676,7 @@ void ssl_callback_DelSessionCacheEntry(SSL_CTX *ctx,
SSL_SESSION *session) SSL_SESSION *session)
{ {
server_rec *s; server_rec *s;
SSLSrvConfigRec *sc;
unsigned char *session_id; unsigned char *session_id;
unsigned int session_id_length; unsigned int session_id_length;
@@ -1684,6 +1687,8 @@ void ssl_callback_DelSessionCacheEntry(SSL_CTX *ctx,
return; /* on server shutdown Apache is already gone */ return; /* on server shutdown Apache is already gone */
} }
sc = mySrvConfig(s);
/* /*
* Remove the SSL_SESSION from the inter-process cache * Remove the SSL_SESSION from the inter-process cache
*/ */
@@ -1695,9 +1700,11 @@ void ssl_callback_DelSessionCacheEntry(SSL_CTX *ctx,
/* /*
* Log this cache operation * Log this cache operation
*/ */
ssl_log(s, SSL_LOG_TRACE, "Inter-Process Session Cache: " if (sc->nLogLevel >= SSL_LOG_TRACE) {
"request=REM status=OK id=%s (session dead)", ssl_log(s, SSL_LOG_TRACE, "Inter-Process Session Cache: "
SSL_SESSION_id2sz(session_id, session_id_length)); "request=REM status=OK id=%s (session dead)",
SSL_SESSION_id2sz(session_id, session_id_length));
}
return; return;
} }