comparison src/http/modules/ngx_http_proxy_module.c @ 644:ad25218fd14b NGINX_1_0_12

nginx 1.0.12 *) Feature: the "TLSv1.1" and "TLSv1.2" parameters of the "ssl_protocols" directive. *) Feature: the "if" SSI command supports captures in regular expressions. *) Bugfix: the "if" SSI command did not work inside the "block" command. *) Bugfix: in AIO error handling on FreeBSD. *) Bugfix: in the OpenSSL library initialization. *) Bugfix: the "worker_cpu_affinity" directive might not work. *) Bugfix: the "limit_conn_log_level" and "limit_req_log_level" directives might not work. *) Bugfix: the "read_ahead" directive might not work combined with "try_files" and "open_file_cache". *) Bugfix: the "proxy_cache_use_stale" directive with "error" parameter did not return answer from cache if there were no live upstreams. *) Bugfix: a segmentation fault might occur in a worker process if small time was used in the "inactive" parameter of the "proxy_cache_path" directive. *) Bugfix: responses from cache might hang. *) Bugfix: in error handling while connecting to a backend. Thanks to Piotr Sikora. *) Bugfix: in the "epoll" event method. Thanks to Yichun Zhang. *) Bugfix: the $sent_http_cache_control variable might contain a wrong value if the "expires" directive was used. Thanks to Yichun Zhang. *) 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: nginx could not be built on Solaris; the bug had appeared in 1.0.11. *) Bugfix: in the ngx_http_scgi_module. *) Bugfix: in the ngx_http_mp4_module.
author Igor Sysoev <http://sysoev.ru>
date Mon, 06 Feb 2012 00:00:00 +0400
parents 1b80544421e8
children 09a689c5e494
comparison
equal deleted inserted replaced
643:d81e1c257a02 644:ad25218fd14b
1 1
2 /* 2 /*
3 * Copyright (C) Igor Sysoev 3 * Copyright (C) Igor Sysoev
4 * Copyright (C) Nginx, Inc.
4 */ 5 */
5 6
6 7
7 #include <ngx_config.h> 8 #include <ngx_config.h>
8 #include <ngx_core.h> 9 #include <ngx_core.h>
1901 ngx_conf_merge_bitmask_value(conf->upstream.cache_use_stale, 1902 ngx_conf_merge_bitmask_value(conf->upstream.cache_use_stale,
1902 prev->upstream.cache_use_stale, 1903 prev->upstream.cache_use_stale,
1903 (NGX_CONF_BITMASK_SET 1904 (NGX_CONF_BITMASK_SET
1904 |NGX_HTTP_UPSTREAM_FT_OFF)); 1905 |NGX_HTTP_UPSTREAM_FT_OFF));
1905 1906
1906 if (conf->upstream.cache_methods == 0) {
1907 conf->upstream.cache_methods = prev->upstream.cache_methods;
1908 }
1909
1910 conf->upstream.cache_methods |= NGX_HTTP_GET|NGX_HTTP_HEAD;
1911
1912 if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_OFF) { 1907 if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_OFF) {
1913 conf->upstream.cache_use_stale = NGX_CONF_BITMASK_SET 1908 conf->upstream.cache_use_stale = NGX_CONF_BITMASK_SET
1914 |NGX_HTTP_UPSTREAM_FT_OFF; 1909 |NGX_HTTP_UPSTREAM_FT_OFF;
1915 } 1910 }
1911
1912 if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_ERROR) {
1913 conf->upstream.cache_use_stale |= NGX_HTTP_UPSTREAM_FT_NOLIVE;
1914 }
1915
1916 if (conf->upstream.cache_methods == 0) {
1917 conf->upstream.cache_methods = prev->upstream.cache_methods;
1918 }
1919
1920 conf->upstream.cache_methods |= NGX_HTTP_GET|NGX_HTTP_HEAD;
1916 1921
1917 ngx_conf_merge_ptr_value(conf->upstream.cache_bypass, 1922 ngx_conf_merge_ptr_value(conf->upstream.cache_bypass,
1918 prev->upstream.cache_bypass, NULL); 1923 prev->upstream.cache_bypass, NULL);
1919 1924
1920 ngx_conf_merge_ptr_value(conf->upstream.no_cache, 1925 ngx_conf_merge_ptr_value(conf->upstream.no_cache,
2764 } 2769 }
2765 2770
2766 plcf->upstream.ssl->log = cf->log; 2771 plcf->upstream.ssl->log = cf->log;
2767 2772
2768 if (ngx_ssl_create(plcf->upstream.ssl, 2773 if (ngx_ssl_create(plcf->upstream.ssl,
2769 NGX_SSL_SSLv2|NGX_SSL_SSLv3|NGX_SSL_TLSv1, NULL) 2774 NGX_SSL_SSLv2|NGX_SSL_SSLv3|NGX_SSL_TLSv1
2775 |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2,
2776 NULL)
2770 != NGX_OK) 2777 != NGX_OK)
2771 { 2778 {
2772 return NGX_ERROR; 2779 return NGX_ERROR;
2773 } 2780 }
2774 2781