Mercurial > hg > nginx
comparison src/event/ngx_event_openssl.c @ 3594:8a5106c2a377 stable-0.7
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
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Mon, 07 Jun 2010 11:55:20 +0000 |
| parents | d513f9d30208 |
| children |
comparison
equal
deleted
inserted
replaced
| 3593:a79d2ad7a2d8 | 3594:8a5106c2a377 |
|---|---|
| 559 } | 559 } |
| 560 | 560 |
| 561 #if (NGX_DEBUG) | 561 #if (NGX_DEBUG) |
| 562 { | 562 { |
| 563 char buf[129], *s, *d; | 563 char buf[129], *s, *d; |
| 564 #if OPENSSL_VERSION_NUMBER >= 0x1000000fL | |
| 565 const | |
| 566 #endif | |
| 564 SSL_CIPHER *cipher; | 567 SSL_CIPHER *cipher; |
| 565 | 568 |
| 566 cipher = SSL_get_current_cipher(c->ssl->connection); | 569 cipher = SSL_get_current_cipher(c->ssl->connection); |
| 567 | 570 |
| 568 if (cipher) { | 571 if (cipher) { |