diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2001-08-22 18:21:40 +0200 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2001-08-22 18:21:40 +0200 |
| commit | 6333b12a2eab57f222cb263abb58700c2f979100 (patch) | |
| tree | ce29217ac0fe83e70493c2843306b875f37441e6 | |
| parent | Ensure that libtool does the installation for us. This way we will actually (diff) | |
| download | apache2-6333b12a2eab57f222cb263abb58700c2f979100.tar.xz apache2-6333b12a2eab57f222cb263abb58700c2f979100.zip | |
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
| -rw-r--r-- | modules/ssl/mod_ssl.c | 2 | ||||
| -rw-r--r-- | modules/ssl/ssl_engine_kernel.c | 4 | ||||
| -rw-r--r-- | modules/ssl/ssl_util.c | 3 | ||||
| -rw-r--r-- | modules/ssl/ssl_util_ssl.h | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c index 97c2c4c1bd..ba476e4e71 100644 --- 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 943a190a18..86deaeac54 100644 --- 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 5742a34658..8415e9f024 100644 --- 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 6bcf81df17..31acd897dc 100644 --- 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" |