On 06/06/2010 07:01 PM, [email protected] wrote:
> Author: sf
> Date: Sun Jun 6 17:01:29 2010
> New Revision: 951896
>
> URL: http://svn.apache.org/viewvc?rev=951896&view=rev
> Log:
> Use new loglevel accessor macros to simplify code
>
> Modified:
> httpd/httpd/trunk/modules/ssl/ssl_engine_io.c
> httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c
>
> Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_io.c
> URL:
> http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_io.c?rev=951896&r1=951895&r2=951896&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/ssl/ssl_engine_io.c (original)
> +++ httpd/httpd/trunk/modules/ssl/ssl_engine_io.c Sun Jun 6 17:01:29 2010
> @@ -1015,7 +1015,7 @@ static void ssl_filter_io_shutdown(ssl_f
> SSL_smart_shutdown(ssl);
>
> /* and finally log the fact that we've closed the connection */
> - if (mySrvFromConn(c)->loglevel >= APLOG_INFO) {
> + if (APLOGcinfo(c)) {
IMHO you need to use APLOGinfo(mySrvFromConn(c)) as otherwise you might choose
the base_server
which might not be what mySrvFromConn(c) returns.
> ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, c,
> "Connection closed to child %ld with %s shutdown "
> "(server %s)",
> @@ -1740,8 +1740,7 @@ void ssl_io_filter_init(conn_rec *c, req
> apr_pool_cleanup_register(c->pool, (void*)filter_ctx,
> ssl_io_filter_cleanup, apr_pool_cleanup_null);
>
> - if ((s->loglevel >= APLOG_DEBUG)
> - && (sc->ssl_log_level >= SSL_LOG_IO)) {
> + if (APLOGcdebug(c) && (sc->ssl_log_level >= SSL_LOG_IO)) {
Same as above.
> BIO_set_callback(SSL_get_rbio(ssl), ssl_io_data_cb);
> BIO_set_callback_arg(SSL_get_rbio(ssl), (void *)ssl);
> }
>
Regards
Rüdiger
