You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2007/12/08 15:05:13 UTC
svn commit: r602471 - in /httpd/httpd/branches/2.2.x: STATUS
modules/ssl/ssl_engine_init.c modules/ssl/ssl_toolkit_compat.h
Author: jim
Date: Sat Dec 8 06:05:12 2007
New Revision: 602471
URL: http://svn.apache.org/viewvc?rev=602471&view=rev
Log:
Merge r598019 from trunk:
enable to build with OpenSSL 0.9.9
Submitted by: fuankg
Reviewed by: jim
Modified:
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_init.c
httpd/httpd/branches/2.2.x/modules/ssl/ssl_toolkit_compat.h
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=602471&r1=602470&r2=602471&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Sat Dec 8 06:05:12 2007
@@ -79,13 +79,6 @@
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
Modified: httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_init.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_init.c?rev=602471&r1=602470&r2=602471&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_init.c (original)
+++ httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_init.c Sat Dec 8 06:05:12 2007
@@ -361,7 +361,7 @@
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;
Modified: httpd/httpd/branches/2.2.x/modules/ssl/ssl_toolkit_compat.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/ssl/ssl_toolkit_compat.h?rev=602471&r1=602470&r2=602471&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/ssl/ssl_toolkit_compat.h (original)
+++ httpd/httpd/branches/2.2.x/modules/ssl/ssl_toolkit_compat.h Sat Dec 8 06:05:12 2007
@@ -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*);