Mercurial > hg > nginx
comparison src/http/ngx_http_core_module.c @ 4787:7d0c7bf2874d stable-1.2
Merge of r4737: r->uri_changed in a named location fix.
Reset r->uri_changed in a named location (ticket #184).
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 06 Aug 2012 15:20:03 +0000 |
parents | 5a4666d4b6cb |
children | 92a620dd8036 |
comparison
equal
deleted
inserted
replaced
4786:9fda024be573 | 4787:7d0c7bf2874d |
---|---|
2586 "using location: %V \"%V?%V\"", | 2586 "using location: %V \"%V?%V\"", |
2587 name, &r->uri, &r->args); | 2587 name, &r->uri, &r->args); |
2588 | 2588 |
2589 r->internal = 1; | 2589 r->internal = 1; |
2590 r->content_handler = NULL; | 2590 r->content_handler = NULL; |
2591 r->uri_changed = 0; | |
2591 r->loc_conf = (*clcfp)->loc_conf; | 2592 r->loc_conf = (*clcfp)->loc_conf; |
2592 | 2593 |
2593 /* clear the modules contexts */ | 2594 /* clear the modules contexts */ |
2594 ngx_memzero(r->ctx, sizeof(void *) * ngx_http_max_module); | 2595 ngx_memzero(r->ctx, sizeof(void *) * ngx_http_max_module); |
2595 | 2596 |