Commit c6c229fd authored by Doug MacEachern's avatar Doug MacEachern
Browse files

don't allocate SSLConnRec unless ssl is enabled on this vhost. 

also provides a shorter shortcut for mod_ssl hooks to decline if ssl
is not enabled.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@93823 13f79535-47bb-0310-9956-ffa450edef68
parent 107f4274

mod_ssl.c

+8 −7
Changes for mod_ssl.c: 8 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -224,13 +224,7 @@ static int ssl_hook_pre_connection(conn_rec *c, void *csd) 
    SSLSrvConfigRec *sc = mySrvConfig(c->base_server);

    SSL *ssl;

    char *cpVHostMD5;

    SSLConnRec *sslconn = apr_pcalloc(c->pool, sizeof(*sslconn));



    /*

     * Create SSL context

     */

    myConnConfigSet(c, sslconn);

    sslconn->log_level = sc->nLogLevel;

    SSLConnRec *sslconn;



    /*

     * Immediately stop processing if SSL is disabled for this connection
@@ -238,6 +232,13 @@ static int ssl_hook_pre_connection(conn_rec *c, void *csd) 
    if (sc == NULL || !sc->bEnabled)

        return DECLINED;



    /*

     * Create SSL context

     */

    sslconn = apr_pcalloc(c->pool, sizeof(*sslconn));

    myConnConfigSet(c, sslconn);

    sslconn->log_level = sc->nLogLevel;



    /*

     * Remember the connection information for

     * later access inside callback functions

ssl_engine_kernel.c

+6 −2
Changes for ssl_engine_kernel.c: 6 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -171,6 +171,10 @@ int ssl_hook_ReadReq(request_rec *r) 
    SSLConnRec *sslconn = myConnConfig(r->connection);

    SSL *ssl;



    if (!sslconn) {

        return DECLINED;

    }



    /*

     * Get the SSL connection structure and perform the

     * delayed interlinking from SSL back to request_rec
@@ -233,7 +237,7 @@ int ssl_hook_Translate(request_rec *r) 
{

    SSLConnRec *sslconn = myConnConfig(r->connection);



    if (sslconn->ssl == NULL)

    if (!sslconn || !sslconn->ssl)

        return DECLINED;



    /*
@@ -332,7 +336,7 @@ int ssl_hook_Access(request_rec *r) 
    dc  = myDirConfig(r);

    sc  = mySrvConfig(r->server);

    sslconn = myConnConfig(r->connection);

    ssl = sslconn->ssl;

    ssl = sslconn ? sslconn->ssl : NULL;

    if (ssl != NULL)

        ctx = SSL_get_SSL_CTX(ssl);

ssl_engine_vars.c

+1 −1
Changes for ssl_engine_vars.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -679,7 +679,7 @@ static const char *ssl_var_log_handler_x(request_rec *r, char *a) 
    char *result;



    result = NULL;

    if (sslconn->ssl != NULL)

    if (sslconn && sslconn->ssl)

        result = ssl_var_lookup(r->pool, r->server, r->connection, r, a);

    if (result != NULL && result[0] == NUL)

        result = NULL;