diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-10-26 16:53:34 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-10-26 16:53:34 +0000 |
| commit | 99daa8e5d4e83174b9a8c0360d4e52a8a9dac4c5 (patch) | |
| tree | 89d84e61ebf85d5ad797b49e146f1405843d6328 /src/core | |
| parent | bedabd488c1ddcb4cca2430a753884684c14d95a (diff) | |
| download | nginx-99daa8e5d4e83174b9a8c0360d4e52a8a9dac4c5.tar.gz nginx-99daa8e5d4e83174b9a8c0360d4e52a8a9dac4c5.tar.bz2 | |
merge r2995, r2996, r2997, r2998, r3003, r3141, r3210, r3211, r3232:
various SSL fixes and features:
*) $ssl_client_verify
*) "ssl_verify_client ask" was changed to "ssl_verify_client optional"
*) ssl_crl
*) delete OpenSSL pre-0.9.7 compatibility: the sources were not actually
compatible with OpenSSL 0.9.6 since ssl_session_cache introduction
*) fix memory corruption in $ssl_client_cert
*) issue SNI warning instead of failure: this is too common case
*) use ngx_log_error(), since OpenSSL does not set an error on the failure
*) add SNI support in -V output
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/nginx.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/core/nginx.c b/src/core/nginx.c index ff7a9f848..a9951d3a2 100644 --- a/src/core/nginx.c +++ b/src/core/nginx.c @@ -239,6 +239,13 @@ main(int argc, char *const *argv) #ifdef NGX_COMPILER ngx_log_stderr(0, "built by " NGX_COMPILER); #endif +#if (NGX_SSL) +#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME + ngx_log_stderr(0, "TLS SNI support enabled"); +#else + ngx_log_stderr(0, "TLS SNI support disabled"); +#endif +#endif ngx_log_stderr(0, "configure arguments:" NGX_CONFIGURE); } |