Mercurial > hg > nginx-vendor-current

comparison src/http/ngx_http_upstream.c @ 572:ff463db0be31 NGINX_0_8_38

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.8.38 *) Feature: the "proxy_no_cache" and "fastcgi_no_cache" directives. *) Feature: now the "rewrite" directive does a redirect automatically if the $scheme variable is used. Thanks to Piotr Sikora. *) Bugfix: now "limit_req" delay directive conforms to the described algorithm. Thanks to Maxim Dounin. *) Bugfix: the $uid_got variable might not be used in the SSI and perl modules.
author Igor Sysoev <http://sysoev.ru>
date Mon, 24 May 2010 00:00:00 +0400
parents 8246d8a2c2be
children 016632f0fb18
comparison
equal deleted inserted replaced
571:5b59e716792b 572:ff463db0be31
619 619
620 c = r->cache; 620 c = r->cache;
621 621
622 if (c == NULL) { 622 if (c == NULL) {
623 623
624 if (u->conf->no_cache) {
625 rc = ngx_http_cache(r, u->conf->no_cache);
626 if (rc != NGX_OK) {
627 return rc;
628 }
629 }
630
624 if (!(r->method & u->conf->cache_methods)) { 631 if (!(r->method & u->conf->cache_methods)) {
625 return NGX_DECLINED; 632 return NGX_DECLINED;
626 } 633 }
627 634
628 if (r->method & NGX_HTTP_HEAD) { 635 if (r->method & NGX_HTTP_HEAD) {
1806 if (ngx_http_parse_unsafe_uri(r, uri, &args, &flags) != NGX_OK) { 1813 if (ngx_http_parse_unsafe_uri(r, uri, &args, &flags) != NGX_OK) {
1807 ngx_http_finalize_request(r, NGX_HTTP_NOT_FOUND); 1814 ngx_http_finalize_request(r, NGX_HTTP_NOT_FOUND);
1808 return NGX_DONE; 1815 return NGX_DONE;
1809 } 1816 }
1810 1817
1811 if (flags & NGX_HTTP_ZERO_IN_URI) {
1812 r->zero_in_uri = 1;
1813 }
1814
1815 if (r->method != NGX_HTTP_HEAD) { 1818 if (r->method != NGX_HTTP_HEAD) {
1816 r->method = NGX_HTTP_GET; 1819 r->method = NGX_HTTP_GET;
1817 } 1820 }
1818 1821
1819 r->valid_unparsed_uri = 0; 1822 r->valid_unparsed_uri = 0;