Mercurial > hg > nginx

comparison src/http/ngx_http_request.c @ 7463:180df83473a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
SSL: passwords support for dynamic certificate loading. Passwords have to be copied to the configuration pool to be used at runtime. Also, to prevent blocking on stdin (with "daemon off;") an empty password list is provided. To make things simpler, password handling was modified to allow an empty array (with 0 elements and elts set to NULL) as an equivalent of an array with 1 empty password.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 25 Feb 2019 16:42:23 +0300
parents be2af41d3620
children 48c87377aabd
comparison
equal deleted inserted replaced
7462:be2af41d3620 7463:180df83473a4
993 } 993 }
994 994
995 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, 995 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
996 "ssl key: \"%s\"", key.data); 996 "ssl key: \"%s\"", key.data);
997 997
998 if (ngx_ssl_connection_certificate(c, r->pool, &cert, &key, NULL) 998 if (ngx_ssl_connection_certificate(c, r->pool, &cert, &key,
999 sscf->passwords)
999 != NGX_OK) 1000 != NGX_OK)
1000 { 1001 {
1001 goto failed; 1002 goto failed;
1002 } 1003 }
1003 } 1004 }