Mercurial > hg > nginx
comparison src/http/modules/ngx_http_scgi_module.c @ 5937:5b9f711dc819
Upstream: inheritance of proxy_pass and friends (ticket #645).
Instead of independant inheritance of conf->upstream.upstream (proxy_pass
without variables) and conf->proxy_lengths (proxy_pass with variables)
we now test them both and inherit only if neither is set. Additionally,
SSL context is also inherited only in this case now.
Based on the patch by Alexey Radkov.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Tue, 09 Dec 2014 18:21:55 +0300 |
| parents | 8d0cf26ce071 |
| children | cd2abf7e7740 |
comparison
equal
deleted
inserted
replaced
| 5936:2d3908516101 | 5937:5b9f711dc819 |
|---|---|
| 1441 != NGX_OK) | 1441 != NGX_OK) |
| 1442 { | 1442 { |
| 1443 return NGX_CONF_ERROR; | 1443 return NGX_CONF_ERROR; |
| 1444 } | 1444 } |
| 1445 | 1445 |
| 1446 if (conf->upstream.upstream == NULL) { | 1446 if (conf->upstream.upstream == NULL && conf->scgi_lengths == NULL) { |
| 1447 conf->upstream.upstream = prev->upstream.upstream; | 1447 conf->upstream.upstream = prev->upstream.upstream; |
| 1448 } | |
| 1449 | |
| 1450 if (conf->scgi_lengths == NULL) { | |
| 1451 conf->scgi_lengths = prev->scgi_lengths; | 1448 conf->scgi_lengths = prev->scgi_lengths; |
| 1452 conf->scgi_values = prev->scgi_values; | 1449 conf->scgi_values = prev->scgi_values; |
| 1453 } | 1450 } |
| 1454 | 1451 |
| 1455 if (conf->upstream.upstream || conf->scgi_lengths) { | 1452 if (conf->upstream.upstream || conf->scgi_lengths) { |