Mercurial > hg > nginx-vendor-current

comparison src/event/modules/ngx_epoll_module.c @ 670:ad45b044f1e5 NGINX_1_1_19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.1.19 *) Security: specially crafted mp4 file might allow to overwrite memory locations in a worker process if the ngx_http_mp4_module was used, potentially resulting in arbitrary code execution (CVE-2012-2089). Thanks to Matthew Daley. *) Bugfix: nginx/Windows might be terminated abnormally. Thanks to Vincent Lee. *) Bugfix: nginx hogged CPU if all servers in an upstream were marked as "backup". *) Bugfix: the "allow" and "deny" directives might be inherited incorrectly if they were used with IPv6 addresses. *) Bugfix: the "modern_browser" and "ancient_browser" directives might be inherited incorrectly. *) Bugfix: timeouts might be handled incorrectly on Solaris/SPARC. *) Bugfix: in the ngx_http_mp4_module.
author Igor Sysoev <http://sysoev.ru>
date Thu, 12 Apr 2012 00:00:00 +0400
parents d0f7a625f27c
children 5cb5db9975ba
comparison
equal deleted inserted replaced
669:3f5d0be5ee74 670:ad45b044f1e5
443 ngx_connection_t *c; 443 ngx_connection_t *c;
444 struct epoll_event ee; 444 struct epoll_event ee;
445 445
446 /* 446 /*
447 * when the file descriptor is closed, the epoll automatically deletes 447 * when the file descriptor is closed, the epoll automatically deletes
448 * it from its queue, so we do not need to delete explicity the event 448 * it from its queue, so we do not need to delete explicitly the event
449 * before the closing the file descriptor 449 * before the closing the file descriptor
450 */ 450 */
451 451
452 if (flags & NGX_CLOSE_EVENT) { 452 if (flags & NGX_CLOSE_EVENT) {
453 ev->active = 0; 453 ev->active = 0;
522 int op; 522 int op;
523 struct epoll_event ee; 523 struct epoll_event ee;
524 524
525 /* 525 /*
526 * when the file descriptor is closed the epoll automatically deletes 526 * when the file descriptor is closed the epoll automatically deletes
527 * it from its queue so we do not need to delete explicity the event 527 * it from its queue so we do not need to delete explicitly the event
528 * before the closing the file descriptor 528 * before the closing the file descriptor
529 */ 529 */
530 530
531 if (flags & NGX_CLOSE_EVENT) { 531 if (flags & NGX_CLOSE_EVENT) {
532 c->read->active = 0; 532 c->read->active = 0;