Commit 07a800f0 authored by Justin Erenkrantz's avatar Justin Erenkrantz
Browse files

Remove SSLLog and SSLLogLevel directives in favor of having mod_ssl use the 

standard ErrorLog directives.


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

mod_ssl.c

+6 −8
Changes for mod_ssl.c: 6 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -141,12 +141,6 @@ static const command_rec ssl_config_cmds[] = { 
    SSL_CMD_SRV(SessionCacheTimeout, TAKE1,

                "SSL Session Cache object lifetime "

                "(`N' - number of seconds)")

    SSL_CMD_SRV(Log, TAKE1,

                "SSL logfile for SSL-related messages "

                "(`/path/to/file', `|/path/to/program')")

    SSL_CMD_SRV(LogLevel, TAKE1,

                "SSL logfile verbosity level "

                "(`none', `error', `warn', `info', `debug')")

    SSL_CMD_SRV(Protocol, RAW_ARGS,

                "Enable or disable various SSL protocols"

                "(`[+-][SSLv2|SSLv3|TLSv1] ...' - see manual)")
@@ -201,6 +195,12 @@ static const command_rec ssl_config_cmds[] = { 
               "Require a boolean expression to evaluate to true for granting access"

               "(arbitrary complex boolean expression - see manual)")



    /* Deprecated directives. */

    AP_INIT_RAW_ARGS("SSLLog", ap_set_deprecated, NULL, OR_ALL, 

      "SSLLog directive is no longer supported - use ErrorLog."),

    AP_INIT_RAW_ARGS("SSLLogLevel", ap_set_deprecated, NULL, OR_ALL, 

      "SSLLogLevel directive is no longer supported - use LogLevel."),

    

    AP_END_CMD

};
@@ -302,8 +302,6 @@ static int ssl_hook_pre_connection(conn_rec *c, void *csd) 
        return DECLINED;

    }



    sslconn->log_level = sc->log_level;



    /*

     * Remember the connection information for

     * later access inside callback functions

mod_ssl.h

+0 −29
Changes for mod_ssl.h: 0 added lines, 29 removed lines.
Original line number Diff line number Diff line
@@ -203,25 +203,6 @@ ap_set_module_config(c->conn_config, &ssl_module, val) 
#define myCtxVarSet(mc,num,val)  mc->rCtx.pV##num = val

#define myCtxVarGet(mc,num,type) (type)(mc->rCtx.pV##num)



/*

 * SSL Logging

 */

#define SSL_LOG_NONE    (1<<0)

#define SSL_LOG_ERROR   (1<<1)

#define SSL_LOG_WARN    (1<<2)

#define SSL_LOG_INFO    (1<<3)

#define SSL_LOG_TRACE   (1<<4)

#define SSL_LOG_DEBUG   (1<<5)

#define SSL_LOG_MASK    (SSL_LOG_ERROR|SSL_LOG_WARN|SSL_LOG_INFO|SSL_LOG_TRACE|SSL_LOG_DEBUG)



#define SSL_ADD_NONE     (1<<8)

#define SSL_ADD_ERRNO    (1<<9)

#define SSL_ADD_SSLERR   (1<<10)

#define SSL_NO_TIMESTAMP (1<<11)

#define SSL_NO_LEVELID   (1<<12)

#define SSL_NO_NEWLINE   (1<<13)

#define SSL_INIT         (1<<14)



/*

 * Defaults for the configuration

 */
@@ -431,13 +412,10 @@ typedef struct { 
    const char *verify_info;

    const char *verify_error;

    int verify_depth;

    int log_level; /* for avoiding expensive logging */

    int is_proxy;

    int disabled;

} SSLConnRec;



#define SSLConnLogApplies(sslconn, level) (sslconn->log_level >= level)



