Mercurial > hg > nginx

comparison src/http/ngx_http_core_module.c @ 3114:1c4fcfe57af1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix request counter for rewrite or internal redirection cycle, the bug was introduced in r3050
author Igor Sysoev <igor@sysoev.ru>
date Thu, 10 Sep 2009 16:34:09 +0000
parents 680cab09818d
children 3e994ac670dc
comparison
equal deleted inserted replaced
3113:e1e290965ed1 3114:1c4fcfe57af1
992 if (r->uri_changes == 0) { 992 if (r->uri_changes == 0) {
993 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, 993 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
994 "rewrite or internal redirection cycle " 994 "rewrite or internal redirection cycle "
995 "while processing \"%V\"", &r->uri); 995 "while processing \"%V\"", &r->uri);
996 996
997 r->main->count++;
997 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); 998 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
998 return NGX_OK; 999 return NGX_OK;
999 } 1000 }
1000 1001
1001 r->phase_handler = ph->next; 1002 r->phase_handler = ph->next;
2170 if (r->uri_changes == 0) { 2171 if (r->uri_changes == 0) {
2171 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, 2172 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
2172 "rewrite or internal redirection cycle " 2173 "rewrite or internal redirection cycle "
2173 "while internal redirect to \"%V\"", uri); 2174 "while internal redirect to \"%V\"", uri);
2174 2175
2176 r->main->count++;
2175 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); 2177 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
2176 return NGX_DONE; 2178 return NGX_DONE;
2177 } 2179 }
2178 2180
2179 r->uri = *uri; 2181 r->uri = *uri;