Mercurial > hg > nginx-quic
comparison src/http/ngx_http_upstream.c @ 1504:840b81d13a2f stable-0.5
r1340, r1341 merge:
fix case when two directives
proxy_pass http://backend;
proxy_pass https://backend;
both use one port - 80 or 443, that was defined first.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Sat, 22 Sep 2007 18:44:30 +0000 |
parents | d59617e7e6a1 |
children | d450e57ea5a4 |
comparison
equal
deleted
inserted
replaced
1503:fa67e7914b70 | 1504:840b81d13a2f |
---|---|
3207 | 3207 |
3208 if (uscfp[i]->port != u->port) { | 3208 if (uscfp[i]->port != u->port) { |
3209 continue; | 3209 continue; |
3210 } | 3210 } |
3211 | 3211 |
3212 if (uscfp[i]->default_port && u->default_port | |
3213 && uscfp[i]->default_port != u->default_port) | |
3214 { | |
3215 continue; | |
3216 } | |
3217 | |
3212 return uscfp[i]; | 3218 return uscfp[i]; |
3213 } | 3219 } |
3214 | 3220 |
3215 uscf = ngx_pcalloc(cf->pool, sizeof(ngx_http_upstream_srv_conf_t)); | 3221 uscf = ngx_pcalloc(cf->pool, sizeof(ngx_http_upstream_srv_conf_t)); |
3216 if (uscf == NULL) { | 3222 if (uscf == NULL) { |