comparison src/http/modules/ngx_http_autoindex_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 b1648294f693
children 12234c998d83
comparison
equal deleted inserted replaced
508:ca1020ce99ba 509:9b8c906f6e63
61 ngx_null_command 61 ngx_null_command
62 }; 62 };
63 63
64 64
65 ngx_http_module_t ngx_http_autoindex_module_ctx = { 65 ngx_http_module_t ngx_http_autoindex_module_ctx = {
66 NULL, /* pre conf */ 66 NULL, /* preconfiguration */
67 NULL, /* postconfiguration */
67 68
68 NULL, /* create main configuration */ 69 NULL, /* create main configuration */
69 NULL, /* init main configuration */ 70 NULL, /* init main configuration */
70 71
71 NULL, /* create server configuration */ 72 NULL, /* create server configuration */
75 ngx_http_autoindex_merge_loc_conf /* merge location configration */ 76 ngx_http_autoindex_merge_loc_conf /* merge location configration */
76 }; 77 };
77 78
78 79
79 ngx_module_t ngx_http_autoindex_module = { 80 ngx_module_t ngx_http_autoindex_module = {
80 NGX_MODULE, 81 NGX_MODULE_V1,
81 &ngx_http_autoindex_module_ctx, /* module context */ 82 &ngx_http_autoindex_module_ctx, /* module context */
82 ngx_http_autoindex_commands, /* module directives */ 83 ngx_http_autoindex_commands, /* module directives */
83 NGX_HTTP_MODULE, /* module type */ 84 NGX_HTTP_MODULE, /* module type */
84 ngx_http_autoindex_init, /* init module */ 85 ngx_http_autoindex_init, /* init module */
85 NULL /* init process */ 86 NULL /* init process */
417 418
418 b->last = ngx_cpymem(b->last, tail, sizeof(tail) - 1); 419 b->last = ngx_cpymem(b->last, tail, sizeof(tail) - 1);
419 420
420 r->headers_out.status = NGX_HTTP_OK; 421 r->headers_out.status = NGX_HTTP_OK;
421 r->headers_out.content_length_n = b->last - b->pos; 422 r->headers_out.content_length_n = b->last - b->pos;
422 423 r->headers_out.content_type.len = sizeof("text/html") - 1;
423 r->headers_out.content_type = ngx_list_push(&r->headers_out.headers); 424 r->headers_out.content_type.data = (u_char *) "text/html";
424 if (r->headers_out.content_type == NULL) {
425 return NGX_HTTP_INTERNAL_SERVER_ERROR;
426 }
427
428 r->headers_out.content_type->key.len = 0;
429 r->headers_out.content_type->key.data = NULL;
430 r->headers_out.content_type->value.len = sizeof("text/html") - 1;
431 r->headers_out.content_type->value.data = (u_char *) "text/html";
432 425
433 rc = ngx_http_send_header(r); 426 rc = ngx_http_send_header(r);
434 427
435 if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) { 428 if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) {
436 return rc; 429 return rc;
437 } 430 }
438 431
439 if (!r->main) { 432 if (r->main == NULL) {
440 b->last_buf = 1; 433 b->last_buf = 1;
441 } 434 }
435
436 b->last_in_chain = 1;
442 437
443 out.buf = b; 438 out.buf = b;
444 out.next = NULL; 439 out.next = NULL;
445 440
446 return ngx_http_output_filter(r, &out); 441 return ngx_http_output_filter(r, &out);