Mercurial > hg > nginx

comparison src/http/ngx_http_upstream.c @ 3598:8152369f7037 stable-0.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge r3528: remove r->zero_in_uri
author Igor Sysoev <igor@sysoev.ru>
date Mon, 07 Jun 2010 12:27:06 +0000
parents 0d8b8c84bab7
children 7c1c25082865
comparison
equal deleted inserted replaced
3597:0d8b8c84bab7 3598:8152369f7037
1778 if (ngx_http_parse_unsafe_uri(r, uri, &args, &flags) != NGX_OK) { 1778 if (ngx_http_parse_unsafe_uri(r, uri, &args, &flags) != NGX_OK) {
1779 ngx_http_finalize_request(r, NGX_HTTP_NOT_FOUND); 1779 ngx_http_finalize_request(r, NGX_HTTP_NOT_FOUND);
1780 return NGX_DONE; 1780 return NGX_DONE;
1781 } 1781 }
1782 1782
1783 if (flags & NGX_HTTP_ZERO_IN_URI) {
1784 r->zero_in_uri = 1;
1785 }
1786
1787 if (r->method != NGX_HTTP_HEAD) { 1783 if (r->method != NGX_HTTP_HEAD) {
1788 r->method = NGX_HTTP_GET; 1784 r->method = NGX_HTTP_GET;
1789 } 1785 }
1790 1786
1791 r->valid_unparsed_uri = 0; 1787 r->valid_unparsed_uri = 0;