From 99daa8e5d4e83174b9a8c0360d4e52a8a9dac4c5 Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Mon, 26 Oct 2009 16:53:34 +0000
Subject: 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
---
 src/core/nginx.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/core')

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
@@ -238,6 +238,13 @@ main(int argc, char *const *argv)
         if (ngx_show_configure) {
 #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);
         }
-- 
cgit