Mercurial > hg > nginx-ranges

comparison src/http/modules/ngx_http_proxy_module.c @ 579:be4f34123024 NGINX_0_8_35

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.8.35 *) Change: now the charset filter runs before the SSI filter. *) Feature: the "chunked_transfer_encoding" directive. *) Bugfix: an "&" character was not escaped when it was copied in arguments part in a rewrite rule. *) Bugfix: nginx might be terminated abnormally while a signal processing or if the directive "timer_resolution" was used on platforms which do not support kqueue or eventport notification methods. Thanks to George Xie and Maxim Dounin. *) Bugfix: if temporary files and permanent storage area resided at different file systems, then permanent file modification times were incorrect. Thanks to Maxim Dounin. *) Bugfix: ngx_http_memcached_module might issue the error message "memcached sent invalid trailer". Thanks to Maxim Dounin. *) Bugfix: nginx could not built zlib-1.2.4 library using the library sources. Thanks to Maxim Dounin. *) Bugfix: a segmentation fault occurred in a worker process, if there was large stderr output before FastCGI response; the bug had appeared in 0.8.34. Thanks to Maxim Dounin.
author Igor Sysoev <http://sysoev.ru>
date Mon, 29 Mar 2010 00:00:00 +0400
parents 2da4537168f8
children 8246d8a2c2be
comparison
equal deleted inserted replaced
577:dd7104f21940 579:be4f34123024
635 u->create_request = ngx_http_proxy_create_request; 635 u->create_request = ngx_http_proxy_create_request;
636 u->reinit_request = ngx_http_proxy_reinit_request; 636 u->reinit_request = ngx_http_proxy_reinit_request;
637 u->process_header = ngx_http_proxy_process_status_line; 637 u->process_header = ngx_http_proxy_process_status_line;
638 u->abort_request = ngx_http_proxy_abort_request; 638 u->abort_request = ngx_http_proxy_abort_request;
639 u->finalize_request = ngx_http_proxy_finalize_request; 639 u->finalize_request = ngx_http_proxy_finalize_request;
640 r->state = 0;
640 641
641 if (plcf->redirects) { 642 if (plcf->redirects) {
642 u->rewrite_redirect = ngx_http_proxy_rewrite_redirect; 643 u->rewrite_redirect = ngx_http_proxy_rewrite_redirect;
643 } 644 }
644 645
1196 ctx->status_count = 0; 1197 ctx->status_count = 0;
1197 ctx->status_start = NULL; 1198 ctx->status_start = NULL;
1198 ctx->status_end = NULL; 1199 ctx->status_end = NULL;
1199 1200
1200 r->upstream->process_header = ngx_http_proxy_process_status_line; 1201 r->upstream->process_header = ngx_http_proxy_process_status_line;
1202 r->state = 0;
1201 1203
1202 return NGX_OK; 1204 return NGX_OK;
1203 } 1205 }
1204 1206
1205 1207
1911 * conf->headers_set = NULL; 1913 * conf->headers_set = NULL;
1912 * conf->headers_set_hash = NULL; 1914 * conf->headers_set_hash = NULL;
1913 * conf->body_set_len = NULL; 1915 * conf->body_set_len = NULL;
1914 * conf->body_set = NULL; 1916 * conf->body_set = NULL;
1915 * conf->body_source = { 0, NULL }; 1917 * conf->body_source = { 0, NULL };
1916 * conf->rewrite_locations = NULL; 1918 * conf->redirects = NULL;
1917 */ 1919 */
1918 1920
1919 conf->upstream.store = NGX_CONF_UNSET; 1921 conf->upstream.store = NGX_CONF_UNSET;
1920 conf->upstream.store_access = NGX_CONF_UNSET_UINT; 1922 conf->upstream.store_access = NGX_CONF_UNSET_UINT;
1921 conf->upstream.buffering = NGX_CONF_UNSET; 1923 conf->upstream.buffering = NGX_CONF_UNSET;
2752 if (pr == NULL) { 2754 if (pr == NULL) {
2753 return NGX_CONF_ERROR; 2755 return NGX_CONF_ERROR;
2754 } 2756 }
2755 2757
2756 if (ngx_strcmp(value[1].data, "default") == 0) { 2758 if (ngx_strcmp(value[1].data, "default") == 0) {
2759 if (plcf->proxy_lengths) {
2760 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
2761 "\"proxy_redirect default\" may not be used "
2762 "with \"proxy_pass\" directive with variables");
2763 return NGX_CONF_ERROR;
2764 }
2765
2757 if (plcf->url.data == NULL) { 2766 if (plcf->url.data == NULL) {
2758 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 2767 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
2759 "\"proxy_rewrite_location default\" must go " 2768 "\"proxy_redirect default\" must go "
2760 "after the \"proxy_pass\" directive"); 2769 "after the \"proxy_pass\" directive");
2761 return NGX_CONF_ERROR; 2770 return NGX_CONF_ERROR;
2762 } 2771 }
2763 2772
2764 pr->handler = ngx_http_proxy_rewrite_redirect_text; 2773 pr->handler = ngx_http_proxy_rewrite_redirect_text;