comparison src/http/modules/ngx_http_stub_status_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 72eb30262aac
children 71c46860eb55
comparison
equal deleted inserted replaced
57:5df375c55338 58:b55cbf18157e
20 }; 20 };
21 21
22 22
23 23
24 ngx_http_module_t ngx_http_stub_status_module_ctx = { 24 ngx_http_module_t ngx_http_stub_status_module_ctx = {
25 NULL, /* pre conf */ 25 NULL, /* preconfiguration */
26 NULL, /* postconfiguration */
26 27
27 NULL, /* create main configuration */ 28 NULL, /* create main configuration */
28 NULL, /* init main configuration */ 29 NULL, /* init main configuration */
29 30
30 NULL, /* create server configuration */ 31 NULL, /* create server configuration */
34 NULL /* merge location configuration */ 35 NULL /* merge location configuration */
35 }; 36 };
36 37
37 38
38 ngx_module_t ngx_http_stub_status_module = { 39 ngx_module_t ngx_http_stub_status_module = {
39 NGX_MODULE, 40 NGX_MODULE_V1,
40 &ngx_http_stub_status_module_ctx, /* module context */ 41 &ngx_http_stub_status_module_ctx, /* module context */
41 ngx_http_status_commands, /* module directives */ 42 ngx_http_status_commands, /* module directives */
42 NGX_HTTP_MODULE, /* module type */ 43 NGX_HTTP_MODULE, /* module type */
43 NULL, /* init module */ 44 NULL, /* init module */
44 NULL /* init process */ 45 NULL /* init process */
61 62
62 if (rc != NGX_OK && rc != NGX_AGAIN) { 63 if (rc != NGX_OK && rc != NGX_AGAIN) {
63 return rc; 64 return rc;
64 } 65 }
65 66
66 r->headers_out.content_type = ngx_list_push(&r->headers_out.headers); 67 r->headers_out.content_type.len = sizeof("text/plain") - 1;
67 if (r->headers_out.content_type == NULL) { 68 r->headers_out.content_type.data = (u_char *) "text/plain";
68 return NGX_HTTP_INTERNAL_SERVER_ERROR;
69 }
70
71 r->headers_out.content_type->key.len = 0;
72 r->headers_out.content_type->key.data = NULL;
73 r->headers_out.content_type->value.len = sizeof("text/plain") - 1;
74 r->headers_out.content_type->value.data = (u_char *) "text/plain";
75 69
76 if (r->method == NGX_HTTP_HEAD) { 70 if (r->method == NGX_HTTP_HEAD) {
77 r->headers_out.status = NGX_HTTP_OK; 71 r->headers_out.status = NGX_HTTP_OK;
78 72
79 rc = ngx_http_send_header(r); 73 rc = ngx_http_send_header(r);
101 ac = *ngx_stat_active; 95 ac = *ngx_stat_active;
102 rq = *ngx_stat_requests; 96 rq = *ngx_stat_requests;
103 rd = *ngx_stat_reading; 97 rd = *ngx_stat_reading;
104 wr = *ngx_stat_writing; 98 wr = *ngx_stat_writing;
105 99
106 b->last = ngx_sprintf(b->last, "Active connections: %A \n", ac); 100 b->last = ngx_sprintf(b->last, "Active connections: %uA \n", ac);
107 101
108 b->last = ngx_cpymem(b->last, "server accepts handled requests\n", 102 b->last = ngx_cpymem(b->last, "server accepts handled requests\n",
109 sizeof("server accepts handled requests\n") - 1); 103 sizeof("server accepts handled requests\n") - 1);
110 104
111 b->last = ngx_sprintf(b->last, " %A %A %A \n", ap, hn, rq); 105 b->last = ngx_sprintf(b->last, " %uA %uA %uA \n", ap, hn, rq);
112 106
113 b->last = ngx_sprintf(b->last, "Reading: %A Writing: %A Waiting: %A \n", 107 b->last = ngx_sprintf(b->last, "Reading: %uA Writing: %uA Waiting: %uA \n",
114 rd, wr, ac - (rd + wr)); 108 rd, wr, ac - (rd + wr));
115 109
116 r->headers_out.status = NGX_HTTP_OK; 110 r->headers_out.status = NGX_HTTP_OK;
117 r->headers_out.content_length_n = b->last - b->pos; 111 r->headers_out.content_length_n = b->last - b->pos;
118 112