Mercurial > hg > nginx
comparison src/http/modules/ngx_http_ssl_module.c @ 969:065b39794fff
ngx_ssl_get_server_conf()
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 02 Jan 2007 23:37:25 +0000 |
parents | cec32b3753ac |
children | 35f98a8e275f |
comparison
equal
deleted
inserted
replaced
968:1b60ecc8cdb7 | 969:065b39794fff |
---|---|
328 ngx_conf_merge_str_value(conf->ciphers, prev->ciphers, NGX_DEFLAUT_CIPHERS); | 328 ngx_conf_merge_str_value(conf->ciphers, prev->ciphers, NGX_DEFLAUT_CIPHERS); |
329 | 329 |
330 | 330 |
331 conf->ssl.log = cf->log; | 331 conf->ssl.log = cf->log; |
332 | 332 |
333 if (ngx_ssl_create(&conf->ssl, conf->protocols) != NGX_OK) { | 333 if (ngx_ssl_create(&conf->ssl, conf->protocols, conf) != NGX_OK) { |
334 return NGX_CONF_ERROR; | 334 return NGX_CONF_ERROR; |
335 } | 335 } |
336 | 336 |
337 cln = ngx_pool_cleanup_add(cf->pool, 0); | 337 cln = ngx_pool_cleanup_add(cf->pool, 0); |
338 if (cln == NULL) { | 338 if (cln == NULL) { |