Mercurial > hg > nginx
comparison src/http/modules/ngx_http_ssl_module.c @ 4357:efd515ace6bb stable-1.0
Merge of r4270, r4274:
Minor cleanup:
*) Changed error message to be more appropriate in the imaginary
"open_file_cache max=0" case.
*) Fixed NGX_CONF_TAKE1/NGX_CONF_FLAG misuse.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Wed, 14 Dec 2011 14:31:55 +0000 |
parents | 8d39230df833 |
children | fd40c9ef750d |
comparison
equal
deleted
inserted
replaced
4356:c8695c991cb8 | 4357:efd515ace6bb |
---|---|
99 NGX_HTTP_SRV_CONF_OFFSET, | 99 NGX_HTTP_SRV_CONF_OFFSET, |
100 offsetof(ngx_http_ssl_srv_conf_t, ciphers), | 100 offsetof(ngx_http_ssl_srv_conf_t, ciphers), |
101 NULL }, | 101 NULL }, |
102 | 102 |
103 { ngx_string("ssl_verify_client"), | 103 { ngx_string("ssl_verify_client"), |
104 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG, | 104 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1, |
105 ngx_conf_set_enum_slot, | 105 ngx_conf_set_enum_slot, |
106 NGX_HTTP_SRV_CONF_OFFSET, | 106 NGX_HTTP_SRV_CONF_OFFSET, |
107 offsetof(ngx_http_ssl_srv_conf_t, verify), | 107 offsetof(ngx_http_ssl_srv_conf_t, verify), |
108 &ngx_http_ssl_verify }, | 108 &ngx_http_ssl_verify }, |
109 | 109 |