Explicitly fix some types, and opt-out on macro conflicts

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90496 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c
index 97c2c4c1bdac9ca5394958cae848bc9afb99d24b..ba476e4e71ada350fe2a81e23b9c11168b4593be 100644 (file)
--- a/modules/ssl/mod_ssl.c
+++ b/modules/ssl/mod_ssl.c
@@ -316,7 +316,7 @@ static int ssl_hook_pre_connection(conn_rec *c)
 int ssl_hook_process_connection(SSLFilterRec *pRec)
 {
     int n, err;
-    conn_rec *c = SSL_get_app_data (pRec->pssl);
+    conn_rec *c = (conn_rec*)SSL_get_app_data (pRec->pssl);
 
     if (!SSL_is_init_finished(pRec->pssl))
     {

diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c
index 943a190a181b83cc2d1180b64ae4cda3ee9bdf06..86deaeac54eb64a49b83444abefb2970f5d2c8ba 100644 (file)
--- a/modules/ssl/ssl_engine_kernel.c
+++ b/modules/ssl/ssl_engine_kernel.c
@@ -474,7 +474,7 @@ int ssl_hook_ReadReq(request_rec *r)
      */
     ssl = (SSL *)apr_table_get(r->connection->notes, "ssl");
     if (ssl != NULL) {
-        apctx = SSL_get_app_data2(ssl);
+        apctx = (apr_table_t *)SSL_get_app_data2(ssl);
         apr_table_setn(apctx, "ssl::request_rec", (const char *)r);
     }
 
@@ -822,7 +822,7 @@ int ssl_hook_Access(request_rec *r)
      * restriction on the certificate chain).
      */
     if (dc->nVerifyDepth != UNSET) {
-        apctx = SSL_get_app_data2(ssl);
+        apctx = (apr_table_t *)SSL_get_app_data2(ssl);
         if ((vp = (void *)apr_table_get(apctx, "ssl::verify::depth")) != NULL)
             n = (int)AP_CTX_PTR2NUM(vp);
         else

diff --git a/modules/ssl/ssl_util.c b/modules/ssl/ssl_util.c
index 5742a34658f0100ee94b6cb7f2adee789537197c..8415e9f0240993b9a7425da8a589338b08b2200b 100644 (file)
--- a/modules/ssl/ssl_util.c
+++ b/modules/ssl/ssl_util.c
@@ -320,10 +320,9 @@ SSLModConfigRec *
 ssl_util_getmodconfig_ssl(
     SSL *ssl, const char *key)
 {
-    conn_rec *c;
+    conn_rec *c = (conn_rec *)SSL_get_app_data(ssl);
     SSLModConfigRec *mc = NULL;
      
-    c = SSL_get_app_data(ssl);
     if (c != NULL)
         mc = ssl_util_getmodconfig(c->base_server, key);
     return mc;

diff --git a/modules/ssl/ssl_util_ssl.h b/modules/ssl/ssl_util_ssl.h
index 6bcf81df17e295cd8161ff5243776dd00c645256..31acd897dc3c35fe47aa4b6cc81978039ec66b86 100644 (file)
--- a/modules/ssl/ssl_util_ssl.h
+++ b/modules/ssl/ssl_util_ssl.h
@@ -67,7 +67,7 @@
 #define SSL_LIBRARY_VERSION OPENSSL_VERSION_NUMBER
 #define SSL_LIBRARY_NAME    "OpenSSL"
 #define SSL_LIBRARY_TEXT    OPENSSL_VERSION_TEXT
-#else
+#elif !defined(SSL_LIBRARY_VERSION)
 #define SSL_LIBRARY_VERSION 0x0000
 #define SSL_LIBRARY_NAME    "OtherSSL"
 #define SSL_LIBRARY_TEXT    "OtherSSL 0.0.0 00 XXX 0000"