Mercurial > hg > nginx
comparison src/http/modules/ngx_http_fastcgi_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 |
|---|---|
| 2695 != NGX_OK) | 2695 != NGX_OK) |
| 2696 { | 2696 { |
| 2697 return NGX_CONF_ERROR; | 2697 return NGX_CONF_ERROR; |
| 2698 } | 2698 } |
| 2699 | 2699 |
| 2700 if (conf->upstream.upstream == NULL) { | 2700 if (conf->upstream.upstream == NULL && conf->fastcgi_lengths == NULL) { |
| 2701 conf->upstream.upstream = prev->upstream.upstream; | 2701 conf->upstream.upstream = prev->upstream.upstream; |
| 2702 } | |
| 2703 | |
| 2704 if (conf->fastcgi_lengths == NULL) { | |
| 2705 conf->fastcgi_lengths = prev->fastcgi_lengths; | 2702 conf->fastcgi_lengths = prev->fastcgi_lengths; |
| 2706 conf->fastcgi_values = prev->fastcgi_values; | 2703 conf->fastcgi_values = prev->fastcgi_values; |
| 2707 } | 2704 } |
| 2708 | 2705 |
| 2709 if (conf->upstream.upstream || conf->fastcgi_lengths) { | 2706 if (conf->upstream.upstream || conf->fastcgi_lengths) { |