From 7d5d67750c0449375884f2fdf19c578dee0235e7 Mon Sep 17 00:00:00 2001
From: Sander Temme <sctemme@apache.org>
Date: Mon, 2 Mar 2009 23:17:53 +0000
Subject: [PATCH] Clean up more compiler emits. Add CHANGES entry, credit
Kasper for the OpenSSL STACK fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@749466 13f79535-47bb-0310-9956-ffa450edef68
---
CHANGES | 3 +++
modules/ssl/ssl_engine_init.c | 3 ++-
support/ab.c | 4 ++++
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/CHANGES b/CHANGES
index 2815729c40..d1fe46cd95 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache 2.3.2
+ *) mod_ssl: add support for type-safe STACK constructs in OpenSSL
+ development HEAD. [Kaspar Brand, Sander Temme]
+
*) ab: Fix maintenance of the pollset to resolve EALREADY errors
with kqueue (BSD/OS X) and excessive CPU with event ports (Solaris).
PR 44584. [Jeff Trawick]
diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
index d2c60915d8..66dda69f35 100644
--- a/modules/ssl/ssl_engine_init.c
+++ b/modules/ssl/ssl_engine_init.c
@@ -1133,7 +1133,8 @@ static int ssl_init_FindCAList_X509NameCmp(char **a, char **b)
return(X509_NAME_cmp((void*)*a, (void*)*b));
}
#else
-static int ssl_init_FindCAList_X509NameCmp(X509_NAME **a, X509_NAME **b)
+static int ssl_init_FindCAList_X509NameCmp(const X509_NAME * const *a,
+ const X509_NAME * const *b)
{
return(X509_NAME_cmp(*a, *b));
}
diff --git a/support/ab.c b/support/ab.c
index 9b1ce304bf..88575389f5 100644
--- a/support/ab.c
+++ b/support/ab.c
@@ -1984,7 +1984,11 @@ int main(int argc, const char * const argv[])
const char *optarg;
char c;
#ifdef USE_SSL
+#if OPENSSL_VERSION_NUMBER >= 0x00909000
const SSL_METHOD *meth = SSLv23_client_method();
+#else
+ SSL_METHOD *meth = SSLv23_client_method();
+#endif
#endif
/* table defaults */
--
2.40.0