Processing inconsistent proxied response length.

Keepalive connection is disabled if upstream response length
differs from specified in the "Content-Length" field value.

1 files changed, 25 insertions, 2 deletions

diff --git a/src/nxt_http_proxy.c b/src/nxt_http_proxy.c
index 94856684..7f4eeff2 100644
--- a/src/nxt_http_proxy.c
+++ b/src/nxt_http_proxy.c
@@ -29,6 +29,8 @@ static void nxt_http_proxy_header_send(nxt_task_t *task, void *obj, void *data);
 static void nxt_http_proxy_header_sent(nxt_task_t *task, void *obj, void *data);
 static void nxt_http_proxy_header_read(nxt_task_t *task, void *obj, void *data);
 static void nxt_http_proxy_send_body(nxt_task_t *task, void *obj, void *data);
+static void nxt_http_proxy_request_send(nxt_task_t *task,
+    nxt_http_request_t *r, nxt_buf_t *out);
 static void nxt_http_proxy_read(nxt_task_t *task, void *obj, void *data);
 static void nxt_http_proxy_buf_mem_completion(nxt_task_t *task, void *obj,
     void *data);
@@ -185,6 +187,10 @@ nxt_http_proxy_header_read(nxt_task_t *task, void *obj, void *data)
 
     nxt_debug(task, "http proxy status: %d", peer->status);
 
+    if (r->resp.content_length_n > 0) {
+        peer->remainder = r->resp.content_length_n;
+    }
+
     nxt_list_each(field, peer->fields) {
 
         nxt_debug(task, "http proxy header: \"%*s: %*s\"",
@@ -220,7 +226,7 @@ nxt_http_proxy_send_body(nxt_task_t *task, void *obj, void *data)
 
     if (out != NULL) {
         peer->body = NULL;
-        nxt_http_request_send(task, r, out);
+        nxt_http_proxy_request_send(task, r, out);
     }
 
     r->state = &nxt_http_proxy_read_state;
@@ -229,6 +235,21 @@ nxt_http_proxy_send_body(nxt_task_t *task, void *obj, void *data)
 }
 
 
+static void
+nxt_http_proxy_request_send(nxt_task_t *task, nxt_http_request_t *r,
+    nxt_buf_t *out)
+{
+    size_t  length;
+
+    if (r->peer->remainder > 0) {
+        length = nxt_buf_chain_length(out);
+        r->peer->remainder -= length;
+    }
+
+    nxt_http_request_send(task, r, out);
+}
+
+
 static const nxt_http_request_state_t  nxt_http_proxy_read_state
     nxt_aligned(64) =
 {
@@ -251,12 +272,14 @@ nxt_http_proxy_read(nxt_task_t *task, void *obj, void *data)
     peer->body = NULL;
     last = nxt_buf_is_last(out);
 
-    nxt_http_request_send(task, r, out);
+    nxt_http_proxy_request_send(task, r, out);
 
     if (!last) {
         nxt_http_proto[peer->protocol].peer_read(task, peer);
 
     } else {
+        r->inconsistent = (peer->remainder != 0);
+
         nxt_http_proto[peer->protocol].peer_close(task, peer);
 
         nxt_mp_release(r->mem_pool);