Mercurial > hg > nginx

comparison src/http/modules/ngx_http_ssl_module.c @ 971:948acd940145

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
style fix: scf > sscf
author Igor Sysoev <igor@sysoev.ru>
date Tue, 02 Jan 2007 23:50:10 +0000
parents 35f98a8e275f
children e1ede83911ef
comparison
equal deleted inserted replaced
970:35f98a8e275f 971:948acd940145
255 255
256 256
257 static void * 257 static void *
258 ngx_http_ssl_create_srv_conf(ngx_conf_t *cf) 258 ngx_http_ssl_create_srv_conf(ngx_conf_t *cf)
259 { 259 {
260 ngx_http_ssl_srv_conf_t *scf; 260 ngx_http_ssl_srv_conf_t *sscf;
261 261
262 scf = ngx_pcalloc(cf->pool, sizeof(ngx_http_ssl_srv_conf_t)); 262 sscf = ngx_pcalloc(cf->pool, sizeof(ngx_http_ssl_srv_conf_t));
263 if (scf == NULL) { 263 if (sscf == NULL) {
264 return NGX_CONF_ERROR; 264 return NGX_CONF_ERROR;
265 } 265 }
266 266
267 /* 267 /*
268 * set by ngx_pcalloc(): 268 * set by ngx_pcalloc():
269 * 269 *
270 * scf->protocols = 0; 270 * sscf->protocols = 0;
271 271 * sscf->certificate.len = 0;
272 * scf->certificate.len = 0; 272 * sscf->certificate.data = NULL;
273 * scf->certificate.data = NULL; 273 * sscf->certificate_key.len = 0;
274 * scf->certificate_key.len = 0; 274 * sscf->certificate_key.data = NULL;
275 * scf->certificate_key.data = NULL; 275 * sscf->client_certificate.len = 0;
276 * scf->client_certificate.len = 0; 276 * sscf->client_certificate.data = NULL;
277 * scf->client_certificate.data = NULL; 277 * sscf->ciphers.len = 0;
278 * scf->ciphers.len = 0; 278 * sscf->ciphers.data = NULL;
279 * scf->ciphers.data = NULL;
280 */ 279 */
281 280
282 scf->enable = NGX_CONF_UNSET; 281 sscf->enable = NGX_CONF_UNSET;
283 scf->session_timeout = NGX_CONF_UNSET; 282 sscf->session_timeout = NGX_CONF_UNSET;
284 scf->verify = NGX_CONF_UNSET; 283 sscf->verify = NGX_CONF_UNSET;
285 scf->verify_depth = NGX_CONF_UNSET; 284 sscf->verify_depth = NGX_CONF_UNSET;
286 scf->prefer_server_ciphers = NGX_CONF_UNSET; 285 sscf->prefer_server_ciphers = NGX_CONF_UNSET;
287 286
288 return scf; 287 return sscf;
289 } 288 }
290 289
291 290
292 static char * 291 static char *
293 ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) 292 ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)