comparison src/core/ngx_connection.c @ 362:54fad6c4b555 NGINX_0_6_25

nginx 0.6.25 *) Change: now the "server_name_in_redirect" directive is used instead of the "server_name" directive's special "*" parameter. *) Change: now wildcard and regex names can be used as main name in a "server_name" directive. *) Change: the "satisfy_any" directive was replaced by the "satisfy" directive. *) Workaround: old worker processes might hog CPU after reconfiguration if they was run under Linux OpenVZ. *) Feature: the "min_delete_depth" directive. *) Bugfix: the COPY and MOVE methods did not work with single files. *) Bugfix: the ngx_http_gzip_static_module did not allow the ngx_http_dav_module to work; bug appeared in 0.6.23. *) Bugfix: socket leak in HTTPS mode if deferred accept was used. Thanks to Ben Maurer. *) Bugfix: nginx could not be built without PCRE library; bug appeared in 0.6.23.
author Igor Sysoev <http://sysoev.ru>
date Tue, 08 Jan 2008 00:00:00 +0300
parents 3a91bfeffaba
children a39aab45a53f
comparison
equal deleted inserted replaced
361:160660bad929 362:54fad6c4b555
535 ls = cycle->listening.elts; 535 ls = cycle->listening.elts;
536 for (i = 0; i < cycle->listening.nelts; i++) { 536 for (i = 0; i < cycle->listening.nelts; i++) {
537 537
538 c = ls[i].connection; 538 c = ls[i].connection;
539 539
540 if (ngx_event_flags & NGX_USE_RTSIG_EVENT) { 540 if (c->read->active) {
541 if (c->read->active) { 541 if (ngx_event_flags & NGX_USE_RTSIG_EVENT) {
542 ngx_del_conn(c, NGX_CLOSE_EVENT); 542 ngx_del_conn(c, NGX_CLOSE_EVENT);
543 } 543
544 544 } else if (ngx_event_flags & NGX_USE_EPOLL_EVENT) {
545 } else { 545
546 if (c->read->active) { 546 /*
547 * it seems that Linux-2.6.x OpenVZ sends events
548 * for closed shared listening sockets unless
549 * the events was explicity deleted
550 */
551
552 ngx_del_event(c->read, NGX_READ_EVENT, 0);
553
554 } else {
547 ngx_del_event(c->read, NGX_READ_EVENT, NGX_CLOSE_EVENT); 555 ngx_del_event(c->read, NGX_READ_EVENT, NGX_CLOSE_EVENT);
548 } 556 }
549 } 557 }
550 558
551 ngx_free_connection(c); 559 ngx_free_connection(c);