PR: 7802

Obtained from:
Submitted by:
Reviewed by:
fix compilation problem in ssl_engine_kernel.c
if SSL_LIBRARY_VERSION >= 0x00907000

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94527 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index cb5c8f3beec891c84ab2746953c22385ca147d07..9a4fd5323aae60ae33e6d4a201e1197e4a526fb4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.36
 
+  *) fix possible compilation problem in ssl_engine_kernel.c. PR 7802
+     [Doug MacEachern]
+
   *) fix possible infinite loop in mod_ssl triggered by certain
      netscape clients [Doug MacEachern]
 

diff --git a/modules/ssl/mod_ssl.h b/modules/ssl/mod_ssl.h
index 558ef7f7ae6b64e185d71fec8a6830fa431b91e0..f27cffb83e959ff986ae95a4309e09d3ab5fcd2d 100644 (file)
--- a/modules/ssl/mod_ssl.h
+++ b/modules/ssl/mod_ssl.h
@@ -636,11 +636,7 @@ int          ssl_callback_proxy_cert(SSL *ssl, X509 **x509, EVP_PKEY **pkey);
 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 *);
-#if SSL_LIBRARY_VERSION >= 0x00907000
-void         ssl_callback_LogTracingState(const SSL *, int, int);
-#else
 void         ssl_callback_LogTracingState(SSL *, int, int);
-#endif
 
 /*  Session Cache Support  */
 void         ssl_scache_init(server_rec *, apr_pool_t *);