Merge r598019 from trunk:

enable to build with OpenSSL 0.9.9

Submitted by: fuankg
Reviewed by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@602471 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index f76fd032afda5cc7d5b69d744cb56fcf0bad1b54..c2fcf66219866659e574aaaedc3c759730107859 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -79,13 +79,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * mod_ssl: Enable to build with OpenSSL 0.9.9
-    trunk:
-       http://svn.apache.org/viewvc?view=rev&revision=598019
-    2.2.x:
-       Trunk patches apply
-    +1: fuankg, rpluem, jim
-
   * mod_filter: Don't try to support chained filters when it doesn't work
     PR 43956
     http://svn.apache.org/viewvc?view=rev&revision=598299

diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
index ff2a49463089895ebdcf07e3880adc85d7ee8e1e..268f7f24a136667dad45fff624000c53f9a076ce 100644 (file)
--- a/modules/ssl/ssl_engine_init.c
+++ b/modules/ssl/ssl_engine_init.c
@@ -361,7 +361,7 @@ static void ssl_init_ctx_protocol(server_rec *s,
                                   modssl_ctx_t *mctx)
 {
     SSL_CTX *ctx = NULL;
-    SSL_METHOD *method = NULL;
+    MODSSL_SSL_METHOD_CONST SSL_METHOD *method = NULL;
     char *cp;
     int protocol = mctx->protocol;
 

diff --git a/modules/ssl/ssl_toolkit_compat.h b/modules/ssl/ssl_toolkit_compat.h
index d8bad75ae405495c963ad21700cb881031eaa8a3..430127c1ec504509128077b94cfa8546eea355e5 100644 (file)
--- a/modules/ssl/ssl_toolkit_compat.h
+++ b/modules/ssl/ssl_toolkit_compat.h
@@ -105,6 +105,12 @@
 # define MODSSL_D2I_X509_CONST
 #endif
 
+#if (OPENSSL_VERSION_NUMBER >= 0x00909000)
+# define MODSSL_SSL_METHOD_CONST const
+#else
+# define MODSSL_SSL_METHOD_CONST
+#endif
+
 #define modssl_X509_verify_cert X509_verify_cert
 
 typedef int (modssl_read_bio_cb_fn)(char*,int,int,void*);