diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2008-05-26 09:32:48 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2008-05-26 09:32:48 +0000 |
| commit | 97647a9b9023a209f1c33a092722ddcc100dfc1a (patch) | |
| tree | 97b01690fdeba47c65deb1cb541b691c83e92f6d /src/http/modules/ngx_http_proxy_module.c | |
| parent | 013f90472501bd911bd82c90e6aa1879d3d4c4fe (diff) | |
| download | nginx-0.7.1.tar.gz | |
Changes with nginx 0.7.1 26 May 2008v0.7.1
*) Change: now locations are searched in a tree.
*) Change: the "optimize_server_names" directive was canceled due to
the "server_name_in_redirect" directive introduction.
*) Change: some long deprecated directives are not supported anymore.
*) Change: the "none" parameter in the "ssl_session_cache" directive;
now this is default parameter.
Thanks to Rob Mueller.
*) Bugfix: worker processes might not catch reconfiguration and log
rotation signals.
*) Bugfix: nginx could not be built on latest Fedora 9 Linux.
Thanks to Roxis.
Diffstat (limited to 'src/http/modules/ngx_http_proxy_module.c')
| -rw-r--r-- | src/http/modules/ngx_http_proxy_module.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c index c559d3165..619390b96 100644 --- a/src/http/modules/ngx_http_proxy_module.c +++ b/src/http/modules/ngx_http_proxy_module.c @@ -142,14 +142,6 @@ static ngx_int_t ngx_http_proxy_set_vars(ngx_pool_t *pool, ngx_url_t *u, static ngx_conf_post_t ngx_http_proxy_lowat_post = { ngx_http_proxy_lowat_check }; -static ngx_conf_deprecated_t ngx_conf_deprecated_proxy_header_buffer_size = { - ngx_conf_deprecated, "proxy_header_buffer_size", "proxy_buffer_size" -}; - -static ngx_conf_deprecated_t ngx_conf_deprecated_proxy_redirect_errors = { - ngx_conf_deprecated, "proxy_redirect_errors", "proxy_intercept_errors" -}; - static ngx_conf_bitmask_t ngx_http_proxy_next_upstream_masks[] = { { ngx_string("error"), NGX_HTTP_UPSTREAM_FT_ERROR }, @@ -235,13 +227,6 @@ static ngx_command_t ngx_http_proxy_commands[] = { offsetof(ngx_http_proxy_loc_conf_t, upstream.intercept_errors), NULL }, - { ngx_string("proxy_redirect_errors"), - NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, - ngx_conf_set_flag_slot, - NGX_HTTP_LOC_CONF_OFFSET, - offsetof(ngx_http_proxy_loc_conf_t, upstream.intercept_errors), - &ngx_conf_deprecated_proxy_redirect_errors }, - { ngx_string("proxy_set_header"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE2, ngx_conf_set_keyval_slot, @@ -298,13 +283,6 @@ static ngx_command_t ngx_http_proxy_commands[] = { offsetof(ngx_http_proxy_loc_conf_t, upstream.buffer_size), NULL }, - { ngx_string("proxy_header_buffer_size"), - NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, - ngx_conf_set_size_slot, - NGX_HTTP_LOC_CONF_OFFSET, - offsetof(ngx_http_proxy_loc_conf_t, upstream.buffer_size), - &ngx_conf_deprecated_proxy_header_buffer_size }, - { ngx_string("proxy_read_timeout"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, ngx_conf_set_msec_slot, @@ -1224,7 +1202,7 @@ ngx_http_proxy_process_header(ngx_http_request_t *r) umcf = ngx_http_get_module_main_conf(r, ngx_http_upstream_module); - for ( ;; ) { + for ( ;; ) { rc = ngx_http_parse_header_line(r, &r->upstream->buffer); |
