Mercurial > hg > nginx-vendor-current
comparison src/http/ngx_http.c @ 600:5dc296c4372a NGINX_0_8_52
nginx 0.8.52
*) Bugfix: nginx used SSL mode for a listen socket if any listen option
was set; the bug had appeared in 0.8.51.
| author | Igor Sysoev <http://sysoev.ru> |
|---|---|
| date | Tue, 28 Sep 2010 00:00:00 +0400 |
| parents | be70f83b184f |
| children | 7ea1bba9a4f6 |
comparison
equal
deleted
inserted
replaced
| 599:ba5a8beb9f72 | 600:5dc296c4372a |
|---|---|
| 1272 | 1272 |
| 1273 /* preserve default_server bit during listen options overwriting */ | 1273 /* preserve default_server bit during listen options overwriting */ |
| 1274 default_server = addr[i].opt.default_server; | 1274 default_server = addr[i].opt.default_server; |
| 1275 | 1275 |
| 1276 #if (NGX_HTTP_SSL) | 1276 #if (NGX_HTTP_SSL) |
| 1277 ssl = lsopt->ssl || addr[i].opt.set; | 1277 ssl = lsopt->ssl || addr[i].opt.ssl; |
| 1278 #endif | 1278 #endif |
| 1279 | 1279 |
| 1280 if (lsopt->set) { | 1280 if (lsopt->set) { |
| 1281 | 1281 |
| 1282 if (addr[i].opt.set) { | 1282 if (addr[i].opt.set) { |