comparison src/http/modules/ngx_http_ssl_module.c @ 635:e67b227c8dbb default tip

Merge with current.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 25 Apr 2011 04:07:55 +0400
parents 8246d8a2c2be
children
comparison
equal deleted inserted replaced
578:f3a9e57d2e17 635:e67b227c8dbb
312 * sscf->certificate = { 0, NULL }; 312 * sscf->certificate = { 0, NULL };
313 * sscf->certificate_key = { 0, NULL }; 313 * sscf->certificate_key = { 0, NULL };
314 * sscf->dhparam = { 0, NULL }; 314 * sscf->dhparam = { 0, NULL };
315 * sscf->client_certificate = { 0, NULL }; 315 * sscf->client_certificate = { 0, NULL };
316 * sscf->crl = { 0, NULL }; 316 * sscf->crl = { 0, NULL };
317 * sscf->ciphers.len = 0; 317 * sscf->ciphers = { 0, NULL };
318 * sscf->ciphers.data = NULL;
319 * sscf->shm_zone = NULL; 318 * sscf->shm_zone = NULL;
320 */ 319 */
321 320
322 sscf->enable = NGX_CONF_UNSET; 321 sscf->enable = NGX_CONF_UNSET;
323 sscf->prefer_server_ciphers = NGX_CONF_UNSET; 322 sscf->prefer_server_ciphers = NGX_CONF_UNSET;