Mercurial > hg > nginx
comparison src/event/modules/ngx_epoll_module.c @ 663:6d5c1535bb9d release-0.3.53
nginx-0.3.53-RELEASE import
*) Change: the "add_header" directive adds the string to 204, 301, and
302 responses.
*) Feature: the "server" directive in the "upstream" context supports
the "weight" parameter.
*) Feature: the "server_name" directive supports the "*" wildcard.
*) Feature: nginx supports the request body size more than 2G.
*) Bugfix: if a client was successfully authorized using "satisfy_any
on", then anyway the message "access forbidden by rule" was written
in the log.
*) Bugfix: the "PUT" method may erroneously not create a file and
return the 409 code.
*) Bugfix: if the IMAP/POP3 backend returned an error, then nginx
continued proxying anyway.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Fri, 07 Jul 2006 16:33:19 +0000 |
parents | 326634fb9d47 |
children | f69d1aab6a0f |
comparison
equal
deleted
inserted
replaced
662:4c15f63afe65 | 663:6d5c1535bb9d |
---|---|
477 ngx_log_debug2(NGX_LOG_DEBUG_EVENT, log, 0, | 477 ngx_log_debug2(NGX_LOG_DEBUG_EVENT, log, 0, |
478 "epoll_wait() error on fd:%d ev:%04XD", | 478 "epoll_wait() error on fd:%d ev:%04XD", |
479 c->fd, revents); | 479 c->fd, revents); |
480 } | 480 } |
481 | 481 |
482 #if 0 | |
482 if (revents & ~(EPOLLIN|EPOLLOUT|EPOLLERR|EPOLLHUP)) { | 483 if (revents & ~(EPOLLIN|EPOLLOUT|EPOLLERR|EPOLLHUP)) { |
483 ngx_log_error(NGX_LOG_ALERT, log, 0, | 484 ngx_log_error(NGX_LOG_ALERT, log, 0, |
484 "strange epoll_wait() events fd:%d ev:%04XD", | 485 "strange epoll_wait() events fd:%d ev:%04XD", |
485 c->fd, revents); | 486 c->fd, revents); |
486 } | 487 } |
488 #endif | |
487 | 489 |
488 if ((revents & (EPOLLERR|EPOLLHUP)) | 490 if ((revents & (EPOLLERR|EPOLLHUP)) |
489 && (revents & (EPOLLIN|EPOLLOUT)) == 0) | 491 && (revents & (EPOLLIN|EPOLLOUT)) == 0) |
490 { | 492 { |
491 /* | 493 /* |
562 static char * | 564 static char * |
563 ngx_epoll_init_conf(ngx_cycle_t *cycle, void *conf) | 565 ngx_epoll_init_conf(ngx_cycle_t *cycle, void *conf) |
564 { | 566 { |
565 ngx_epoll_conf_t *epcf = conf; | 567 ngx_epoll_conf_t *epcf = conf; |
566 | 568 |
567 ngx_conf_init_unsigned_value(epcf->events, 512); | 569 ngx_conf_init_uint_value(epcf->events, 512); |
568 | 570 |
569 return NGX_CONF_OK; | 571 return NGX_CONF_OK; |
570 } | 572 } |