commit 3d54061602b20fa5a6fdf55b11cb333285d61d03
author Igor Sysoev <igor@sysoev.ru> Tue Apr 13 15:08:48 2004 +0000
committer Igor Sysoev <igor@sysoev.ru> Tue Apr 13 15:08:48 2004 +0000
tree dc7cb2320ba0f21cda2cd87096481c0731074296
parent a21e30b91900dbbde5ea7fbc5ed4b2ec59969de7

nginx-0.0.3-2004-04-13-19:08:48 import

src/http/modules/proxy/ngx_http_proxy_handler.c

diff --git a/src/http/modules/proxy/ngx_http_proxy_handler.c b/src/http/modules/proxy/ngx_http_proxy_handler.c
index 017d7c8..0fd89c1 100644
--- a/src/http/modules/proxy/ngx_http_proxy_handler.c
+++ b/src/http/modules/proxy/ngx_http_proxy_handler.c
@@ -425,7 +425,9 @@
 
     n = recv(c->fd, buf, 1, MSG_PEEK);
 
-    if (ev->write && n >= 0) {
+    err = ngx_socket_errno;
+
+    if (ev->write && (n >= 0 || err == NGX_EAGAIN)) {
         return;
     }
 
@@ -443,7 +445,6 @@
     ev->eof = 1;
 
     if (n == -1) {
-        err = ngx_socket_errno;
         if (err == NGX_EAGAIN) {
             return;
         }
@@ -634,11 +635,11 @@
         ngx_del_conn(c, NGX_CLOSE_EVENT);
 
     } else {
-        if (c->read->active) {
+        if (c->read->active || c->read->posted) {
             ngx_del_event(c->read, NGX_READ_EVENT, NGX_CLOSE_EVENT);
         }
 
-        if (c->write->active) {
+        if (c->write->active || c->read->posted) {
             ngx_del_event(c->write, NGX_WRITE_EVENT, NGX_CLOSE_EVENT);
         }
     }