diff options
| author | Rainer Jung <rjung@apache.org> | 2016-08-10 22:58:22 +0200 |
|---|---|---|
| committer | Rainer Jung <rjung@apache.org> | 2016-08-10 22:58:22 +0200 |
| commit | bd14694a6590ab688ab5904f0f0d4ba86e2f8487 (patch) | |
| tree | 224a6bfff4dfdefa92d4fbff64092d53bf841f33 /modules/ssl/ssl_private.h | |
| parent | Follow on to r1755264, for the case of merged header length exceptions, (diff) | |
| download | apache2-bd14694a6590ab688ab5904f0f0d4ba86e2f8487.tar.xz apache2-bd14694a6590ab688ab5904f0f0d4ba86e2f8487.zip | |
OpenSSL 1.1.0 compat:
- move IDCONST macro outside of addition #if check.
Otherwise we break compatibility with old
OpenSSL 0.9.8 releases.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1755856 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/ssl/ssl_private.h')
| -rw-r--r-- | modules/ssl/ssl_private.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h index 6795aceee6..459b6b34c2 100644 --- a/modules/ssl/ssl_private.h +++ b/modules/ssl/ssl_private.h @@ -135,6 +135,13 @@ #define HAVE_SSL_CONF_CMD #endif +/* session id constness */ +#if OPENSSL_VERSION_NUMBER < 0x10100000L +#define IDCONST +#else +#define IDCONST const +#endif + /** * The following features all depend on TLS extension support. * Within this block, check again for features (not version numbers). @@ -166,13 +173,6 @@ #endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L */ #endif /* if !defined(OPENSSL_NO_OCSP) && defined(SSL_CTX_set_tlsext_status_cb) */ -/* session id constness */ -#if OPENSSL_VERSION_NUMBER < 0x10100000L -#define IDCONST -#else -#define IDCONST const -#endif - /* TLS session tickets */ #if defined(SSL_CTX_set_tlsext_ticket_key_cb) #define HAVE_TLS_SESSION_TICKETS |