comparison src/http/ngx_http_copy_filter_module.c @ 509:9b8c906f6e63 release-0.1.29

nginx-0.1.29-RELEASE import *) Feature: the ngx_http_ssi_module supports "include virtual" command. *) Feature: the ngx_http_ssi_module supports the condition command like 'if expr="$NAME"' and "else" and "endif" commands. Only one nested level is supported. *) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and DATE_GMT variables and "config timefmt" command. *) Feature: the "ssi_ignore_recycled_buffers" directive. *) Bugfix: the "echo" command did not show the default value for the empty QUERY_STRING variable. *) Change: the ngx_http_proxy_module was rewritten. *) Feature: the "proxy_redirect", "proxy_pass_request_headers", "proxy_pass_request_body", and "proxy_method" directives. *) Feature: the "proxy_set_header" directive. The "proxy_x_var" was canceled and must be replaced with the proxy_set_header directive. *) Change: the "proxy_preserve_host" is canceled and must be replaced with the "proxy_set_header Host $host" and the "proxy_redirect off" directives, the "proxy_set_header Host $host:$proxy_port" directive and the appropriate proxy_redirect directives. *) Change: the "proxy_set_x_real_ip" is canceled and must be replaced with the "proxy_set_header X-Real-IP $remote_addr" directive. *) Change: the "proxy_add_x_forwarded_for" is canceled and must be replaced with the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for" directive. *) Change: the "proxy_set_x_url" is canceled and must be replaced with the "proxy_set_header X-URL http://$host:$server_port$request_uri" directive. *) Feature: the "fastcgi_param" directive. *) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params" directive are canceled and must be replaced with the fastcgi_param directives. *) Feature: the "index" directive can use the variables. *) Feature: the "index" directive can be used at http and server levels. *) Change: the last index only in the "index" directive can be absolute. *) Feature: the "rewrite" directive can use the variables. *) Feature: the "internal" directive. *) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR, SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME, REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables. *) Change: nginx now passes the invalid lines in a client request headers or a backend response header. *) Bugfix: if the backend did not transfer response for a long time and the "send_timeout" was less than "proxy_read_timeout", then nginx returned the 408 response. *) Bugfix: the segmentation fault was occurred if the backend sent an invalid line in response header; the bug had appeared in 0.1.26. *) Bugfix: the segmentation fault may occurred in FastCGI fault tolerance configuration. *) Bugfix: the "expires" directive did not remove the previous "Expires" and "Cache-Control" headers. *) Bugfix: nginx did not take into account trailing dot in "Host" header line. *) Bugfix: the ngx_http_auth_module did not work under Linux. *) Bugfix: the rewrite directive worked incorrectly, if the arguments were in a request. *) Bugfix: nginx could not be built on MacOS X.
author Igor Sysoev <igor@sysoev.ru>
date Thu, 12 May 2005 14:58:06 +0000
parents d4ea69372b94
children fbbf16224844
comparison
equal deleted inserted replaced
508:ca1020ce99ba 509:9b8c906f6e63
32 ngx_null_command 32 ngx_null_command
33 }; 33 };
34 34
35 35
36 static ngx_http_module_t ngx_http_copy_filter_module_ctx = { 36 static ngx_http_module_t ngx_http_copy_filter_module_ctx = {
37 NULL, /* pre conf */ 37 NULL, /* preconfiguration */
38 NULL, /* postconfiguration */
38 39
39 NULL, /* create main configuration */ 40 NULL, /* create main configuration */
40 NULL, /* init main configuration */ 41 NULL, /* init main configuration */
41 42
42 NULL, /* create server configuration */ 43 NULL, /* create server configuration */
46 ngx_http_copy_filter_merge_conf /* merge location configuration */ 47 ngx_http_copy_filter_merge_conf /* merge location configuration */
47 }; 48 };
48 49
49 50
50 ngx_module_t ngx_http_copy_filter_module = { 51 ngx_module_t ngx_http_copy_filter_module = {
51 NGX_MODULE, 52 NGX_MODULE_V1,
52 &ngx_http_copy_filter_module_ctx, /* module context */ 53 &ngx_http_copy_filter_module_ctx, /* module context */
53 ngx_http_copy_filter_commands, /* module directives */ 54 ngx_http_copy_filter_commands, /* module directives */
54 NGX_HTTP_MODULE, /* module type */ 55 NGX_HTTP_MODULE, /* module type */
55 ngx_http_copy_filter_init, /* init module */ 56 ngx_http_copy_filter_init, /* init module */
56 NULL /* init process */ 57 NULL /* init process */
61 62
62 63
63 static ngx_int_t 64 static ngx_int_t
64 ngx_http_copy_filter(ngx_http_request_t *r, ngx_chain_t *in) 65 ngx_http_copy_filter(ngx_http_request_t *r, ngx_chain_t *in)
65 { 66 {
67 ngx_int_t rc;
66 ngx_output_chain_ctx_t *ctx; 68 ngx_output_chain_ctx_t *ctx;
67 ngx_http_copy_filter_conf_t *conf; 69 ngx_http_copy_filter_conf_t *conf;
68 70
69 if (r->connection->write->error) { 71 if (r->connection->write->error) {
70 return NGX_ERROR; 72 return NGX_ERROR;
71 } 73 }
72 74
73 ctx = ngx_http_get_module_ctx(r->main ? r->main : r, 75 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
74 ngx_http_copy_filter_module); 76 "copy filter: \"%V\"", &r->uri);
77
78 ctx = ngx_http_get_module_ctx(r, ngx_http_copy_filter_module);
75 79
76 if (ctx == NULL) { 80 if (ctx == NULL) {
77 conf = ngx_http_get_module_loc_conf(r->main ? r->main : r, 81 conf = ngx_http_get_module_loc_conf(r, ngx_http_copy_filter_module);
78 ngx_http_copy_filter_module);
79 82
80 ctx = ngx_pcalloc(r->pool, sizeof(ngx_output_chain_ctx_t)); 83 ctx = ngx_pcalloc(r->pool, sizeof(ngx_output_chain_ctx_t));
81 if (ctx == NULL) { 84 if (ctx == NULL) {
82 return NGX_ERROR; 85 return NGX_ERROR;
83 } 86 }
95 ctx->output_filter = (ngx_output_chain_filter_pt) ngx_http_next_filter; 98 ctx->output_filter = (ngx_output_chain_filter_pt) ngx_http_next_filter;
96 ctx->filter_ctx = r; 99 ctx->filter_ctx = r;
97 100
98 } 101 }
99 102
100 return ngx_output_chain(ctx, in); 103 rc = ngx_output_chain(ctx, in);
104
105 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
106 "copy filter: %i \"%V\"", rc, &r->uri);
107
108 return rc;
101 } 109 }
102 110
103 111
104 static void * 112 static void *
105 ngx_http_copy_filter_create_conf(ngx_conf_t *cf) 113 ngx_http_copy_filter_create_conf(ngx_conf_t *cf)