Mercurial > hg > nginx-vendor-current
comparison src/http/ngx_http_upstream.c @ 656:9d21dad0b5a1 NGINX_1_1_12
nginx 1.1.12
*) Change: a "proxy_pass" directive without URI part now uses changed
URI after redirection with the "error_page" directive;
Thanks to Lanshun Zhou.
*) Feature: the "proxy/fastcgi/scgi/uwsgi_cache_lock",
"proxy/fastcgi/scgi/uwsgi_cache_lock_timeout" directives.
*) Feature: the "pcre_jit" directive.
*) Feature: the "if" SSI command supports captures in regular
expressions.
*) Bugfix: the "if" SSI command did not work inside the "block" command.
*) Bugfix: the "limit_conn_log_level" and "limit_req_log_level"
directives might not work.
*) Bugfix: the "limit_rate" directive did not allow to use full
throughput, even if limit value was very high.
*) Bugfix: the "sendfile_max_chunk" directive did not work, if the
"limit_rate" directive was used.
*) Bugfix: a "proxy_pass" directive without URI part always used
original request URI if variables were used.
*) Bugfix: a "proxy_pass" directive without URI part might use original
request after redirection with the "try_files" directive;
Thanks to Lanshun Zhou.
*) Bugfix: in the ngx_http_scgi_module.
*) Bugfix: in the ngx_http_mp4_module.
*) Bugfix: nginx could not be built on Solaris; the bug had appeared in
1.1.9.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 26 Dec 2011 00:00:00 +0400 |
parents | 753f505670e0 |
children | d0f7a625f27c |
comparison
equal
deleted
inserted
replaced
655:189afff6503f | 656:9d21dad0b5a1 |
---|---|
705 | 705 |
706 c->min_uses = u->conf->cache_min_uses; | 706 c->min_uses = u->conf->cache_min_uses; |
707 c->body_start = u->conf->buffer_size; | 707 c->body_start = u->conf->buffer_size; |
708 c->file_cache = u->conf->cache->data; | 708 c->file_cache = u->conf->cache->data; |
709 | 709 |
710 c->lock = u->conf->cache_lock; | |
711 c->lock_timeout = u->conf->cache_lock_timeout; | |
712 | |
710 u->cache_status = NGX_HTTP_CACHE_MISS; | 713 u->cache_status = NGX_HTTP_CACHE_MISS; |
711 } | 714 } |
712 | 715 |
713 rc = ngx_http_file_cache_open(r); | 716 rc = ngx_http_file_cache_open(r); |
714 | 717 |
1893 | 1896 |
1894 if (r->method != NGX_HTTP_HEAD) { | 1897 if (r->method != NGX_HTTP_HEAD) { |
1895 r->method = NGX_HTTP_GET; | 1898 r->method = NGX_HTTP_GET; |
1896 } | 1899 } |
1897 | 1900 |
1898 r->valid_unparsed_uri = 0; | |
1899 | |
1900 ngx_http_internal_redirect(r, uri, &args); | 1901 ngx_http_internal_redirect(r, uri, &args); |
1901 ngx_http_finalize_request(r, NGX_DONE); | 1902 ngx_http_finalize_request(r, NGX_DONE); |
1902 return NGX_DONE; | 1903 return NGX_DONE; |
1903 } | 1904 } |
1904 | 1905 |