Mercurial > hg > nginx

comparison src/http/modules/ngx_http_ssl_module.c @ 2124:e0b424b98f24

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix typo
author Igor Sysoev <igor@sysoev.ru>
date Tue, 29 Jul 2008 14:31:03 +0000
parents 9697407e9ecb
children 109849282793
comparison
equal deleted inserted replaced
2123:9697407e9ecb 2124:e0b424b98f24
11 11
12 typedef ngx_int_t (*ngx_ssl_variable_handler_pt)(ngx_connection_t *c, 12 typedef ngx_int_t (*ngx_ssl_variable_handler_pt)(ngx_connection_t *c,
13 ngx_pool_t *pool, ngx_str_t *s); 13 ngx_pool_t *pool, ngx_str_t *s);
14 14
15 15
16 #define NGX_DEFLAUT_CERTIFICATE "cert.pem" 16 #define NGX_DEFAULT_CERTIFICATE "cert.pem"
17 #define NGX_DEFLAUT_CERTIFICATE_KEY "cert.pem" 17 #define NGX_DEFAULT_CERTIFICATE_KEY "cert.pem"
18 #define NGX_DEFLAUT_CIPHERS "ALL:!ADH:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP" 18 #define NGX_DEFAULT_CIPHERS "ALL:!ADH:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP"
19 19
20 20
21 static ngx_int_t ngx_http_ssl_static_variable(ngx_http_request_t *r, 21 static ngx_int_t ngx_http_ssl_static_variable(ngx_http_request_t *r,
22 ngx_http_variable_value_t *v, uintptr_t data); 22 ngx_http_variable_value_t *v, uintptr_t data);
23 static ngx_int_t ngx_http_ssl_variable(ngx_http_request_t *r, 23 static ngx_int_t ngx_http_ssl_variable(ngx_http_request_t *r,
355 355
356 ngx_conf_merge_uint_value(conf->verify, prev->verify, 0); 356 ngx_conf_merge_uint_value(conf->verify, prev->verify, 0);
357 ngx_conf_merge_uint_value(conf->verify_depth, prev->verify_depth, 1); 357 ngx_conf_merge_uint_value(conf->verify_depth, prev->verify_depth, 1);
358 358
359 ngx_conf_merge_str_value(conf->certificate, prev->certificate, 359 ngx_conf_merge_str_value(conf->certificate, prev->certificate,
360 NGX_DEFLAUT_CERTIFICATE); 360 NGX_DEFAULT_CERTIFICATE);
361 361
362 ngx_conf_merge_str_value(conf->certificate_key, prev->certificate_key, 362 ngx_conf_merge_str_value(conf->certificate_key, prev->certificate_key,
363 NGX_DEFLAUT_CERTIFICATE_KEY); 363 NGX_DEFAULT_CERTIFICATE_KEY);
364 364
365 ngx_conf_merge_str_value(conf->dhparam, prev->dhparam, ""); 365 ngx_conf_merge_str_value(conf->dhparam, prev->dhparam, "");
366 366
367 ngx_conf_merge_str_value(conf->client_certificate, prev->client_certificate, 367 ngx_conf_merge_str_value(conf->client_certificate, prev->client_certificate,
368 ""); 368 "");
369 369
370 ngx_conf_merge_str_value(conf->ciphers, prev->ciphers, NGX_DEFLAUT_CIPHERS); 370 ngx_conf_merge_str_value(conf->ciphers, prev->ciphers, NGX_DEFAULT_CIPHERS);
371 371
372 372
373 conf->ssl.log = cf->log; 373 conf->ssl.log = cf->log;
374 374
375 if (ngx_ssl_create(&conf->ssl, conf->protocols, conf) != NGX_OK) { 375 if (ngx_ssl_create(&conf->ssl, conf->protocols, conf) != NGX_OK) {