Latest update - 7260

2018-04-06 04:39:29 +09:00
parent c8460c8939
commit 45ac93cdb4
1 changed files with 12 additions and 6 deletions
@@ -2024,8 +2024,6 @@ ngx_http_upstream_send_request(ngx_http_request_t *r, ngx_http_upstream_t *u,

    /* rc == NGX_OK */

-    u->request_body_sent = 1;
-
    if (c->write->timer_set) {
        ngx_del_timer(c->write);
    }
@@ -2052,11 +2050,19 @@ ngx_http_upstream_send_request(ngx_http_request_t *r, ngx_http_upstream_t *u,
        return;
    }

-    ngx_add_timer(c->read, u->conf->read_timeout);
+    if (!u->request_body_sent) {
+        u->request_body_sent = 1;

-    if (c->read->ready) {
-        ngx_http_upstream_process_header(r, u);
-        return;
+        if (u->header_sent) {
+            return;
+        }
+
+        ngx_add_timer(c->read, u->conf->read_timeout);
+
+        if (c->read->ready) {
+            ngx_http_upstream_process_header(r, u);
+            return;
+        }
    }
 }