diff options
| author | Jeff Trawick <trawick@apache.org> | 2003-04-04 05:57:10 +0200 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2003-04-04 05:57:10 +0200 |
| commit | 4901acb22acbea1bfc790c52a7ebecfa5caf37f6 (patch) | |
| tree | e5220932c4ff5626c121a35a66435b29846bc43c | |
| parent | keep changes and mmns in sync. (diff) | |
| download | apache2-4901acb22acbea1bfc790c52a7ebecfa5caf37f6.tar.xz apache2-4901acb22acbea1bfc790c52a7ebecfa5caf37f6.zip | |
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@99201 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | modules/ssl/mod_ssl.h | 2 | ||||
| -rw-r--r-- | modules/ssl/ssl_engine_kernel.c | 2 |
3 files changed, 5 insertions, 2 deletions
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev [Remove entries to the current 2.0 section below, when backported] + *) Fix a compile failure with recent OpenSSL and picky compilers + (e.g., OpenSSL 0.9.7a and xlc_r on AIX). [Jeff Trawick] + *) Fix a build problem with passing unsupported --enable-layout args to apr and apr-util. This broke binbuild.sh as well as user-specified layout parameters. PR 18649 [Justin Erenkrantz, diff --git a/modules/ssl/mod_ssl.h b/modules/ssl/mod_ssl.h index c913203326..00075d906f 100644 --- a/modules/ssl/mod_ssl.h +++ b/modules/ssl/mod_ssl.h @@ -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 *); diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c index c4cb37880e..429ed18841 100644 --- a/modules/ssl/ssl_engine_kernel.c +++ b/modules/ssl/ssl_engine_kernel.c @@ -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; |