comparison src/event/modules/ngx_kqueue_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 b09ee85d0ac8
comparison
equal deleted inserted replaced
508:ca1020ce99ba 509:9b8c906f6e63
92 } 92 }
93 93
94 }; 94 };
95 95
96 ngx_module_t ngx_kqueue_module = { 96 ngx_module_t ngx_kqueue_module = {
97 NGX_MODULE, 97 NGX_MODULE_V1,
98 &ngx_kqueue_module_ctx, /* module context */ 98 &ngx_kqueue_module_ctx, /* module context */
99 ngx_kqueue_commands, /* module directives */ 99 ngx_kqueue_commands, /* module directives */
100 NGX_EVENT_MODULE, /* module type */ 100 NGX_EVENT_MODULE, /* module type */
101 NULL, /* init module */ 101 NULL, /* init module */
102 NULL /* init process */ 102 NULL /* init process */
190 ngx_io = ngx_os_io; 190 ngx_io = ngx_os_io;
191 191
192 ngx_event_actions = ngx_kqueue_module_ctx.actions; 192 ngx_event_actions = ngx_kqueue_module_ctx.actions;
193 193
194 ngx_event_flags = NGX_USE_ONESHOT_EVENT 194 ngx_event_flags = NGX_USE_ONESHOT_EVENT
195 #if 1
195 #if (NGX_HAVE_CLEAR_EVENT) 196 #if (NGX_HAVE_CLEAR_EVENT)
196 |NGX_USE_CLEAR_EVENT 197 |NGX_USE_CLEAR_EVENT
197 #else 198 #else
198 |NGX_USE_LEVEL_EVENT 199 |NGX_USE_LEVEL_EVENT
200 #endif
199 #endif 201 #endif
200 #if (NGX_HAVE_LOWAT_EVENT) 202 #if (NGX_HAVE_LOWAT_EVENT)
201 |NGX_USE_LOWAT_EVENT 203 |NGX_USE_LOWAT_EVENT
202 #endif 204 #endif
203 |NGX_USE_KQUEUE_EVENT; 205 |NGX_USE_KQUEUE_EVENT;
613 615
614 if (ev->log && (ev->log->log_level & NGX_LOG_DEBUG_CONNECTION)) { 616 if (ev->log && (ev->log->log_level & NGX_LOG_DEBUG_CONNECTION)) {
615 ngx_kqueue_dump_event(ev->log, &event_list[i]); 617 ngx_kqueue_dump_event(ev->log, &event_list[i]);
616 } 618 }
617 619
620 if (ev->oneshot) {
621 ev->active = 0;
622 }
623
618 #if (NGX_THREADS) 624 #if (NGX_THREADS)
619 625
620 if (ngx_threaded && !ev->accept) { 626 if (ngx_threaded && !ev->accept) {
621 ev->posted_ready = 1; 627 ev->posted_ready = 1;
622 ev->posted_available = event_list[i].data; 628 ev->posted_available = event_list[i].data;
661 event_list[i].filter); 667 event_list[i].filter);
662 continue; 668 continue;
663 } 669 }
664 670
665 if (!ngx_threaded && !ngx_accept_mutex_held) { 671 if (!ngx_threaded && !ngx_accept_mutex_held) {
666 ev->event_handler(ev); 672 ev->handler(ev);
667 continue; 673 continue;
668 } 674 }
669 675
670 if (!ev->accept) { 676 if (!ev->accept) {
671 ngx_post_event(ev); 677 ngx_post_event(ev);
676 continue; 682 continue;
677 } 683 }
678 684
679 ngx_mutex_unlock(ngx_posted_events_mutex); 685 ngx_mutex_unlock(ngx_posted_events_mutex);
680 686
681 ev->event_handler(ev); 687 ev->handler(ev);
682 688
683 if (ngx_accept_disabled > 0) { 689 if (ngx_accept_disabled > 0) {
684 ngx_accept_mutex_unlock(); 690 ngx_accept_mutex_unlock();
685 accept_lock = 0; 691 accept_lock = 0;
686 } 692 }