diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2003-10-07 15:30:05 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2003-10-07 15:30:05 +0000 |
| commit | 931a400cf1302d6f4cd220325383a37743eed592 (patch) | |
| tree | a68a6981908fc805f6f47a39538e99a7c361fae9 /src/event | |
| parent | 1dd4ac8a8bac777d433249eac4a6b9239e4efbcc (diff) | |
| download | nginx-931a400cf1302d6f4cd220325383a37743eed592.tar.gz nginx-931a400cf1302d6f4cd220325383a37743eed592.tar.bz2 | |
nginx-0.0.1-2003-10-07-19:30:05 import
Diffstat (limited to 'src/event')
| -rw-r--r-- | src/event/ngx_event.h | 1 | ||||
| -rw-r--r-- | src/event/ngx_event_connect.c | 2 | ||||
| -rw-r--r-- | src/event/ngx_event_proxy.c | 5 | ||||
| -rw-r--r-- | src/event/ngx_event_proxy.h | 5 |
4 files changed, 8 insertions, 5 deletions
diff --git a/src/event/ngx_event.h b/src/event/ngx_event.h index 2b8e0f64c..029d185f5 100644 --- a/src/event/ngx_event.h +++ b/src/event/ngx_event.h @@ -289,6 +289,7 @@ typedef struct { /* ***************************** */ #define ngx_recv ngx_io.recv +#define ngx_recv_chain ngx_io.recv_chain #define ngx_write_chain ngx_io.send_chain diff --git a/src/event/ngx_event_connect.c b/src/event/ngx_event_connect.c index 2f135afc1..7018379de 100644 --- a/src/event/ngx_event_connect.c +++ b/src/event/ngx_event_connect.c @@ -193,6 +193,8 @@ int ngx_event_connect_peer(ngx_peer_connection_t *pc) ngx_close_socket_n " failed"); } + c->fd = -1; + return NGX_CONNECT_ERROR; } } diff --git a/src/event/ngx_event_proxy.c b/src/event/ngx_event_proxy.c index 2bae88947..ce22c6501 100644 --- a/src/event/ngx_event_proxy.c +++ b/src/event/ngx_event_proxy.c @@ -1,4 +1,7 @@ +#include <ngx_config.h> +#include <ngx_core.h> +#include <ngx_event.h> #include <ngx_event_proxy.h> @@ -46,7 +49,7 @@ ngx_log_debug(p->log, "read upstream"); #if (HAVE_KQUEUE) /* kqueue notifies about the end of file or a pending error */ - if (ngx_event_type == NGX_HAVE_KQUEUE_EVENT) { + if (ngx_event_flags == NGX_HAVE_KQUEUE_EVENT) { if (p->upstream->read->error) { ngx_log_error(NGX_LOG_ERR, p->log, diff --git a/src/event/ngx_event_proxy.h b/src/event/ngx_event_proxy.h index 267533e0e..b0e0c1a29 100644 --- a/src/event/ngx_event_proxy.h +++ b/src/event/ngx_event_proxy.h @@ -4,10 +4,7 @@ #include <ngx_config.h> #include <ngx_core.h> -#include <ngx_hunk.h> -#include <ngx_file.h> -#include <ngx_files.h> -#include <ngx_connection.h> +#include <ngx_event.h> typedef struct ngx_event_proxy_s ngx_event_proxy_t; |