diff --git a/src/http/modules/proxy/ngx_http_proxy_handler.c b/src/http/modules/proxy/ngx_http_proxy_handler.c
index 2888e4c..9333c95 100644
--- a/src/http/modules/proxy/ngx_http_proxy_handler.c
+++ b/src/http/modules/proxy/ngx_http_proxy_handler.c
@@ -779,12 +779,25 @@
     ngx_log_debug(rev->log, "http proxy process upstream body");
 
     if (rev->timedout) {
-        ngx_http_proxy_next_upstream(p);
+        ngx_http_proxy_close_connection(p->upstream.connection);
+        p->upstream.connection = NULL;
         return;
     }
 
     ngx_event_proxy_read_upstream(p->event_proxy);
 
+    if (p->event_proxy->upstream_eof) {
+        ngx_http_proxy_close_connection(p->upstream.connection);
+        p->upstream.connection = NULL;
+        return;
+    }
+
+    if (p->event_proxy->upstream_error) {
+        ngx_http_proxy_close_connection(p->upstream.connection);
+        p->upstream.connection = NULL;
+        return;
+    }
+
     return;
 }
 
@@ -1043,6 +1056,8 @@
         c->write->timer_set = 0;
     }
 
+    /* TODO: move connection to the connection pool */
+
     if (ngx_del_conn) {
         ngx_del_conn(c);