mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-08-06 14:56:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

r1576, r1578, r1579 merge:

Browse Source 
avoid segfault if poll is used and endless loop if select is used
This commit is contained in:
Igor Sysoev 2007-12-12 20:35:32 +00:00
parent 4341d7949e
commit 67c3962364
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/os/unix/ngx_process_cycle.c
View File

@ -1035,7 +1035,6 @@ static void
ngx_channel_handler(ngx_event_t *ev)
{
ngx_int_t n;
ngx_socket_t fd;
ngx_channel_t ch;
ngx_connection_t *c;
@ -1053,17 +1052,7 @@ ngx_channel_handler(ngx_event_t *ev)
ngx_log_debug1(NGX_LOG_DEBUG_CORE, ev->log, 0, "channel: %i", n);
if (n == NGX_ERROR) {
ngx_free_connection(c);
fd = c->fd;
c->fd = (ngx_socket_t) -1;
if (close(fd) == -1) {
ngx_log_error(NGX_LOG_ALERT, ev->log, ngx_errno,
"close() channel failed");
}
ngx_close_connection(c);
return;
}