Mercurial > hg > nginx-ranges
comparison src/http/modules/ngx_http_ssl_module.c @ 50:72eb30262aac NGINX_0_1_25
nginx 0.1.25
*) Bugfix: nginx did run on Linux parisc.
*) Feature: nginx now does not start under FreeBSD if the sysctl
kern.ipc.somaxconn value is too big.
*) Bugfix: if a request was internally redirected by the
ngx_http_index_module module to the ngx_http_proxy_module or
ngx_http_fastcgi_module modules, then the index file was not closed
after request completion.
*) Feature: the "proxy_pass" can be used in location with regular
expression.
*) Feature: the ngx_http_rewrite_filter_module module supports the
condition like "if ($HTTP_USER_AGENT ~ MSIE)".
*) Bugfix: nginx started too slow if the large number of addresses and
text values were used in the "geo" directive.
*) Change: a variable name must be declared as "$name" in the "geo"
directive. The previous variant without "$" is still supported, but
will be removed soon.
*) Feature: the "%{VARIABLE}v" logging parameter.
*) Feature: the "set $name value" directive.
*) Bugfix: gcc 4.0 compatibility.
*) Feature: the --with-openssl-opt=OPTIONS autoconfiguration directive.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Sat, 19 Mar 2005 00:00:00 +0300 |
parents | aab2ea7c0458 |
children | 3050baa54a26 |
comparison
equal
deleted
inserted
replaced
49:93dabbc9efb9 | 50:72eb30262aac |
---|---|
17 | 17 |
18 static void *ngx_http_ssl_create_main_conf(ngx_conf_t *cf); | 18 static void *ngx_http_ssl_create_main_conf(ngx_conf_t *cf); |
19 static char *ngx_http_ssl_init_main_conf(ngx_conf_t *cf, void *conf); | 19 static char *ngx_http_ssl_init_main_conf(ngx_conf_t *cf, void *conf); |
20 static void *ngx_http_ssl_create_srv_conf(ngx_conf_t *cf); | 20 static void *ngx_http_ssl_create_srv_conf(ngx_conf_t *cf); |
21 static char *ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, | 21 static char *ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, |
22 void *parent, void *child); | 22 void *parent, void *child); |
23 | 23 |
24 | 24 |
25 static ngx_command_t ngx_http_ssl_commands[] = { | 25 static ngx_command_t ngx_http_ssl_commands[] = { |
26 | 26 |
27 { ngx_string("ssl_engine"), | 27 { ngx_string("ssl_engine"), |
85 NULL, /* init module */ | 85 NULL, /* init module */ |
86 NULL /* init process */ | 86 NULL /* init process */ |
87 }; | 87 }; |
88 | 88 |
89 | 89 |
90 static void *ngx_http_ssl_create_main_conf(ngx_conf_t *cf) | 90 static void * |
91 ngx_http_ssl_create_main_conf(ngx_conf_t *cf) | |
91 { | 92 { |
92 ngx_http_ssl_main_conf_t *mcf; | 93 ngx_http_ssl_main_conf_t *mcf; |
93 | 94 |
94 if (!(mcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_ssl_main_conf_t)))) { | 95 mcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_ssl_main_conf_t)); |
96 if (mcf == NULL) { | |
95 return NGX_CONF_ERROR; | 97 return NGX_CONF_ERROR; |
96 } | 98 } |
97 | 99 |
98 /* | 100 /* |
99 * set by ngx_pcalloc(): | 101 * set by ngx_pcalloc(): |
104 | 106 |
105 return mcf; | 107 return mcf; |
106 } | 108 } |
107 | 109 |
108 | 110 |
109 static char *ngx_http_ssl_init_main_conf(ngx_conf_t *cf, void *conf) | 111 static char * |
112 ngx_http_ssl_init_main_conf(ngx_conf_t *cf, void *conf) | |
110 { | 113 { |
111 ngx_http_ssl_main_conf_t *mcf = conf; | 114 ngx_http_ssl_main_conf_t *mcf = conf; |
112 | 115 |
113 ENGINE *engine; | 116 ENGINE *engine; |
114 | 117 |
135 | 138 |
136 return NGX_CONF_OK; | 139 return NGX_CONF_OK; |
137 } | 140 } |
138 | 141 |
139 | 142 |
140 static void *ngx_http_ssl_create_srv_conf(ngx_conf_t *cf) | 143 static void * |
144 ngx_http_ssl_create_srv_conf(ngx_conf_t *cf) | |
141 { | 145 { |
142 ngx_http_ssl_srv_conf_t *scf; | 146 ngx_http_ssl_srv_conf_t *scf; |
143 | 147 |
144 if (!(scf = ngx_pcalloc(cf->pool, sizeof(ngx_http_ssl_srv_conf_t)))) { | 148 scf = ngx_pcalloc(cf->pool, sizeof(ngx_http_ssl_srv_conf_t)); |
149 if (scf == NULL) { | |
145 return NGX_CONF_ERROR; | 150 return NGX_CONF_ERROR; |
146 } | 151 } |
147 | 152 |
148 /* | 153 /* |
149 * set by ngx_pcalloc(): | 154 * set by ngx_pcalloc(): |
160 | 165 |
161 return scf; | 166 return scf; |
162 } | 167 } |
163 | 168 |
164 | 169 |
165 static char *ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, | 170 static char * |
166 void *parent, void *child) | 171 ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) |
167 { | 172 { |
168 ngx_http_ssl_srv_conf_t *prev = parent; | 173 ngx_http_ssl_srv_conf_t *prev = parent; |
169 ngx_http_ssl_srv_conf_t *conf = child; | 174 ngx_http_ssl_srv_conf_t *conf = child; |
170 | 175 |
171 ngx_conf_merge_value(conf->enable, prev->enable, 0); | 176 ngx_conf_merge_value(conf->enable, prev->enable, 0); |
224 } | 229 } |
225 | 230 |
226 | 231 |
227 #if 0 | 232 #if 0 |
228 | 233 |
229 static ngx_int_t ngx_http_ssl_init_process(ngx_cycle_t *cycle) | 234 static ngx_int_t |
235 ngx_http_ssl_init_process(ngx_cycle_t *cycle) | |
230 { | 236 { |
231 ngx_uint_t i; | 237 ngx_uint_t i; |
232 ngx_http_ssl_srv_conf_t *sscf; | 238 ngx_http_ssl_srv_conf_t *sscf; |
233 ngx_http_core_srv_conf_t **cscfp; | 239 ngx_http_core_srv_conf_t **cscfp; |
234 ngx_http_core_main_conf_t *cmcf; | 240 ngx_http_core_main_conf_t *cmcf; |