mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-07-31 18:46:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

always test proxy_redirect with slash, this fixes a case when nginx uses

Browse Source 
proxy_pass "http://www", upstream redirects to "http://www.host/uri",
and nginx rewrites it as ".host/uri"
patch by Maxim Dounin
This commit is contained in:
Igor Sysoev 2011-02-17 11:54:35 +00:00
parent 4d6db4a7ab
commit b2492255f8
1 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/http/modules/ngx_http_proxy_module.c
View File

@ -1717,6 +1717,7 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_http_proxy_loc_conf_t *prev = parent; ngx_http_proxy_loc_conf_t *prev = parent;
ngx_http_proxy_loc_conf_t *conf = child; ngx_http_proxy_loc_conf_t *conf = child;
u_char *p;
size_t size; size_t size;
ngx_keyval_t *s; ngx_keyval_t *s;
ngx_hash_init_t hash; ngx_hash_init_t hash;
@ -1975,13 +1976,25 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
} }
pr->handler = ngx_http_proxy_rewrite_redirect_text; pr->handler = ngx_http_proxy_rewrite_redirect_text;
pr->redirect = conf->url;
if (conf->vars.uri.len) { if (conf->vars.uri.len) {
pr->redirect = conf->url;
pr->replacement.text = conf->location; pr->replacement.text = conf->location;
} else { } else {
ngx_str_null(&pr->replacement.text); pr->redirect.len = conf->url.len + sizeof("/") - 1;
p = ngx_pnalloc(cf->pool, pr->redirect.len);
if (p == NULL) {
return NGX_CONF_ERROR;
}
pr->redirect.data = p;
p = ngx_cpymem(p, conf->url.data, conf->url.len);
*p = '/';
ngx_str_set(&pr->replacement.text, "/");
} }
} }
} }
@ -2456,6 +2469,7 @@ ngx_http_proxy_redirect(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
{ {
ngx_http_proxy_loc_conf_t *plcf = conf; ngx_http_proxy_loc_conf_t *plcf = conf;
u_char *p;
ngx_str_t *value; ngx_str_t *value;
ngx_array_t *vars_lengths, *vars_values; ngx_array_t *vars_lengths, *vars_values;
ngx_http_script_compile_t sc; ngx_http_script_compile_t sc;
@ -2518,13 +2532,25 @@ ngx_http_proxy_redirect(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
} }
pr->handler = ngx_http_proxy_rewrite_redirect_text; pr->handler = ngx_http_proxy_rewrite_redirect_text;
pr->redirect = plcf->url;
if (plcf->vars.uri.len) { if (plcf->vars.uri.len) {
pr->redirect = plcf->url;
pr->replacement.text = plcf->location; pr->replacement.text = plcf->location;
} else { } else {
ngx_str_null(&pr->replacement.text); pr->redirect.len = plcf->url.len + sizeof("/") - 1;
p = ngx_pnalloc(cf->pool, pr->redirect.len);
if (p == NULL) {
return NGX_CONF_ERROR;
}
pr->redirect.data = p;
p = ngx_cpymem(p, plcf->url.data, plcf->url.len);
*p = '/';
ngx_str_set(&pr->replacement.text, "/");
} }
return NGX_CONF_OK; return NGX_CONF_OK;