You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sc...@apache.org on 2009/03/03 00:17:53 UTC
svn commit: r749466 - in /httpd/httpd/trunk: CHANGES
modules/ssl/ssl_engine_init.c support/ab.c
Author: sctemme
Date: Mon Mar 2 23:17:53 2009
New Revision: 749466
URL: http://svn.apache.org/viewvc?rev=749466&view=rev
Log:
Clean up more compiler emits. Add CHANGES entry, credit Kasper for the OpenSSL STACK fix
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/modules/ssl/ssl_engine_init.c
httpd/httpd/trunk/support/ab.c
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=749466&r1=749465&r2=749466&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Mon Mar 2 23:17:53 2009
@@ -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]
Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_init.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_init.c?rev=749466&r1=749465&r2=749466&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_init.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_init.c Mon Mar 2 23:17:53 2009
@@ -1133,7 +1133,8 @@
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));
}
Modified: httpd/httpd/trunk/support/ab.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/support/ab.c?rev=749466&r1=749465&r2=749466&view=diff
==============================================================================
--- httpd/httpd/trunk/support/ab.c (original)
+++ httpd/httpd/trunk/support/ab.c Mon Mar 2 23:17:53 2009
@@ -1984,7 +1984,11 @@
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 */