IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-20 06:03:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

nginx-0.0.3-2004-04-13-09:27:03 import

Browse Source
This commit is contained in:
Igor Sysoev 2004-04-13 05:27:03 +00:00
parent 43f131923f
commit a21e30b919
5 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/event/modules/ngx_epoll_module.c
View File

@ -434,10 +434,6 @@ int ngx_epoll_process_events(ngx_cycle_t *cycle)
c->write->returned_instance = instance;
}
#if (NGX_DEBUG)
log = c->log ? c->log : cycle->log;
#endif
if (c->read->instance != instance) {
/*
@ -445,11 +441,15 @@ int ngx_epoll_process_events(ngx_cycle_t *cycle)
* that was just closed in this iteration
*/
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, log, 0,
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
"epoll: stale event " PTR_FMT, c);
continue;
}
#if (NGX_DEBUG)
log = c->log ? c->log : cycle->log;
#endif
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, log, 0,
"epoll: fd:%d ev:%04X d:" PTR_FMT,
c->fd, event_list[i].events, event_list[i].data);

1
src/event/ngx_event_accept.c
View File

@ -328,7 +328,6 @@ ngx_int_t ngx_trylock_accept_mutex(ngx_cycle_t *cycle)
if (*ngx_accept_mutex == 0
&& ngx_atomic_cmp_set(ngx_accept_mutex, 0, ngx_pid))
{
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
"accept mutex locked");

4
src/http/modules/proxy/ngx_http_proxy_handler.c
View File

@ -425,6 +425,10 @@ void ngx_http_proxy_check_broken_connection(ngx_event_t *ev)
n = recv(c->fd, buf, 1, MSG_PEEK);
if (ev->write && n >= 0) {
return;
}
if (n > 0) {
if ((ngx_event_flags & NGX_USE_LEVEL_EVENT) && ev->active) {
if (ngx_del_event(ev, NGX_READ_EVENT, 0) == NGX_ERROR) {

7
src/os/unix/ngx_linux_init.c
View File

@ -9,10 +9,15 @@ char ngx_linux_kern_osrelease[20];
ngx_os_io_t ngx_os_io = {
ngx_unix_recv,
ngx_readv_chain,
NULL,
NULL,
#if (HAVE_SENDFILE)
ngx_linux_sendfile_chain,
NGX_IO_SENDFILE
#else
ngx_writev_chain,
0
#endif
};

2
src/os/unix/ngx_solaris_init.c
View File

@ -10,7 +10,7 @@ char ngx_solaris_version[50];
ngx_os_io_t ngx_os_io = {
ngx_unix_recv,
NULL,
ngx_readv_chain,
NULL,
#if (HAVE_SENDFILE)
ngx_solaris_sendfilev_chain,