From: Doug MacEachern <dougm@apache.org>
Date: Sun, 7 Apr 2002 21:58:25 +0000 (+0000)
Subject: PR: 7802
X-Git-Tag: 2.0.36~281
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb2d86e811cb458540237ce92fee13fa58cbccd9;p=apache

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 cb5c8f3bee..9a4fd5323a 100644
--- 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 558ef7f7ae..f27cffb83e 100644
--- 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 *);