Mercurial > hg > nginx

comparison src/http/ngx_http.c @ 2224:109849282793

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*) listen ssl *) no default ssl_cetificate and ssl_cetificate_key
author Igor Sysoev <igor@sysoev.ru>
date Mon, 01 Sep 2008 14:19:01 +0000
parents 005fc65f7ce7
children f62751dab60d
comparison
equal deleted inserted replaced
2223:005fc65f7ce7 2224:109849282793
1156 return NGX_ERROR; 1156 return NGX_ERROR;
1157 } 1157 }
1158 1158
1159 in_addr[a].core_srv_conf = cscfp[s]; 1159 in_addr[a].core_srv_conf = cscfp[s];
1160 in_addr[a].default_server = 1; 1160 in_addr[a].default_server = 1;
1161 #if (NGX_HTTP_SSL)
1162 in_addr[a].ssl = listen[l].conf.ssl;
1163 #endif
1161 in_addr[a].listen_conf = &listen[l].conf; 1164 in_addr[a].listen_conf = &listen[l].conf;
1162 } 1165 }
1163 1166
1164 goto found; 1167 goto found;
1165 } 1168 }
1240 in_addr->regex = NULL; 1243 in_addr->regex = NULL;
1241 #endif 1244 #endif
1242 in_addr->core_srv_conf = cscf; 1245 in_addr->core_srv_conf = cscf;
1243 in_addr->default_server = listen->conf.default_server; 1246 in_addr->default_server = listen->conf.default_server;
1244 in_addr->bind = listen->conf.bind; 1247 in_addr->bind = listen->conf.bind;
1248 #if (NGX_HTTP_SSL)
1249 in_addr->ssl = listen->conf.ssl;
1250 #endif
1245 in_addr->listen_conf = &listen->conf; 1251 in_addr->listen_conf = &listen->conf;
1246 1252
1247 return ngx_http_add_names(cf, cscf, in_addr); 1253 return ngx_http_add_names(cf, cscf, in_addr);
1248 } 1254 }
1249 1255
1646 1652
1647 for (i = 0; i < hip->naddrs; i++) { 1653 for (i = 0; i < hip->naddrs; i++) {
1648 hip->addrs[i].addr = in_addr[i].addr; 1654 hip->addrs[i].addr = in_addr[i].addr;
1649 hip->addrs[i].core_srv_conf = in_addr[i].core_srv_conf; 1655 hip->addrs[i].core_srv_conf = in_addr[i].core_srv_conf;
1650 1656
1657 #if (NGX_HTTP_SSL)
1658 hip->addrs[i].ssl = in_addr[i].ssl;
1659 #endif
1660
1651 if (in_addr[i].hash.buckets == NULL 1661 if (in_addr[i].hash.buckets == NULL
1652 && (in_addr[i].wc_head == NULL 1662 && (in_addr[i].wc_head == NULL
1653 || in_addr[i].wc_head->hash.buckets == NULL) 1663 || in_addr[i].wc_head->hash.buckets == NULL)
1654 && (in_addr[i].wc_head == NULL 1664 && (in_addr[i].wc_head == NULL
1655 || in_addr[i].wc_head->hash.buckets == NULL)) 1665 || in_addr[i].wc_head->hash.buckets == NULL))