Commit 8f5d93b3 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

Fix a compile failure with recent OpenSSL and picky compilers 

(e.g., OpenSSL 0.9.7a and xlc_r on AIX).

The OpenSSL info callback field changed recently from a generic
function pointer to a specific one, and ssl_callback_LogTracingState
wasn't quite right.

old:
ssl.h:        void (*info_callback)();

new:
ssl.h:        void (*info_callback)(const SSL *ssl,int type,int val);


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

mod_ssl.h

+1 −1
Original line number Diff line number Diff line
@@ -588,7 +588,7 @@ int ssl_callback_proxy_cert(SSL *ssl, MODSSL_CLIENT_CERT_CB_ARG_TYPE ** 
int          ssl_callback_NewSessionCacheEntry(SSL *, SSL_SESSION *);

SSL_SESSION *ssl_callback_GetSessionCacheEntry(SSL *, unsigned char *, int, int *);

void         ssl_callback_DelSessionCacheEntry(SSL_CTX *, SSL_SESSION *);

void         ssl_callback_LogTracingState(SSL *, int, int);

void         ssl_callback_LogTracingState(const SSL *, int, int);



/*  Session Cache Support  */

void         ssl_scache_init(server_rec *, apr_pool_t *);

ssl_engine_kernel.c

+1 −1
Original line number Diff line number Diff line
@@ -1745,7 +1745,7 @@ void ssl_callback_DelSessionCacheEntry(SSL_CTX *ctx, 
 * SSL handshake and does SSL record layer stuff. We use it to

 * trace OpenSSL's processing in out SSL logfile.

 */

void ssl_callback_LogTracingState(SSL *ssl, int where, int rc)

void ssl_callback_LogTracingState(const SSL *ssl, int where, int rc)

{

    conn_rec *c;

    server_rec *s;