Commit 02b0d358 authored by Doug MacEachern's avatar Doug MacEachern
Browse files

de-hungarian-ize server config member names which are going to stay 


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

mod_ssl.c

+8 −8
Changes for mod_ssl.c: 8 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ static int ssl_hook_pre_connection(conn_rec *c, void *csd) 
    /*

     * Immediately stop processing if SSL is disabled for this connection

     */

    if (!(sc && sc->bEnabled)) {

    if (!(sc && sc->enabled)) {

        return DECLINED;

    }
@@ -235,7 +235,7 @@ static int ssl_hook_pre_connection(conn_rec *c, void *csd) 
     */

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

    myConnConfigSet(c, sslconn);

    sslconn->log_level = sc->nLogLevel;

    sslconn->log_level = sc->log_level;



    /*

     * Remember the connection information for
@@ -244,7 +244,7 @@ static int ssl_hook_pre_connection(conn_rec *c, void *csd) 


    ssl_log(c->base_server, SSL_LOG_INFO,

            "Connection to child %d established "

            "(server %s, client %s)", c->id, sc->szVHostID, 

            "(server %s, client %s)", c->id, sc->vhost_id, 

            c->remote_ip ? c->remote_ip : "unknown");



    /*
@@ -267,11 +267,11 @@ static int ssl_hook_pre_connection(conn_rec *c, void *csd) 
    }



    if (!SSL_set_session_id_context(ssl,

                                    (unsigned char *)sc->szVHostID,

                                    sc->nVHostID_length))

                                    (unsigned char *)sc->vhost_id,

                                    sc->vhost_id_len))

    {

        ssl_log(c->base_server, SSL_LOG_ERROR|SSL_ADD_SSLERR,

                "Unable to set session id context to `%s'", sc->szVHostID);

                "Unable to set session id context to `%s'", sc->vhost_id);



        c->aborted = 1;
@@ -461,7 +461,7 @@ static const char *ssl_hook_http_method(const request_rec *r) 
{

    SSLSrvConfigRec *sc = mySrvConfig(r->server);



    if (sc->bEnabled == FALSE) {

    if (sc->enabled == FALSE) {

        return NULL;

    }
@@ -472,7 +472,7 @@ static apr_port_t ssl_hook_default_port(const request_rec *r) 
{

    SSLSrvConfigRec *sc = mySrvConfig(r->server);



    if (sc->bEnabled == FALSE) {

    if (sc->enabled == FALSE) {

        return 0;

    }

mod_ssl.h

+7 −7
Changes for mod_ssl.h: 7 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -483,13 +483,13 @@ typedef struct { 
 */

typedef struct {

    SSLModConfigRec *mc;

    BOOL         bEnabled;

    const char  *szVHostID;

    int          nVHostID_length;

    const char  *szLogFile;

    apr_file_t  *fileLogFile;

    int          nLogLevel;

    int          nSessionCacheTimeout;

    BOOL         enabled;

    const char  *vhost_id;

    int          vhost_id_len;

    const char  *log_file_name;

    apr_file_t  *log_file;

    int          log_level;

    int          session_cache_timeout;



    const char  *szPublicCertFiles[SSL_AIDX_MAX];

    const char  *szPrivateKeyFiles[SSL_AIDX_MAX];

ssl_engine_config.c

+23 −23
Changes for ssl_engine_config.c: 23 added lines, 23 removed lines.
Original line number Diff line number Diff line
@@ -143,13 +143,13 @@ void *ssl_config_server_create(apr_pool_t *p, server_rec *s) 
    SSLSrvConfigRec *sc = apr_palloc(p, sizeof(*sc));



    sc->mc                     = ssl_config_global_create(s);

    sc->bEnabled               = UNSET;

    sc->szVHostID              = NULL;

    sc->nVHostID_length        = 0;

    sc->szLogFile              = NULL;

    sc->fileLogFile            = NULL;

    sc->nLogLevel              = SSL_LOG_NONE;

    sc->nSessionCacheTimeout   = UNSET;

    sc->enabled                = UNSET;

    sc->vhost_id               = NULL;

    sc->vhost_id_len           = 0;

    sc->log_file_name          = NULL;

    sc->log_file               = NULL;

    sc->log_level              = SSL_LOG_NONE;

    sc->session_cache_timeout  = UNSET;



    sc->szCACertificatePath    = NULL;

    sc->szCACertificateFile    = NULL;
@@ -196,12 +196,12 @@ void *ssl_config_server_merge(apr_pool_t *p, void *basev, void *addv) 
    SSLSrvConfigRec *mrg  = (SSLSrvConfigRec *)apr_palloc(p, sizeof(*mrg));



    cfgMerge(mc, NULL);

    cfgMergeBool(bEnabled);

    cfgMergeString(szVHostID);

    cfgMergeString(szLogFile);

    cfgMerge(fileLogFile, NULL);

    cfgMerge(nLogLevel, SSL_LOG_NONE);

    cfgMergeInt(nSessionCacheTimeout);

    cfgMergeBool(enabled);

    cfgMergeString(vhost_id);

    cfgMergeString(log_file_name);

    cfgMerge(log_file, NULL);

    cfgMerge(log_level, SSL_LOG_NONE);

    cfgMergeInt(session_cache_timeout);



    cfgMergeString(szCACertificatePath);

    cfgMergeString(szCACertificateFile);
@@ -518,7 +518,7 @@ const char *ssl_cmd_SSLEngine(cmd_parms *cmd, void *ctx, int flag) 
{

    SSLSrvConfigRec *sc = mySrvConfig(cmd->server);



    sc->bEnabled = flag ? TRUE : FALSE;

    sc->enabled = flag ? TRUE : FALSE;



    return NULL;

}
@@ -957,9 +957,9 @@ const char *ssl_cmd_SSLSessionCacheTimeout(cmd_parms *cmd, void *ctx, 
{

    SSLSrvConfigRec *sc = mySrvConfig(cmd->server);



    sc->nSessionCacheTimeout = atoi(arg);

    sc->session_cache_timeout = atoi(arg);



    if (sc->nSessionCacheTimeout < 0) {

    if (sc->session_cache_timeout < 0) {

        return "SSLSessionCacheTimeout: Invalid argument";

    }
@@ -979,7 +979,7 @@ const char *ssl_cmd_SSLLog(cmd_parms *cmd, void *ctx, 
        return err;

    }



    sc->szLogFile = arg;

    sc->log_file_name = arg;



    return NULL;

}
@@ -995,22 +995,22 @@ const char *ssl_cmd_SSLLogLevel(cmd_parms *cmd, void *ctx, 
    }



    if (strcEQ(level, "none")) {

        sc->nLogLevel = SSL_LOG_NONE;

        sc->log_level = SSL_LOG_NONE;

    }

    else if (strcEQ(level, "error")) {

        sc->nLogLevel = SSL_LOG_ERROR;

        sc->log_level = SSL_LOG_ERROR;

    }

    else if (strcEQ(level, "warn")) {

        sc->nLogLevel = SSL_LOG_WARN;

        sc->log_level = SSL_LOG_WARN;

    }

    else if (strcEQ(level, "info")) {

        sc->nLogLevel = SSL_LOG_INFO;

        sc->log_level = SSL_LOG_INFO;

    }

    else if (strcEQ(level, "trace")) {

        sc->nLogLevel = SSL_LOG_TRACE;

        sc->log_level = SSL_LOG_TRACE;

    }

    else if (strcEQ(level, "debug")) {

        sc->nLogLevel = SSL_LOG_DEBUG;

        sc->log_level = SSL_LOG_DEBUG;

    }

    else {

        return "SSLLogLevel: Invalid argument";

ssl_engine_init.c

+12 −12
Changes for ssl_engine_init.c: 12 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -227,16 +227,16 @@ int ssl_init_Module(apr_pool_t *p, apr_pool_t *plog, 
        /*

         * Create the server host:port string because we need it a lot

         */

        sc->szVHostID = ssl_util_vhostid(p, s);

        sc->nVHostID_length = strlen(sc->szVHostID);

        sc->vhost_id = ssl_util_vhostid(p, s);

        sc->vhost_id_len = strlen(sc->vhost_id);



        /* Fix up stuff that may not have been set */

        if (sc->bEnabled == UNSET) {

            sc->bEnabled = FALSE;

        if (sc->enabled == UNSET) {

            sc->enabled = FALSE;

        }



        if (sc->nSessionCacheTimeout == UNSET) {

            sc->nSessionCacheTimeout = SSL_SESSION_CACHE_TIMEOUT;

        if (sc->session_cache_timeout == UNSET) {

            sc->session_cache_timeout = SSL_SESSION_CACHE_TIMEOUT;

        }



        if (sc->nPassPhraseDialogType == SSL_PPTYPE_UNSET) {
@@ -302,7 +302,7 @@ int ssl_init_Module(apr_pool_t *p, apr_pool_t *plog, 
         * it or give out some information about what we're

         * configuring.

         */

        if (!sc->bEnabled) {

        if (!sc->enabled) {

            continue;

        }
@@ -488,7 +488,7 @@ static void ssl_init_ctx_callbacks(server_rec *s, 
    SSL_CTX_set_tmp_rsa_callback(ctx, ssl_callback_TmpRSA);

    SSL_CTX_set_tmp_dh_callback(ctx,  ssl_callback_TmpDH);



    if (sc->nLogLevel >= SSL_LOG_INFO) {

    if (sc->log_level >= SSL_LOG_INFO) {

        /* this callback only logs if SSLLogLevel >= info */

        SSL_CTX_set_info_callback(ctx, ssl_callback_LogTracingState);

    }
@@ -830,7 +830,7 @@ static void ssl_init_server_certs(server_rec *s, 
                                  SSLSrvConfigRec *sc)

{

    const char *rsa_id, *dsa_id;

    const char *vhost_id = sc->szVHostID;

    const char *vhost_id = sc->vhost_id;

    int i;

    int have_rsa, have_dsa;
@@ -904,7 +904,7 @@ void ssl_init_CheckServers(server_rec *base_server, apr_pool_t *p) 
    for (s = base_server; s; s = s->next) {

        sc = mySrvConfig(s);



        if (sc->bEnabled && (s->port == DEFAULT_HTTP_PORT)) {

        if (sc->enabled && (s->port == DEFAULT_HTTP_PORT)) {

            ssl_log(base_server, SSL_LOG_WARN,

                    "Init: (%s) You configured HTTPS(%d) "

                    "on the standard HTTP(%d) port!",
@@ -912,7 +912,7 @@ void ssl_init_CheckServers(server_rec *base_server, apr_pool_t *p) 
                    DEFAULT_HTTPS_PORT, DEFAULT_HTTP_PORT);

        }



        if (!sc->bEnabled && (s->port == DEFAULT_HTTPS_PORT)) {

        if (!sc->enabled && (s->port == DEFAULT_HTTPS_PORT)) {

            ssl_log(base_server, SSL_LOG_WARN,

                    "Init: (%s) You configured HTTP(%d) "

                    "on the standard HTTPS(%d) port!",
@@ -932,7 +932,7 @@ void ssl_init_CheckServers(server_rec *base_server, apr_pool_t *p) 
    for (s = base_server; s; s = s->next) {

        sc = mySrvConfig(s);



        if (!sc->bEnabled) {

        if (!sc->enabled) {

            continue;

        }

ssl_engine_io.c

+1 −1
Changes for ssl_engine_io.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -890,7 +890,7 @@ void ssl_io_filter_init(conn_rec *c, SSL *ssl) 
    apr_pool_cleanup_register(c->pool, (void*)filter,

                              ssl_io_filter_cleanup, apr_pool_cleanup_null);



    if (sc->nLogLevel >= SSL_LOG_DEBUG) {

    if (sc->log_level >= SSL_LOG_DEBUG) {

        BIO_set_callback(SSL_get_rbio(ssl), ssl_io_data_cb);

        BIO_set_callback_arg(SSL_get_rbio(ssl), (void *)ssl);

    }