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

avoid calling ssl_util_vhostid() (and apr_sprintf underneath) at

Browse Source 
request time by calling it at startup time and saving the value in the
SSLSrvConfigRec.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92215 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Doug MacEachern
2001-11-28 05:44:50 +00:00
parent 5f4bcccd5d
commit 9c7cc5063d
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/ssl/mod_ssl.c
View File

@@ -221,7 +221,6 @@ static int ssl_hook_pre_connection(conn_rec *c)
{ {
SSLSrvConfigRec *sc = mySrvConfig(c->base_server); SSLSrvConfigRec *sc = mySrvConfig(c->base_server);
SSL *ssl; SSL *ssl;
unsigned char *cpVHostID;
char *cpVHostMD5; char *cpVHostMD5;
SSLConnRec *sslconn = apr_pcalloc(c->pool, sizeof(*sslconn)); SSLConnRec *sslconn = apr_pcalloc(c->pool, sizeof(*sslconn));
@@ -241,9 +240,9 @@ static int ssl_hook_pre_connection(conn_rec *c)
* Remember the connection information for * Remember the connection information for
* later access inside callback functions * later access inside callback functions
*/ */
cpVHostID = (unsigned char *)ssl_util_vhostid(c->pool,c->base_server);
ssl_log(c->base_server, SSL_LOG_INFO, "Connection to child %d established " ssl_log(c->base_server, SSL_LOG_INFO, "Connection to child %d established "
"(server %s, client %s)", c->id, cpVHostID, "(server %s, client %s)", c->id, sc->szVHostID,
c->remote_ip != NULL ? c->remote_ip : "unknown"); c->remote_ip != NULL ? c->remote_ip : "unknown");
/* /*
@@ -263,7 +262,7 @@ static int ssl_hook_pre_connection(conn_rec *c)
return DECLINED; /* XXX */ return DECLINED; /* XXX */
} }
SSL_clear(ssl); SSL_clear(ssl);
cpVHostMD5 = ap_md5(c->pool, cpVHostID); cpVHostMD5 = ap_md5(c->pool, sc->szVHostID);
if (!SSL_set_session_id_context(ssl, (unsigned char *)cpVHostMD5, if (!SSL_set_session_id_context(ssl, (unsigned char *)cpVHostMD5,
MD5_DIGESTSIZE*2)) { MD5_DIGESTSIZE*2)) {
ssl_log(c->base_server, SSL_LOG_ERROR|SSL_ADD_SSLERR, ssl_log(c->base_server, SSL_LOG_ERROR|SSL_ADD_SSLERR,

1
modules/ssl/mod_ssl.h
View File

@@ -497,6 +497,7 @@ typedef struct {
* and all <VirtualHost> contexts) * and all <VirtualHost> contexts)
*/ */
typedef struct { typedef struct {
const char *szVHostID;
BOOL bEnabled; BOOL bEnabled;
apr_table_t *ap_server_ctx; apr_table_t *ap_server_ctx;
const char *szPublicCertFile[SSL_AIDX_MAX]; const char *szPublicCertFile[SSL_AIDX_MAX];

1
modules/ssl/ssl_engine_config.c
View File

@@ -190,6 +190,7 @@ void *ssl_config_server_merge(apr_pool_t *p, void *basev, void *addv)
SSLSrvConfigRec *add = (SSLSrvConfigRec *)addv; SSLSrvConfigRec *add = (SSLSrvConfigRec *)addv;
SSLSrvConfigRec *new = (SSLSrvConfigRec *)apr_palloc(p, sizeof(SSLSrvConfigRec)); SSLSrvConfigRec *new = (SSLSrvConfigRec *)apr_palloc(p, sizeof(SSLSrvConfigRec));
cfgMergeString(szVHostID);
cfgMergeBool(bEnabled); cfgMergeBool(bEnabled);
cfgMergeString(szCACertificatePath); cfgMergeString(szCACertificatePath);
cfgMergeString(szCACertificateFile); cfgMergeString(szCACertificateFile);

2
modules/ssl/ssl_engine_init.c
View File

@@ -476,7 +476,7 @@ void ssl_init_ConfigureServer(server_rec *s, apr_pool_t *p, SSLSrvConfigRec *sc)
/* /*
* Create the server host:port string because we need it a lot * Create the server host:port string because we need it a lot
*/ */
cpVHostID = ssl_util_vhostid(p, s); sc->szVHostID = cpVHostID = ssl_util_vhostid(p, s);
/* /*
* Now check for important parameters and the * Now check for important parameters and the