comparison src/http/modules/ngx_http_proxy_module.c @ 403:9d81578d04bb NGINX_0_7_11

nginx 0.7.11 *) Change: now ngx_http_charset_module does not work by default with text/css MIME type. *) Feature: now nginx returns the 405 status code for POST method requesting a static file only if the file exists. *) Feature: the "proxy_ssl_session_reuse" directive. *) Bugfix: a "proxy_pass" directive without URI part might use original request after the "X-Accel-Redirect" redirection was used; *) Bugfix: if a directory has search only rights and the first index file was absent, then nginx returned the 500 status code. *) Bugfix: in inclusive locations; the bugs had appeared in 0.7.1.
author Igor Sysoev <http://sysoev.ru>
date Mon, 18 Aug 2008 00:00:00 +0400
parents 34fb3a573548
children 6ebbca3d5ed7
comparison
equal deleted inserted replaced
401:47d42325b5fd 403:9d81578d04bb
357 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, 357 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
358 ngx_conf_set_str_array_slot, 358 ngx_conf_set_str_array_slot,
359 NGX_HTTP_LOC_CONF_OFFSET, 359 NGX_HTTP_LOC_CONF_OFFSET,
360 offsetof(ngx_http_proxy_loc_conf_t, upstream.hide_headers), 360 offsetof(ngx_http_proxy_loc_conf_t, upstream.hide_headers),
361 NULL }, 361 NULL },
362
363 #if (NGX_HTTP_SSL)
364
365 { ngx_string("proxy_ssl_session_reuse"),
366 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
367 ngx_conf_set_flag_slot,
368 NGX_HTTP_LOC_CONF_OFFSET,
369 offsetof(ngx_http_proxy_loc_conf_t, upstream.ssl_session_reuse),
370 NULL },
371
372 #endif
362 373
363 ngx_null_command 374 ngx_null_command
364 }; 375 };
365 376
366 377
1643 1654
1644 conf->upstream.hide_headers = NGX_CONF_UNSET_PTR; 1655 conf->upstream.hide_headers = NGX_CONF_UNSET_PTR;
1645 conf->upstream.pass_headers = NGX_CONF_UNSET_PTR; 1656 conf->upstream.pass_headers = NGX_CONF_UNSET_PTR;
1646 1657
1647 conf->upstream.intercept_errors = NGX_CONF_UNSET; 1658 conf->upstream.intercept_errors = NGX_CONF_UNSET;
1659 #if (NGX_HTTP_SSL)
1660 conf->upstream.ssl_session_reuse = NGX_CONF_UNSET;
1661 #endif
1648 1662
1649 /* "proxy_cyclic_temp_file" is disabled */ 1663 /* "proxy_cyclic_temp_file" is disabled */
1650 conf->upstream.cyclic_temp_file = 0; 1664 conf->upstream.cyclic_temp_file = 0;
1651 1665
1652 conf->redirect = NGX_CONF_UNSET; 1666 conf->redirect = NGX_CONF_UNSET;
1831 ngx_conf_merge_value(conf->upstream.pass_request_body, 1845 ngx_conf_merge_value(conf->upstream.pass_request_body,
1832 prev->upstream.pass_request_body, 1); 1846 prev->upstream.pass_request_body, 1);
1833 1847
1834 ngx_conf_merge_value(conf->upstream.intercept_errors, 1848 ngx_conf_merge_value(conf->upstream.intercept_errors,
1835 prev->upstream.intercept_errors, 0); 1849 prev->upstream.intercept_errors, 0);
1850
1851 #if (NGX_HTTP_SSL)
1852 ngx_conf_merge_value(conf->upstream.ssl_session_reuse,
1853 prev->upstream.ssl_session_reuse, 1);
1854 #endif
1836 1855
1837 ngx_conf_merge_value(conf->redirect, prev->redirect, 1); 1856 ngx_conf_merge_value(conf->redirect, prev->redirect, 1);
1838 1857
1839 if (conf->redirect) { 1858 if (conf->redirect) {
1840 1859