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

avoid a couple of calls to ssl_util_vhostid() and apr_psprintf()

Browse Source 
unless loglevel >= SSL_LOG_INFO
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92122 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Doug MacEachern
2001-11-22 02:44:35 +00:00
parent 451e81d5d1
commit 03d6bfb025
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/ssl/mod_ssl.c
View File

@@ -229,6 +229,7 @@ static int ssl_hook_pre_connection(conn_rec *c)
* Create SSL context * Create SSL context
*/ */
myConnConfigSet(c, sslconn); myConnConfigSet(c, sslconn);
sslconn->log_level = sc->nLogLevel;
/* /*
* Immediately stop processing if SSL is disabled for this connection * Immediately stop processing if SSL is disabled for this connection

3
modules/ssl/mod_ssl.h
View File

@@ -459,8 +459,11 @@ typedef struct {
const char *verify_info; const char *verify_info;
const char *verify_error; const char *verify_error;
int verify_depth; int verify_depth;
int log_level; /* for avoiding expensive logging */
} SSLConnRec; } SSLConnRec;
#define SSLConnLogApplies(sslconn, level) (sslconn->log_level >= level)
typedef struct { typedef struct {
apr_pool_t *pPool; apr_pool_t *pPool;
BOOL bFixed; BOOL bFixed;

11
modules/ssl/ssl_engine_kernel.c
View File

@@ -146,10 +146,14 @@ apr_status_t ssl_hook_CloseConnection(SSLFilterRec *filter)
SSL_smart_shutdown(ssl); SSL_smart_shutdown(ssl);
/* and finally log the fact that we've closed the connection */ /* and finally log the fact that we've closed the connection */
if (SSLConnLogApplies(sslconn, SSL_LOG_INFO)) {
ssl_log(conn->base_server, SSL_LOG_INFO, ssl_log(conn->base_server, SSL_LOG_INFO,
"Connection to child %d closed with %s shutdown (server %s, client %s)", "Connection to child %d closed with %s shutdown"
conn->id, cpType, ssl_util_vhostid(conn->pool, conn->base_server), "(server %s, client %s)",
conn->id, cpType,
ssl_util_vhostid(conn->pool, conn->base_server),
conn->remote_ip != NULL ? conn->remote_ip : "unknown"); conn->remote_ip != NULL ? conn->remote_ip : "unknown");
}
/* deallocate the SSL connection */ /* deallocate the SSL connection */
SSL_free(ssl); SSL_free(ssl);
@@ -242,7 +246,7 @@ int ssl_hook_Translate(request_rec *r)
/* /*
* Log information about incoming HTTPS requests * Log information about incoming HTTPS requests
*/ */
if (ap_is_initial_req(r)) if (ap_is_initial_req(r) && SSLConnLogApplies(sslconn, SSL_LOG_INFO)) {
ssl_log(r->server, SSL_LOG_INFO, ssl_log(r->server, SSL_LOG_INFO,
"%s HTTPS request received for child %d (server %s)", "%s HTTPS request received for child %d (server %s)",
r->connection->keepalives <= 0 ? r->connection->keepalives <= 0 ?
@@ -251,6 +255,7 @@ int ssl_hook_Translate(request_rec *r)
r->connection->keepalives+1), r->connection->keepalives+1),
r->connection->id, r->connection->id,
ssl_util_vhostid(r->pool, r->server)); ssl_util_vhostid(r->pool, r->server));
}
/* SetEnvIf ssl-*-shutdown flags can only be per-server, /* SetEnvIf ssl-*-shutdown flags can only be per-server,
* so they won't change across keepalive requests * so they won't change across keepalive requests