diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-06-07 11:55:20 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-06-07 11:55:20 +0000 |
| commit | 400683ac9102ee18564bb6eff0037e710fb48d9f (patch) | |
| tree | 5dccb1c311036c2412f0587c13b47fc7d4149831 /src | |
| parent | a16387eba9b14d48be0e0644f6030f880b652836 (diff) | |
| download | nginx-400683ac9102ee18564bb6eff0037e710fb48d9f.tar.gz nginx-400683ac9102ee18564bb6eff0037e710fb48d9f.tar.bz2 | |
merge r3489, r3493:
*) MSVC8 compatibility with OpenSSL 1.0.0
*) fix building OpenSSL-1.0.0 on 64-bit Linux:
make installs the libraries in lib64 directory
and build nginx/Windows against OpenSSL-0.9.8n
Diffstat (limited to 'src')
| -rw-r--r-- | src/event/ngx_event_openssl.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c index 4a05444a0..5eab4affb 100644 --- a/src/event/ngx_event_openssl.c +++ b/src/event/ngx_event_openssl.c @@ -561,6 +561,9 @@ ngx_ssl_handshake(ngx_connection_t *c) #if (NGX_DEBUG) { char buf[129], *s, *d; +#if OPENSSL_VERSION_NUMBER >= 0x1000000fL + const +#endif SSL_CIPHER *cipher; cipher = SSL_get_current_cipher(c->ssl->connection); |