diff options
| author | Valentin Bartenev <vbart@nginx.com> | 2012-01-30 11:22:56 +0000 |
|---|---|---|
| committer | Valentin Bartenev <vbart@nginx.com> | 2012-01-30 11:22:56 +0000 |
| commit | 3feafa765f5c065ec2921ef92c4c32c2dea4736c (patch) | |
| tree | 6b5c5e81fc6f2be4a5ddd47796cf275752d8f829 /src | |
| parent | 4a23bc57051187362094c1f41793901805ac55c2 (diff) | |
| download | nginx-3feafa765f5c065ec2921ef92c4c32c2dea4736c.tar.gz nginx-3feafa765f5c065ec2921ef92c4c32c2dea4736c.zip | |
Fixed proxy_redirect off inheritance.
Example configuration to reproduce:
server {
proxy_redirect off;
location / {
proxy_pass http://localhost:8000;
proxy_redirect http://localhost:8000/ /;
location ~ \.php$ {
proxy_pass http://localhost:8000;
# proxy_redirect must be inherited from the level above,
# but instead it was switched off here
}
}
}
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/modules/ngx_http_proxy_module.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c index 009f9c4f2..fb86f0106 100644 --- a/src/http/modules/ngx_http_proxy_module.c +++ b/src/http/modules/ngx_http_proxy_module.c @@ -3292,6 +3292,8 @@ ngx_http_proxy_redirect(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) return NGX_CONF_OK; } + plcf->redirect = 1; + value = cf->args->elts; if (cf->args->nelts == 2) { |