comparison src/http/ngx_http_core_module.c @ 8999:91ad1abfb285 quic

Merged with the default branch.
author Sergey Kandaurov <pluknet@nginx.com>
date Thu, 15 Dec 2022 19:40:44 +0400
parents 6cf8ed15fd00 4cc2bfeff46c
children af5adec171b4
comparison
equal deleted inserted replaced
8991:b87a0dbc1150 8999:91ad1abfb285
3962 { 3962 {
3963 ngx_http_core_srv_conf_t *cscf = conf; 3963 ngx_http_core_srv_conf_t *cscf = conf;
3964 3964
3965 ngx_str_t *value, size; 3965 ngx_str_t *value, size;
3966 ngx_url_t u; 3966 ngx_url_t u;
3967 ngx_uint_t n; 3967 ngx_uint_t n, i;
3968 ngx_http_listen_opt_t lsopt; 3968 ngx_http_listen_opt_t lsopt;
3969 3969
3970 cscf->listen = 1; 3970 cscf->listen = 1;
3971 3971
3972 value = cf->args->elts; 3972 value = cf->args->elts;
4308 return "\"ssl\" parameter is incompatible with \"http3\""; 4308 return "\"ssl\" parameter is incompatible with \"http3\"";
4309 } 4309 }
4310 #endif 4310 #endif
4311 4311
4312 for (n = 0; n < u.naddrs; n++) { 4312 for (n = 0; n < u.naddrs; n++) {
4313
4314 for (i = 0; i < n; i++) {
4315 if (ngx_cmp_sockaddr(u.addrs[n].sockaddr, u.addrs[n].socklen,
4316 u.addrs[i].sockaddr, u.addrs[i].socklen, 0)
4317 == NGX_OK)
4318 {
4319 goto next;
4320 }
4321 }
4322
4313 lsopt.sockaddr = u.addrs[n].sockaddr; 4323 lsopt.sockaddr = u.addrs[n].sockaddr;
4314 lsopt.socklen = u.addrs[n].socklen; 4324 lsopt.socklen = u.addrs[n].socklen;
4315 lsopt.addr_text = u.addrs[n].name; 4325 lsopt.addr_text = u.addrs[n].name;
4316 lsopt.wildcard = ngx_inet_wildcard(lsopt.sockaddr); 4326 lsopt.wildcard = ngx_inet_wildcard(lsopt.sockaddr);
4317 4327
4318 if (ngx_http_add_listen(cf, cscf, &lsopt) != NGX_OK) { 4328 if (ngx_http_add_listen(cf, cscf, &lsopt) != NGX_OK) {
4319 return NGX_CONF_ERROR; 4329 return NGX_CONF_ERROR;
4320 } 4330 }
4331
4332 next:
4333 continue;
4321 } 4334 }
4322 4335
4323 return NGX_CONF_OK; 4336 return NGX_CONF_OK;
4324 } 4337 }
4325 4338