Mercurial > hg > nginx-vendor-current

comparison src/http/ngx_http.c @ 598:be70f83b184f NGINX_0_8_51

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.8.51 *) Change: the "secure_link_expires" directive has been canceled. *) Change: a logging level of resolver errors has been lowered from "alert" to "error". *) Feature: now a listen socket "ssl" parameter may be set several times.
author Igor Sysoev <http://sysoev.ru>
date Mon, 27 Sep 2010 00:00:00 +0400
parents 09d5f308901f
children 5dc296c4372a
comparison
equal deleted inserted replaced
597:1695031dbfed 598:be70f83b184f
1219 struct sockaddr *sa; 1219 struct sockaddr *sa;
1220 ngx_http_conf_addr_t *addr; 1220 ngx_http_conf_addr_t *addr;
1221 #if (NGX_HAVE_UNIX_DOMAIN) 1221 #if (NGX_HAVE_UNIX_DOMAIN)
1222 struct sockaddr_un *saun; 1222 struct sockaddr_un *saun;
1223 #endif 1223 #endif
1224 #if (NGX_HTTP_SSL)
1225 ngx_uint_t ssl;
1226 #endif
1224 1227
1225 /* 1228 /*
1226 * we can not compare whole sockaddr struct's as kernel 1229 * we can not compare whole sockaddr struct's as kernel
1227 * may fill some fields in inherited sockaddr struct's 1230 * may fill some fields in inherited sockaddr struct's
1228 */ 1231 */
1268 } 1271 }
1269 1272
1270 /* preserve default_server bit during listen options overwriting */ 1273 /* preserve default_server bit during listen options overwriting */
1271 default_server = addr[i].opt.default_server; 1274 default_server = addr[i].opt.default_server;
1272 1275
1276 #if (NGX_HTTP_SSL)
1277 ssl = lsopt->ssl || addr[i].opt.set;
1278 #endif
1279
1273 if (lsopt->set) { 1280 if (lsopt->set) {
1274 1281
1275 if (addr[i].opt.set) { 1282 if (addr[i].opt.set) {
1276 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 1283 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
1277 "a duplicate listen options for %s", addr[i].opt.addr); 1284 "a duplicate listen options for %s", addr[i].opt.addr);
1294 default_server = 1; 1301 default_server = 1;
1295 addr[i].default_server = cscf; 1302 addr[i].default_server = cscf;
1296 } 1303 }
1297 1304
1298 addr[i].opt.default_server = default_server; 1305 addr[i].opt.default_server = default_server;
1306 #if (NGX_HTTP_SSL)
1307 addr[i].opt.ssl = ssl;
1308 #endif
1299 1309
1300 return NGX_OK; 1310 return NGX_OK;
1301 } 1311 }
1302 1312
1303 /* add the address to the addresses list that bound to this port */ 1313 /* add the address to the addresses list that bound to this port */