httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r819242 - /httpd/httpd/trunk/support/ab.c
Date Sun, 27 Sep 2009 01:53:14 GMT
Author: fuankg
Date: Sun Sep 27 01:53:14 2009
New Revision: 819242

URL: http://svn.apache.org/viewvc?rev=819242&view=rev
Log:
fixed compatibility to Openssl < 0.9.7g;
sync'd compatibility to Openssl >= 0.9.9 with 2.2.x branch.

Modified:
    httpd/httpd/trunk/support/ab.c

Modified: httpd/httpd/trunk/support/ab.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/support/ab.c?rev=819242&r1=819241&r2=819242&view=diff
==============================================================================
--- httpd/httpd/trunk/support/ab.c (original)
+++ httpd/httpd/trunk/support/ab.c Sun Sep 27 01:53:14 2009
@@ -189,6 +189,19 @@
 
 #endif
 
+#if defined(USE_SSL)
+#if (OPENSSL_VERSION_NUMBER >= 0x00909000)
+#define AB_SSL_METHOD_CONST const
+#else
+#define AB_SSL_METHOD_CONST
+#endif
+#if (OPENSSL_VERSION_NUMBER >= 0x0090707f)
+#define AB_SSL_CIPHER_CONST const
+#else
+#define AB_SSL_CIPHER_CONST
+#endif
+#endif
+
 #include <math.h>
 #if APR_HAVE_CTYPE_H
 #include <ctype.h>
@@ -525,7 +538,7 @@
 
 static int ssl_print_connection_info(BIO *bio, SSL *ssl)
 {
-    const SSL_CIPHER *c;
+    AB_SSL_CIPHER_CONST SSL_CIPHER *c;
     int alg_bits,bits;
 
     c = SSL_get_current_cipher(ssl);
@@ -609,7 +622,7 @@
             if (verbosity >= 2)
                 ssl_print_info(c);
             if (ssl_info == NULL) {
-                const SSL_CIPHER *ci;
+                AB_SSL_CIPHER_CONST SSL_CIPHER *ci;
                 X509 *cert;
                 int sk_bits, pk_bits, swork;
 
@@ -1995,11 +2008,7 @@
     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
+    AB_SSL_METHOD_CONST SSL_METHOD *meth = SSLv23_client_method();
 #endif
 
     /* table defaults  */



Mime
View raw message