comparison src/http/ngx_http_postpone_filter_module.c @ 58:b55cbf18157e NGINX_0_1_29

nginx 0.1.29 *) 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; bug 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 <http://sysoev.ru>
date Thu, 12 May 2005 00:00:00 +0400
parents
children 0790a8599248
comparison
equal deleted inserted replaced
57:5df375c55338 58:b55cbf18157e
1
2 /*
3 * Copyright (C) Igor Sysoev
4 */
5
6
7 #include <ngx_config.h>
8 #include <ngx_core.h>
9 #include <ngx_http.h>
10
11
12 static ngx_int_t ngx_http_postpone_filter_init(ngx_cycle_t *cycle);
13
14
15 static ngx_http_module_t ngx_http_postpone_filter_module_ctx = {
16 NULL, /* preconfiguration */
17 NULL, /* postconfiguration */
18
19 NULL, /* create main configuration */
20 NULL, /* init main configuration */
21
22 NULL, /* create server configuration */
23 NULL, /* merge server configuration */
24
25 NULL, /* create location configuration */
26 NULL /* merge location configuration */
27 };
28
29
30 ngx_module_t ngx_http_postpone_filter_module = {
31 NGX_MODULE_V1,
32 &ngx_http_postpone_filter_module_ctx, /* module context */
33 NULL, /* module directives */
34 NGX_HTTP_MODULE, /* module type */
35 ngx_http_postpone_filter_init, /* init module */
36 NULL /* init process */
37 };
38
39
40 static ngx_http_output_body_filter_pt ngx_http_next_filter;
41
42
43 static ngx_int_t
44 ngx_http_postpone_filter(ngx_http_request_t *r, ngx_chain_t *in)
45 {
46 ngx_int_t rc;
47 ngx_chain_t *out;
48 ngx_http_postponed_request_t *pr, **ppr;
49
50 if (r->connection->write->error) {
51 return NGX_ERROR;
52 }
53
54 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
55 "http postpone filter \"%V\" %p", &r->uri, in);
56
57 if (r != r->connection->data || (r->postponed && in)) {
58
59 if (r->postponed) {
60 for (pr = r->postponed; pr->next; pr = pr->next) { /* void */ }
61
62 ppr = pr->request ? &pr->next : NULL;
63
64 } else {
65 ppr = &r->postponed;
66 #if (NGX_SUPPRESS_WARN)
67 pr = NULL;
68 #endif
69 }
70
71 if (ppr) {
72 pr = ngx_palloc(r->pool, sizeof(ngx_http_postponed_request_t));
73 if (pr == NULL) {
74 return NGX_ERROR;
75 }
76
77 *ppr = pr;
78
79 pr->request = NULL;
80 pr->out = NULL;
81 pr->next = NULL;
82 }
83
84 if (ngx_chain_add_copy(r->pool, &pr->out, in) == NGX_ERROR) {
85 return NGX_ERROR;
86 }
87
88 if (r != r->connection->data || r->postponed->request) {
89 return NGX_AGAIN;
90 }
91 }
92
93 if (r->postponed) {
94 out = r->postponed->out;
95 r->postponed = r->postponed->next;
96
97 } else {
98 out = in;
99 }
100
101 if (out == NULL && r->out == NULL) {
102 return NGX_OK;
103 }
104
105 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
106 "http postpone filter out \"%V\"", &r->uri);
107
108 rc = ngx_http_next_filter(r->main ? r->main : r, out);
109
110 if (rc == NGX_ERROR) {
111 /* NGX_ERROR may be returned by any filter */
112 r->connection->write->error = 1;
113 }
114
115 return rc;
116 }
117
118
119 static ngx_int_t
120 ngx_http_postpone_filter_init(ngx_cycle_t *cycle)
121 {
122 ngx_http_next_filter = ngx_http_top_body_filter;
123 ngx_http_top_body_filter = ngx_http_postpone_filter;
124
125 return NGX_OK;
126 }