Mercurial > hg > nginx-vendor-1-0
comparison src/http/modules/ngx_http_proxy_module.c @ 318:fc223117327f NGINX_0_6_3
nginx 0.6.3
*) Feature: the "proxy_store" and "fastcgi_store" directives.
*) Bugfix: a segmentation fault might occur in worker process if the
"auth_http_header" directive was used.
Thanks to Maxim Dounin.
*) Bugfix: a segmentation fault occurred in worker process if the
CRAM-MD5 authentication method was used, but it was not enabled.
*) Bugfix: a segmentation fault might occur in worker process when the
HTTPS protocol was used in the "proxy_pass" directive.
*) Bugfix: a segmentation fault might occur in worker process if the
eventport method was used.
*) Bugfix: the "proxy_ignore_client_abort" and
"fastcgi_ignore_client_abort" directives did not work; bug appeared
in 0.5.13.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Thu, 12 Jul 2007 00:00:00 +0400 |
parents | 95d92ec39071 |
children | 95183808f549 |
comparison
equal
deleted
inserted
replaced
317:fcdf0e42c859 | 318:fc223117327f |
---|---|
150 { ngx_string("proxy_redirect"), | 150 { ngx_string("proxy_redirect"), |
151 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE12, | 151 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE12, |
152 ngx_http_proxy_redirect, | 152 ngx_http_proxy_redirect, |
153 NGX_HTTP_LOC_CONF_OFFSET, | 153 NGX_HTTP_LOC_CONF_OFFSET, |
154 0, | 154 0, |
155 NULL }, | |
156 | |
157 { ngx_string("proxy_store"), | |
158 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE123, | |
159 ngx_conf_set_access_slot, | |
160 NGX_HTTP_LOC_CONF_OFFSET, | |
161 offsetof(ngx_http_proxy_loc_conf_t, upstream.store), | |
155 NULL }, | 162 NULL }, |
156 | 163 |
157 { ngx_string("proxy_buffering"), | 164 { ngx_string("proxy_buffering"), |
158 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, | 165 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, |
159 ngx_conf_set_flag_slot, | 166 ngx_conf_set_flag_slot, |
1500 * conf->body_set = NULL; | 1507 * conf->body_set = NULL; |
1501 * conf->body_source = { 0, NULL }; | 1508 * conf->body_source = { 0, NULL }; |
1502 * conf->rewrite_locations = NULL; | 1509 * conf->rewrite_locations = NULL; |
1503 */ | 1510 */ |
1504 | 1511 |
1512 conf->upstream.store = NGX_CONF_UNSET_UINT; | |
1505 conf->upstream.buffering = NGX_CONF_UNSET; | 1513 conf->upstream.buffering = NGX_CONF_UNSET; |
1506 conf->upstream.ignore_client_abort = NGX_CONF_UNSET; | 1514 conf->upstream.ignore_client_abort = NGX_CONF_UNSET; |
1507 | 1515 |
1508 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; | 1516 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; |
1509 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; | 1517 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; |
1551 ngx_hash_init_t hash; | 1559 ngx_hash_init_t hash; |
1552 ngx_http_proxy_redirect_t *pr; | 1560 ngx_http_proxy_redirect_t *pr; |
1553 ngx_http_script_compile_t sc; | 1561 ngx_http_script_compile_t sc; |
1554 ngx_http_script_copy_code_t *copy; | 1562 ngx_http_script_copy_code_t *copy; |
1555 | 1563 |
1564 ngx_conf_merge_uint_value(conf->upstream.store, | |
1565 prev->upstream.store, 0); | |
1566 | |
1556 ngx_conf_merge_value(conf->upstream.buffering, | 1567 ngx_conf_merge_value(conf->upstream.buffering, |
1557 prev->upstream.buffering, 1); | 1568 prev->upstream.buffering, 1); |
1558 | 1569 |
1559 ngx_conf_merge_value(conf->upstream.ignore_client_abort, | 1570 ngx_conf_merge_value(conf->upstream.ignore_client_abort, |
1560 prev->upstream.ignore_client_abort, 0); | 1571 prev->upstream.ignore_client_abort, 0); |