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

diff --git a/CHANGES b/CHANGES
index 2815729c409572cf3db22df6f39245db95a66bb7..d1fe46cd95bd1474f109df8d7356b55708937470 100644 (file)
--- 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 d2c60915d817b31e3fd0163081d3c5623c261a7d..66dda69f352829493d2f729c0c95a8a81986a4b9 100644 (file)
--- 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 9b1ce304bf0a96bd7e129a2fc827da1f73937463..88575389f593d3c821eb56d3de01c4eea36909cb 100644 (file)
--- 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  */