| commit | 18f34cfbc01e7eb5450d18d5e106b11d40373ed4 | [log] [tgz] |
|---|---|---|
| author | Maxim Dounin <mdounin@mdounin.ru> | Tue Dec 09 18:21:55 2014 +0300 |
| committer | Maxim Dounin <mdounin@mdounin.ru> | Tue Dec 09 18:21:55 2014 +0300 |
| tree | a93d708bb96b5183047dabcb367a0deeada2a631 | |
| parent | 4a32f819afb7b7ca81dc0cfba4555a83d169de85 [diff] |
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.