typedef struct {

    pid_t           pid;

    apr_pool_t     *pPool;
@@ -528,9 +506,6 @@ struct SSLSrvConfigRec { 
    BOOL             proxy_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;

    modssl_ctx_t    *server;

    modssl_ctx_t    *proxy;
@@ -586,8 +561,6 @@ const char *ssl_cmd_SSLVerifyClient(cmd_parms *, void *, const char *); 
const char  *ssl_cmd_SSLVerifyDepth(cmd_parms *, void *, const char *);

const char  *ssl_cmd_SSLSessionCache(cmd_parms *, void *, const char *);

const char  *ssl_cmd_SSLSessionCacheTimeout(cmd_parms *, void *, const char *);

const char  *ssl_cmd_SSLLog(cmd_parms *, void *, const char *);

const char  *ssl_cmd_SSLLogLevel(cmd_parms *, void *, const char *);

const char  *ssl_cmd_SSLProtocol(cmd_parms *, void *, const char *);

const char  *ssl_cmd_SSLOptions(cmd_parms *, void *, const char *);

const char  *ssl_cmd_SSLRequireSSL(cmd_parms *, void *);
@@ -704,8 +677,6 @@ int ssl_mutex_on(server_rec *); 
int          ssl_mutex_off(server_rec *);



/*  Logfile Support  */

void         ssl_log_open(server_rec *, server_rec *, apr_pool_t *);

void         ssl_log(server_rec *, int, const char *, ...);

void         ssl_die(void);

void         ssl_log_ssl_error(const char *, int, int, server_rec *);

ssl_engine_config.c

+0 −60
Changes for ssl_engine_config.c: 0 added lines, 60 removed lines.
Original line number Diff line number Diff line
@@ -209,9 +209,6 @@ static SSLSrvConfigRec *ssl_config_server_new(apr_pool_t *p) 
    sc->proxy_enabled          = UNSET;

    sc->vhost_id               = NULL;  /* set during module init */

    sc->vhost_id_len           = 0;     /* set during module init */

    sc->log_file_name          = NULL;

    sc->log_file               = NULL;  /* set during module init */

    sc->log_level              = SSL_LOG_NONE;

    sc->session_cache_timeout  = UNSET;



    modssl_ctx_init_proxy(sc, p);
@@ -296,8 +293,6 @@ void *ssl_config_server_merge(apr_pool_t *p, void *basev, void *addv) 
    cfgMerge(mc, NULL);

    cfgMergeBool(enabled);

    cfgMergeBool(proxy_enabled);

    cfgMergeString(log_file_name);

    cfgMerge(log_level, SSL_LOG_NONE);

    cfgMergeInt(session_cache_timeout);



    modssl_ctx_cfg_merge_proxy(base->proxy, add->proxy, mrg->proxy);
@@ -1052,61 +1047,6 @@ const char *ssl_cmd_SSLSessionCacheTimeout(cmd_parms *cmd, 
    return NULL;

}



#define SSL_FLAGS_LOG_CONTEXT \

    (NOT_IN_LIMIT|NOT_IN_DIRECTORY|NOT_IN_LOCATION|NOT_IN_FILES)



const char *ssl_cmd_SSLLog(cmd_parms *cmd,

                           void *dcfg,

                           const char *arg)

{

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

    const char *err;



    if ((err = ap_check_cmd_context(cmd, SSL_FLAGS_LOG_CONTEXT))) {

        return err;

    }



    sc->log_file_name = arg;



    return NULL;

}



const char *ssl_cmd_SSLLogLevel(cmd_parms *cmd,

                                void *dcfg,

                                const char *level)

{

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

    const char *err;



    if ((err = ap_check_cmd_context(cmd, SSL_FLAGS_LOG_CONTEXT))) {

        return err;

    }



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

        sc->log_level = SSL_LOG_NONE;

    }

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

        sc->log_level = SSL_LOG_ERROR;

    }

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

        sc->log_level = SSL_LOG_WARN;

    }

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

        sc->log_level = SSL_LOG_INFO;

    }

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

        sc->log_level = SSL_LOG_TRACE;

    }

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

        sc->log_level = SSL_LOG_DEBUG;

    }

    else {

        return "SSLLogLevel: Invalid argument";

    }



    return NULL;

}



const char *ssl_cmd_SSLOptions(cmd_parms *cmd,

                               void *dcfg,

                               const char *arg)

ssl_engine_init.c

+2 −4
Changes for ssl_engine_init.c: 2 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -255,8 +255,6 @@ int ssl_init_Module(apr_pool_t *p, apr_pool_t *plog, 
            sc->server->pphrase_dialog_type = SSL_PPTYPE_BUILTIN;

        }



        /* Open the dedicated SSL logfile */

        ssl_log_open(base_server, s, p);

    }



    ssl_init_SSLLibrary(base_server);
@@ -499,8 +497,8 @@ 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 (mctx->sc->log_level >= SSL_LOG_INFO) {

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

    if (s->loglevel >= APLOG_DEBUG) {

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

        SSL_CTX_set_info_callback(ctx, ssl_callback_LogTracingState);

    }

}

ssl_engine_io.c

+1 −2
Changes for ssl_engine_io.c: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -903,7 +903,6 @@ static apr_status_t ssl_io_filter_cleanup (void *data) 


void ssl_io_filter_init(conn_rec *c, SSL *ssl)

{

    SSLSrvConfigRec *sc = mySrvConfig(c->base_server);

    SSLFilterRec *filter;



    filter = apr_palloc(c->pool, sizeof(SSLFilterRec));
@@ -922,7 +921,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->log_level >= SSL_LOG_DEBUG) {

    if (c->base_server->loglevel >= APLOG_DEBUG) {

        BIO_set_callback(SSL_get_rbio(ssl), ssl_io_data_cb);

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

    }